From a9cab5d184e27015a2292e8fd83f5f83be0bdba9 Mon Sep 17 00:00:00 2001
From: Sergey Linev <S.Linev@gsi.de>
Date: Fri, 28 Feb 2020 10:52:20 +0100
Subject: [PATCH] Use TVirtualPad.h in geom

---
 geom/geom/src/TGeoVolume.cxx                | 1 -
 geom/geombuilder/src/TGeoBBoxEditor.cxx     | 2 +-
 geom/geombuilder/src/TGeoConeEditor.cxx     | 2 +-
 geom/geombuilder/src/TGeoEltuEditor.cxx     | 2 +-
 geom/geombuilder/src/TGeoHypeEditor.cxx     | 2 +-
 geom/geombuilder/src/TGeoMaterialEditor.cxx | 1 -
 geom/geombuilder/src/TGeoMatrixEditor.cxx   | 2 +-
 geom/geombuilder/src/TGeoMediumEditor.cxx   | 1 -
 geom/geombuilder/src/TGeoNodeEditor.cxx     | 1 -
 geom/geombuilder/src/TGeoParaEditor.cxx     | 2 +-
 geom/geombuilder/src/TGeoPconEditor.cxx     | 2 +-
 geom/geombuilder/src/TGeoPgonEditor.cxx     | 2 +-
 geom/geombuilder/src/TGeoSphereEditor.cxx   | 2 +-
 geom/geombuilder/src/TGeoTorusEditor.cxx    | 2 +-
 geom/geombuilder/src/TGeoTrapEditor.cxx     | 2 +-
 geom/geombuilder/src/TGeoTrd1Editor.cxx     | 2 +-
 geom/geombuilder/src/TGeoTrd2Editor.cxx     | 2 +-
 geom/geombuilder/src/TGeoTubeEditor.cxx     | 2 +-
 geom/geompainter/src/TGeoPainter.cxx        | 2 +-
 19 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/geom/geom/src/TGeoVolume.cxx b/geom/geom/src/TGeoVolume.cxx
index 8ccb67c7ccc..544ba0c014a 100644
--- a/geom/geom/src/TGeoVolume.cxx
+++ b/geom/geom/src/TGeoVolume.cxx
@@ -382,7 +382,6 @@ volumes (or volume assemblies) as content.
 #include "TBrowser.h"
 #include "TStyle.h"
 #include "TH2F.h"
-#include "TPad.h"
 #include "TROOT.h"
 #include "TClass.h"
 #include "TEnv.h"
diff --git a/geom/geombuilder/src/TGeoBBoxEditor.cxx b/geom/geombuilder/src/TGeoBBoxEditor.cxx
index e496d8f20d9..715737884fc 100644
--- a/geom/geombuilder/src/TGeoBBoxEditor.cxx
+++ b/geom/geombuilder/src/TGeoBBoxEditor.cxx
@@ -25,7 +25,7 @@ Editor for a TGeoBBox.
 #include "TGeoBBox.h"
 #include "TGeoManager.h"
 #include "TVirtualGeoPainter.h"
-#include "TPad.h"
+#include "TVirtualPad.h"
 #include "TView.h"
 #include "TGTab.h"
 #include "TGComboBox.h"
diff --git a/geom/geombuilder/src/TGeoConeEditor.cxx b/geom/geombuilder/src/TGeoConeEditor.cxx
index dc6000ce2df..e2e5e6a6916 100644
--- a/geom/geombuilder/src/TGeoConeEditor.cxx
+++ b/geom/geombuilder/src/TGeoConeEditor.cxx
@@ -26,7 +26,7 @@ Editor for a TGeoCone.
 #include "TGeoCone.h"
 #include "TGeoManager.h"
 #include "TVirtualGeoPainter.h"
-#include "TPad.h"
+#include "TVirtualPad.h"
 #include "TView.h"
 #include "TGTab.h"
 #include "TGComboBox.h"
diff --git a/geom/geombuilder/src/TGeoEltuEditor.cxx b/geom/geombuilder/src/TGeoEltuEditor.cxx
index 3fd0a8e41f2..e1a91392c1e 100644
--- a/geom/geombuilder/src/TGeoEltuEditor.cxx
+++ b/geom/geombuilder/src/TGeoEltuEditor.cxx
@@ -25,7 +25,7 @@ Editor for a TGeoEltu.
 #include "TGeoEltu.h"
 #include "TGeoManager.h"
 #include "TVirtualGeoPainter.h"
-#include "TPad.h"
+#include "TVirtualPad.h"
 #include "TView.h"
 #include "TGTab.h"
 #include "TGComboBox.h"
diff --git a/geom/geombuilder/src/TGeoHypeEditor.cxx b/geom/geombuilder/src/TGeoHypeEditor.cxx
index 58cf6aabebf..d8108a62717 100644
--- a/geom/geombuilder/src/TGeoHypeEditor.cxx
+++ b/geom/geombuilder/src/TGeoHypeEditor.cxx
@@ -25,7 +25,7 @@ Editor for a TGeoHype.
 #include "TGeoHype.h"
 #include "TGeoManager.h"
 #include "TVirtualGeoPainter.h"
