From c99acaa99246a73a96776e8ad9ecf27f92463a0a Mon Sep 17 00:00:00 2001 From: Sergey Linev <S.Linev@gsi.de> Date: Fri, 28 Feb 2020 09:54:16 +0100 Subject: [PATCH] Add missing TVirtualX.h in gui sources --- gui/fitpanel/src/TFitEditor.cxx | 1 + gui/ged/src/TAttMarkerEditor.cxx | 2 ++ gui/ged/src/TGedEditor.cxx | 2 ++ gui/ged/src/TGedMarkerSelect.cxx | 1 + gui/ged/src/TGedPatternSelect.cxx | 3 ++- gui/ged/src/TGraphEditor.cxx | 1 + gui/ged/src/TH1Editor.cxx | 1 + gui/ged/src/TH2Editor.cxx | 1 + gui/ged/src/TPieEditor.cxx | 1 + gui/ged/src/TStyleManager.cxx | 3 ++- gui/gui/src/TGIcon.cxx | 1 + gui/gui/src/TGPasswdDialog.cxx | 1 + gui/gui/src/TGStatusBar.cxx | 5 +++-- gui/gui/src/TGTableContainer.cxx | 1 + gui/gui/src/TGTextEditDialogs.cxx | 1 + gui/gui/src/TGToolTip.cxx | 1 + gui/gui/src/TGTripleSlider.cxx | 1 + gui/gui/src/TGView.cxx | 3 +-- gui/gui/src/TRootDialog.cxx | 1 + gui/guibuilder/src/TGuiBldDragManager.cxx | 1 + gui/guibuilder/src/TGuiBldHintsButton.cxx | 1 + gui/guibuilder/src/TRootGuiBuilder.cxx | 1 + gui/guihtml/src/TGHtml.cxx | 1 + gui/guihtml/src/TGHtmlBrowser.cxx | 1 + gui/guihtml/src/TGHtmlDraw.cxx | 1 + gui/guihtml/src/TGHtmlSizer.cxx | 1 + gui/recorder/src/TRecorder.cxx | 2 ++ gui/sessionviewer/src/TProofProgressDialog.cxx | 2 ++ gui/sessionviewer/src/TSessionDialogs.cxx | 1 + gui/sessionviewer/src/TSessionViewer.cxx | 1 + test/stressGUI.cxx | 1 + 31 files changed, 39 insertions(+), 6 deletions(-) diff --git a/gui/fitpanel/src/TFitEditor.cxx b/gui/fitpanel/src/TFitEditor.cxx index bfa27824656..4793c219ce7 100644 --- a/gui/fitpanel/src/TFitEditor.cxx +++ b/gui/fitpanel/src/TFitEditor.cxx @@ -158,6 +158,7 @@ #include "TTreePlayer.h" #include "TTreeInput.h" #include "TAdvancedGraphicsDialog.h" +#include "TVirtualX.h" #include "RConfigure.h" #include "TPluginManager.h" diff --git a/gui/ged/src/TAttMarkerEditor.cxx b/gui/ged/src/TAttMarkerEditor.cxx index ce7b53a036a..d99a06d3ffa 100644 --- a/gui/ged/src/TAttMarkerEditor.cxx +++ b/gui/ged/src/TAttMarkerEditor.cxx @@ -34,6 +34,8 @@ #include "TPad.h" #include "TCanvas.h" #include "TROOT.h" +#include "TVirtualX.h" + ClassImp(TAttMarkerEditor); diff --git a/gui/ged/src/TGedEditor.cxx b/gui/ged/src/TGedEditor.cxx index 6fbbdfb5f60..b87e7fbaacd 100644 --- a/gui/ged/src/TGedEditor.cxx +++ b/gui/ged/src/TGedEditor.cxx @@ -63,6 +63,8 @@ #include "TROOT.h" #include "TClass.h" #include "TBaseClass.h" +#include "TVirtualX.h" + class TGedTabInfo : public TObject { // Helper class for managing visibility and order of created tabs. diff --git a/gui/ged/src/TGedMarkerSelect.cxx b/gui/ged/src/TGedMarkerSelect.cxx index 2296e77711d..71d784cca79 100644 --- a/gui/ged/src/TGedMarkerSelect.cxx +++ b/gui/ged/src/TGedMarkerSelect.cxx @@ -34,6 +34,7 @@ #include "TGToolTip.h" #include "TGButton.h" #include "Riostream.h" +#include "TVirtualX.h" ClassImp(TGedMarkerSelect); ClassImp(TGedMarkerPopup); diff --git a/gui/ged/src/TGedPatternSelect.cxx b/gui/ged/src/TGedPatternSelect.cxx index fafff11164f..bc0ebd68dc6 100644 --- a/gui/ged/src/TGedPatternSelect.cxx +++ b/gui/ged/src/TGedPatternSelect.cxx @@ -45,6 +45,7 @@ #include "TGButton.h" #include "Riostream.h" #include "RStipples.h" +#include "TVirtualX.h" ClassImp(TGedPopup); ClassImp(TGedSelect); @@ -53,7 +54,7 @@ ClassImp(TGedPatternSelector); ClassImp(TGedPatternPopup); ClassImp(TGedPatternSelect); -TGGC* TGedPatternFrame::fgGC = 0; +TGGC* TGedPatternFrame::fgGC = nullptr; //////////////////////////////////////////////////////////////////////////////// diff --git a/gui/ged/src/TGraphEditor.cxx b/gui/ged/src/TGraphEditor.cxx index 9a83848a719..db5923c78f0 100644 --- a/gui/ged/src/TGraphEditor.cxx +++ b/gui/ged/src/TGraphEditor.cxx @@ -41,6 +41,7 @@ #include "TGraph.h" #include "TVirtualPad.h" #include "TGraphErrors.h" +#include "TVirtualX.h" ClassImp(TGraphEditor); diff --git a/gui/ged/src/TH1Editor.cxx b/gui/ged/src/TH1Editor.cxx index 4da6d5054a5..cba46ffa156 100644 --- a/gui/ged/src/TH1Editor.cxx +++ b/gui/ged/src/TH1Editor.cxx @@ -146,6 +146,7 @@ #include "TGMsgBox.h" #include "TGTab.h" #include "TROOT.h" +#include "TVirtualX.h" ClassImp(TH1Editor); diff --git a/gui/ged/src/TH2Editor.cxx b/gui/ged/src/TH2Editor.cxx index 734e54477bd..55f14d13a43 100644 --- a/gui/ged/src/TH2Editor.cxx +++ b/gui/ged/src/TH2Editor.cxx @@ -147,6 +147,7 @@ #include "TGMsgBox.h" #include "TH2.h" #include "TROOT.h" +#include "TVirtualX.h" ClassImp(TH2Editor); diff --git a/gui/ged/src/TPieEditor.cxx b/gui/ged/src/TPieEditor.cxx index b4ad0f147d1..f28e9a0b550 100644 --- a/gui/ged/src/TPieEditor.cxx +++ b/gui/ged/src/TPieEditor.cxx @@ -40,6 +40,7 @@ #include "TColor.h" #include "TBox.h" #include "TPaveLabel.h" +#include "TVirtualX.h" ClassImp(TPieEditor); diff --git a/gui/ged/src/TStyleManager.cxx b/gui/ged/src/TStyleManager.cxx index 96a8be58c18..6b14cb77c6b 100644 --- a/gui/ged/src/TStyleManager.cxx +++ b/gui/ged/src/TStyleManager.cxx @@ -145,8 +145,9 @@ #include <TStyle.h> #include <TSystem.h> #include <TVirtualPad.h> +#include <TVirtualX.h> -TStyleManager *TStyleManager::fgStyleManager = 0; +TStyleManager *TStyleManager::fgStyleManager = nullptr; ClassImp(TStyleManager); diff --git a/gui/gui/src/TGIcon.cxx b/gui/gui/src/TGIcon.cxx index c7ea14a4a78..d01fd48c023 100644 --- a/gui/gui/src/TGIcon.cxx +++ b/gui/gui/src/TGIcon.cxx @@ -37,6 +37,7 @@ #include "TGFileDialog.h" #include "TGMsgBox.h" #include "TVirtualDragManager.h" +#include "TVirtualX.h" ClassImp(TGIcon); diff --git a/gui/gui/src/TGPasswdDialog.cxx b/gui/gui/src/TGPasswdDialog.cxx index c3f3175b025..bffed333c45 100644 --- a/gui/gui/src/TGPasswdDialog.cxx +++ b/gui/gui/src/TGPasswdDialog.cxx @@ -46,6 +46,7 @@ #include "TGTextBuffer.h" #include "TGString.h" #include "TROOT.h" +#include "TVirtualX.h" ClassImp(TGPasswdDialog); diff --git a/gui/gui/src/TGStatusBar.cxx b/gui/gui/src/TGStatusBar.cxx index f9ed3a742c5..ef0b019fadd 100644 --- a/gui/gui/src/TGStatusBar.cxx +++ b/gui/gui/src/TGStatusBar.cxx @@ -32,10 +32,11 @@ #include "TGResourcePool.h" #include "TList.h" #include "Riostream.h" +#include "TVirtualX.h" -const TGFont *TGStatusBar::fgDefaultFont = 0; -TGGC *TGStatusBar::fgDefaultGC = 0; +const TGFont *TGStatusBar::fgDefaultFont = nullptr; +TGGC *TGStatusBar::fgDefaultGC = nullptr; class TGStatusBarPart : public TGHorizontalFrame { diff --git a/gui/gui/src/TGTableContainer.cxx b/gui/gui/src/TGTableContainer.cxx index 895d0198245..67e9ba0775e 100644 --- a/gui/gui/src/TGTableContainer.cxx +++ b/gui/gui/src/TGTableContainer.cxx @@ -14,6 +14,7 @@ #include "TGWindow.h" #include "TGScrollBar.h" #include "TGTable.h" +#include "TVirtualX.h" ClassImp(TGTableFrame); ClassImp(TGTableHeaderFrame); diff --git a/gui/gui/src/TGTextEditDialogs.cxx b/gui/gui/src/TGTextEditDialogs.cxx index 3137bfe820d..ccdb53e616c 100644 --- a/gui/gui/src/TGTextEditDialogs.cxx +++ b/gui/gui/src/TGTextEditDialogs.cxx @@ -40,6 +40,7 @@ #include "TGComboBox.h" #include "TSystem.h" #include "TObjArray.h" +#include "TVirtualX.h" #include <stdlib.h> diff --git a/gui/gui/src/TGToolTip.cxx b/gui/gui/src/TGToolTip.cxx index b1234d383a0..e9cbcc6afe1 100644 --- a/gui/gui/src/TGToolTip.cxx +++ b/gui/gui/src/TGToolTip.cxx @@ -43,6 +43,7 @@ #include "TSystem.h" #include "TVirtualPad.h" #include "TBox.h" +#include "TVirtualX.h" ClassImp(TGToolTip); diff --git a/gui/gui/src/TGTripleSlider.cxx b/gui/gui/src/TGTripleSlider.cxx index f9ca83b8f38..c1bc1037e9d 100644 --- a/gui/gui/src/TGTripleSlider.cxx +++ b/gui/gui/src/TGTripleSlider.cxx @@ -66,6 +66,7 @@ #include "TGPicture.h" #include "Riostream.h" #include "TSystem.h" +#include "TVirtualX.h" #include <stdlib.h> ClassImp(TGTripleVSlider); diff --git a/gui/gui/src/TGView.cxx b/gui/gui/src/TGView.cxx index 153b4d5bef8..3b2bf75b6fd 100644 --- a/gui/gui/src/TGView.cxx +++ b/gui/gui/src/TGView.cxx @@ -48,8 +48,7 @@ #include "TMath.h" #include "KeySymbols.h" #include "RConfigure.h" - - +#include "TVirtualX.h" ClassImp(TGViewFrame); diff --git a/gui/gui/src/TRootDialog.cxx b/gui/gui/src/TRootDialog.cxx index 04a0e0d66fd..85ee97245a7 100644 --- a/gui/gui/src/TRootDialog.cxx +++ b/gui/gui/src/TRootDialog.cxx @@ -29,6 +29,7 @@ #include "TGButton.h" #include "TObjString.h" #include "KeySymbols.h" +#include "TVirtualX.h" extern TGTextEntry *gBlinkingEntry; diff --git a/gui/guibuilder/src/TGuiBldDragManager.cxx b/gui/guibuilder/src/TGuiBldDragManager.cxx index 4e099b211ac..e4891e03779 100644 --- a/gui/guibuilder/src/TGuiBldDragManager.cxx +++ b/gui/guibuilder/src/TGuiBldDragManager.cxx @@ -50,6 +50,7 @@ #include "TGProgressBar.h" #include "TGScrollBar.h" #include "TGTextEntry.h" +#include "TVirtualX.h" #undef DEBUG_LOCAL diff --git a/gui/guibuilder/src/TGuiBldHintsButton.cxx b/gui/guibuilder/src/TGuiBldHintsButton.cxx index fa55324872b..b2e41d45bcd 100644 --- a/gui/guibuilder/src/TGuiBldHintsButton.cxx +++ b/gui/guibuilder/src/TGuiBldHintsButton.cxx @@ -11,6 +11,7 @@ #include "TGuiBldHintsButton.h" #include "TGResourcePool.h" +#include "TVirtualX.h" //_____________________________________________________________________________ // diff --git a/gui/guibuilder/src/TRootGuiBuilder.cxx b/gui/guibuilder/src/TRootGuiBuilder.cxx index f358632d11e..cbeb68264d3 100644 --- a/gui/guibuilder/src/TRootGuiBuilder.cxx +++ b/gui/guibuilder/src/TRootGuiBuilder.cxx @@ -42,6 +42,7 @@ #include "TGListBox.h" #include "TGComboBox.h" #include "TGProgressBar.h" +#include "TVirtualX.h" ////////////////////////////////////////////////////////////////////////// diff --git a/gui/guihtml/src/TGHtml.cxx b/gui/guihtml/src/TGHtml.cxx index eb9ab0f2da8..ea5715fc044 100644 --- a/gui/guihtml/src/TGHtml.cxx +++ b/gui/guihtml/src/TGHtml.cxx @@ -47,6 +47,7 @@ #include "Riostream.h" #include "TGComboBox.h" #include "TGListBox.h" +#include "TVirtualX.h" //_____________________________________________________________________________ // diff --git a/gui/guihtml/src/TGHtmlBrowser.cxx b/gui/guihtml/src/TGHtmlBrowser.cxx index b83bd2e65d4..89f846e4235 100644 --- a/gui/guihtml/src/TGHtmlBrowser.cxx +++ b/gui/guihtml/src/TGHtmlBrowser.cxx @@ -30,6 +30,7 @@ #include "TGHtmlBrowser.h" #include "TGText.h" #include "TError.h" +#include "TVirtualX.h" #ifdef R__SSL #include "TSSLSocket.h" #endif diff --git a/gui/guihtml/src/TGHtmlDraw.cxx b/gui/guihtml/src/TGHtmlDraw.cxx index 6fece42ea54..e2eb639e5fe 100644 --- a/gui/guihtml/src/TGHtmlDraw.cxx +++ b/gui/guihtml/src/TGHtmlDraw.cxx @@ -38,6 +38,7 @@ #include "TGHtml.h" #include "TImage.h" +#include "TVirtualX.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/gui/guihtml/src/TGHtmlSizer.cxx b/gui/guihtml/src/TGHtmlSizer.cxx index fce3ac53dd0..9bd1a722ac2 100644 --- a/gui/guihtml/src/TGHtmlSizer.cxx +++ b/gui/guihtml/src/TGHtmlSizer.cxx @@ -31,6 +31,7 @@ #include "TGHtml.h" #include "TImage.h" +#include "TVirtualX.h" //////////////////////////////////////////////////////////////////////////////// /// Get the current rendering style. In other words, get the style diff --git a/gui/recorder/src/TRecorder.cxx b/gui/recorder/src/TRecorder.cxx index e217f7c2b1c..5377cb86a63 100644 --- a/gui/recorder/src/TRecorder.cxx +++ b/gui/recorder/src/TRecorder.cxx @@ -134,6 +134,8 @@ #include "TVirtualDragManager.h" #include "TGPicture.h" #include "KeySymbols.h" +#include "TVirtualX.h" + // Names of ROOT GUI events. Used for listing event logs. const char *kRecEventNames[] = { diff --git a/gui/sessionviewer/src/TProofProgressDialog.cxx b/gui/sessionviewer/src/TProofProgressDialog.cxx index 7443d87c9d8..4773ba40d88 100644 --- a/gui/sessionviewer/src/TProofProgressDialog.cxx +++ b/gui/sessionviewer/src/TProofProgressDialog.cxx @@ -42,6 +42,8 @@ #include "TMath.h" #include "TH1F.h" #include "THLimitsFinder.h" +#include "TVirtualX.h" + #ifdef PPD_SRV_NEWER #undef PPD_SRV_NEWER diff --git a/gui/sessionviewer/src/TSessionDialogs.cxx b/gui/sessionviewer/src/TSessionDialogs.cxx index ef44dec531a..60fdd65cd98 100644 --- a/gui/sessionviewer/src/TSessionDialogs.cxx +++ b/gui/sessionviewer/src/TSessionDialogs.cxx @@ -44,6 +44,7 @@ #include "TFileInfo.h" #include "TGMsgBox.h" #include "TRegexp.h" +#include "TVirtualX.h" ClassImp(TNewChainDlg); ClassImp(TNewQueryDlg); diff --git a/gui/sessionviewer/src/TSessionViewer.cxx b/gui/sessionviewer/src/TSessionViewer.cxx index d97034f4380..2576ce74074 100644 --- a/gui/sessionviewer/src/TSessionViewer.cxx +++ b/gui/sessionviewer/src/TSessionViewer.cxx @@ -64,6 +64,7 @@ #include "TH2.h" #include "TTreePlayer.h" #include "TFileCollection.h" +#include "TVirtualX.h" #ifdef WIN32 #include "TWin32SplashThread.h" #endif diff --git a/test/stressGUI.cxx b/test/stressGUI.cxx index bbf14e46d1a..f1590679a33 100644 --- a/test/stressGUI.cxx +++ b/test/stressGUI.cxx @@ -78,6 +78,7 @@ #include <TSystemDirectory.h> #include <TInterpreter.h> #include <TStopwatch.h> +#include <TVirtualX.h> #include <TRecorder.h> -- GitLab