-#include "TPad.h"
+#include "TVirtualPad.h"
 #include "TView.h"
 #include "TMath.h"
 #include "TGTab.h"
diff --git a/geom/geombuilder/src/TGeoMaterialEditor.cxx b/geom/geombuilder/src/TGeoMaterialEditor.cxx
index 2e475edc7d9..65119611afa 100644
--- a/geom/geombuilder/src/TGeoMaterialEditor.cxx
+++ b/geom/geombuilder/src/TGeoMaterialEditor.cxx
@@ -22,7 +22,6 @@ Editors for materials.
 #include "TGeoMaterial.h"
 #include "TGeoManager.h"
 #include "TVirtualGeoPainter.h"
-#include "TPad.h"
 #include "TView.h"
 #include "TGTab.h"
 #include "TGComboBox.h"
diff --git a/geom/geombuilder/src/TGeoMatrixEditor.cxx b/geom/geombuilder/src/TGeoMatrixEditor.cxx
index fa6e15e8268..4aba9dc4647 100644
--- a/geom/geombuilder/src/TGeoMatrixEditor.cxx
+++ b/geom/geombuilder/src/TGeoMatrixEditor.cxx
@@ -19,7 +19,7 @@ Editor for a TGeoTranslation.
 #include "TGeoMatrixEditor.h"
 #include "TGeoTabManager.h"
 #include "TGeoMatrix.h"
-#include "TPad.h"
+#include "TVirtualPad.h"
 #include "TGTab.h"
 #include "TGComboBox.h"
 #include "TGButton.h"
diff --git a/geom/geombuilder/src/TGeoMediumEditor.cxx b/geom/geombuilder/src/TGeoMediumEditor.cxx
index 8d520767819..e525b9cdb29 100644
--- a/geom/geombuilder/src/TGeoMediumEditor.cxx
+++ b/geom/geombuilder/src/TGeoMediumEditor.cxx
@@ -21,7 +21,6 @@ Editor class for TGeo tracking media.
 #include "TGeoManager.h"
 #include "TGeoMedium.h"
 #include "TGeoMaterial.h"
-#include "TPad.h"
 #include "TGTab.h"
 #include "TGComboBox.h"
 #include "TGButton.h"
diff --git a/geom/geombuilder/src/TGeoNodeEditor.cxx b/geom/geombuilder/src/TGeoNodeEditor.cxx
index dccca3d41c6..28129baf3f8 100644
--- a/geom/geombuilder/src/TGeoNodeEditor.cxx
+++ b/geom/geombuilder/src/TGeoNodeEditor.cxx
@@ -21,7 +21,6 @@ Editor class for TGeoNode objects.
 #include "TGeoManager.h"
 #include "TGeoMatrix.h"
 #include "TGeoNode.h"
-#include "TPad.h"
 #include "TGTab.h"
 #include "TGComboBox.h"
 #include "TGButton.h"
diff --git a/geom/geombuilder/src/TGeoParaEditor.cxx b/geom/geombuilder/src/TGeoParaEditor.cxx
index e9184f7350e..016a93f9553 100644
--- a/geom/geombuilder/src/TGeoParaEditor.cxx
+++ b/geom/geombuilder/src/TGeoParaEditor.cxx
@@ -25,7 +25,7 @@ Editor for a TGeoPara.
 #include "TGeoPara.h"
 #include "TGeoManager.h"
 #include "TVirtualGeoPainter.h"
-#include "TPad.h"
+#include "TVirtualPad.h"
 #include "TView.h"
 #include "TGTab.h"
 #include "TGComboBox.h"
diff --git a/geom/geombuilder/src/TGeoPconEditor.cxx b/geom/geombuilder/src/TGeoPconEditor.cxx
index dc71f629fad..bb5a63130c7 100644
--- a/geom/geombuilder/src/TGeoPconEditor.cxx
+++ b/geom/geombuilder/src/TGeoPconEditor.cxx
@@ -25,7 +25,7 @@ Editor for a TGeoPcon.
 #include "TGeoPcon.h"
 #include "TGeoManager.h"
 #include "TVirtualGeoPainter.h"
-#include "TPad.h"
+#include "TVirtualPad.h"
 #include "TView.h"
 #include "TGTab.h"
 #include "TGComboBox.h"
diff --git a/geom/geombuilder/src/TGeoPgonEditor.cxx b/geom/geombuilder/src/TGeoPgonEditor.cxx
index 0ceaeb62c01..aaa753f8273 100644
--- a/geom/geombuilder/src/TGeoPgonEditor.cxx
+++ b/geom/geombuilder/src/TGeoPgonEditor.cxx
@@ -25,7 +25,7 @@ Editor for a TGeoPgon.
 #include "TGeoPgon.h"
 #include "TGeoManager.h"
 #include "TVirtualGeoPainter.h"
-#include "TPad.h"
+#include "TVirtualPad.h"
 #include "TView.h"
 #include "TGTab.h"
 #include "TGComboBox.h"
diff --git a/geom/geombuilder/src/TGeoSphereEditor.cxx b/geom/geombuilder/src/TGeoSphereEditor.cxx
index 46ed812c6fc..c3ce4202ad0 100644
--- a/geom/geombuilder/src/TGeoSphereEditor.cxx
+++ b/geom/geombuilder/src/TGeoSphereEditor.cxx
@@ -25,7 +25,7 @@ Editor for a TGeoSphere.
 #include "TGeoSphere.h"
 #include "TGeoManager.h"
 #include "TVirtualGeoPainter.h"
-#include "TPad.h"
+#include "TVirtualPad.h"
 #include "TView.h"
 #include "TGTab.h"
 #include "TGComboBox.h"
diff --git a/geom/geombuilder/src/TGeoTorusEditor.cxx b/geom/geombuilder/src/TGeoTorusEditor.cxx
index f2d37b6189f..12954dffcef 100644
--- a/geom/geombuilder/src/TGeoTorusEditor.cxx
+++ b/geom/geombuilder/src/TGeoTorusEditor.cxx
@@ -25,7 +25,7 @@ Editor for a TGeoTorus.
 #include "TGeoTorus.h"
 #include "TGeoManager.h"
 #include "TVirtualGeoPainter.h"
-#include "TPad.h"
+#include "TVirtualPad.h"
 #include "TView.h"
 #include "TGTab.h"
 #include "TGComboBox.h"
diff --git a/geom/geombuilder/src/TGeoTrapEditor.cxx b/geom/geombuilder/src/TGeoTrapEditor.cxx
index 9b3a539ee20..0f51d7054d7 100644
--- a/geom/geombuilder/src/TGeoTrapEditor.cxx
+++ b/geom/geombuilder/src/TGeoTrapEditor.cxx
@@ -25,7 +25,7 @@ Editor for a TGeoTrap.
 #include "TGeoArb8.h"
 #include "TGeoManager.h"
 #include "TVirtualGeoPainter.h"
-#include "TPad.h"
+#include "TVirtualPad.h"
 #include "TView.h"
 #include "TGTab.h"
 #include "TGComboBox.h"
diff --git a/geom/geombuilder/src/TGeoTrd1Editor.cxx b/geom/geombuilder/src/TGeoTrd1Editor.cxx
index 0950d004e85..f58d8c1e267 100644
--- a/geom/geombuilder/src/TGeoTrd1Editor.cxx
+++ b/geom/geombuilder/src/TGeoTrd1Editor.cxx
@@ -25,7 +25,7 @@ Editor for a TGeoTrd1.
 #include "TGeoTrd1.h"
 #include "TGeoManager.h"
 #include "TVirtualGeoPainter.h"
-#include "TPad.h"
+#include "TVirtualPad.h"
 #include "TView.h"
 #include "TGTab.h"
 #include "TGComboBox.h"
diff --git a/geom/geombuilder/src/TGeoTrd2Editor.cxx b/geom/geombuilder/src/TGeoTrd2Editor.cxx
index 5d5ee74024a..c22fa62a35a 100644
--- a/geom/geombuilder/src/TGeoTrd2Editor.cxx
+++ b/geom/geombuilder/src/TGeoTrd2Editor.cxx
@@ -25,7 +25,7 @@ Editor for a TGeoTrd2.
 #include "TGeoTrd2.h"
 #include "TGeoManager.h"
 #include "TVirtualGeoPainter.h"
-#include "TPad.h"
+#include "TVirtualPad.h"
 #include "TView.h"
 #include "TGTab.h"
 #include "TGComboBox.h"
diff --git a/geom/geombuilder/src/TGeoTubeEditor.cxx b/geom/geombuilder/src/TGeoTubeEditor.cxx
index af4cc765309..c8c2d624ecc 100644
--- a/geom/geombuilder/src/TGeoTubeEditor.cxx
+++ b/geom/geombuilder/src/TGeoTubeEditor.cxx
@@ -25,7 +25,7 @@ Editor for a TGeoTube.
 #include "TGeoTube.h"
 #include "TGeoManager.h"
 #include "TVirtualGeoPainter.h"
-#include "TPad.h"
+#include "TVirtualPad.h"
 #include "TView.h"
 #include "TGTab.h"
 #include "TMath.h"
diff --git a/geom/geompainter/src/TGeoPainter.cxx b/geom/geompainter/src/TGeoPainter.cxx
index 349be5009a6..8f9e170a5fd 100644
--- a/geom/geompainter/src/TGeoPainter.cxx
+++ b/geom/geompainter/src/TGeoPainter.cxx
@@ -23,7 +23,7 @@ using TBuffer3D mechanism.
 #include "TView.h"
 #include "TAttLine.h"
 #include "TAttFill.h"
-#include "TPad.h"
+#include "TVirtualPad.h"
 #include "TCanvas.h"
 #include "TH2F.h"
 #include "TF1.h"
-- 
GitLab