Remove TVirtualX.h include from TGWindow.h

Move several virtual methods to implementation file

Do not expose X to GUI classes - they should include TVirtualX.h only
when required. 

gui/gui/inc/TGWindow.h

@@ -23,7 +23,6 @@
 
 #include "TGObject.h"
 #include "TGClient.h"
-#include "TVirtualX.h"
 
 class TGClient;
 class TGIdleHandler;
@@ -85,22 +84,20 @@ public:
    const TGWindow *GetParent() const { return fParent; }
    virtual const TGWindow *GetMainFrame() const;
 
-   virtual void MapWindow() { gVirtualX->MapWindow(fId); }
-   virtual void MapSubwindows() { gVirtualX->MapSubwindows(fId); }
-   virtual void MapRaised() { gVirtualX->MapRaised(fId); }
-   virtual void UnmapWindow() { gVirtualX->UnmapWindow(fId); }
-   virtual void DestroyWindow() { gVirtualX->DestroyWindow(fId); }
-   virtual void DestroySubwindows() { gVirtualX->DestroySubwindows(fId); }
-   virtual void RaiseWindow() { gVirtualX->RaiseWindow(fId); }
-   virtual void LowerWindow() { gVirtualX->LowerWindow(fId); }
-   virtual void IconifyWindow() { gVirtualX->IconifyWindow(fId); }
+   virtual void MapWindow();
+   virtual void MapSubwindows();
+   virtual void MapRaised();
+   virtual void UnmapWindow();
+   virtual void DestroyWindow();
+   virtual void DestroySubwindows();
+   virtual void RaiseWindow();
+   virtual void LowerWindow();
+   virtual void IconifyWindow();
    virtual void ReparentWindow(const TGWindow *p, Int_t x = 0, Int_t y = 0);
-   virtual void RequestFocus() { gVirtualX->SetInputFocus(fId); }
+   virtual void RequestFocus();
 
-   virtual void SetBackgroundColor(Pixel_t color)
-                  { gVirtualX->SetWindowBackground(fId, color); }
-   virtual void SetBackgroundPixmap(Pixmap_t pixmap)
-                  { gVirtualX->SetWindowBackgroundPixmap(fId, pixmap); }
+   virtual void SetBackgroundColor(Pixel_t color);
+   virtual void SetBackgroundPixmap(Pixmap_t pixmap);
 
    virtual Bool_t HandleExpose(Event_t *event)
                   { if (event->fCount == 0) fClient->NeedRedraw(this); return kTRUE; }

gui/gui/src/TGWindow.cxx

@@ -31,6 +31,7 @@
 #include "TGWindow.h"
 #include "Riostream.h"
 #include "TApplication.h"
+#include "TVirtualX.h"
 
 ClassImp(TGWindow);
 ClassImp(TGUnknownWindowHandler);
@@ -135,6 +136,102 @@ const TGWindow *TGWindow::GetMainFrame() const
    return ((fParent == 0) || (fParent == fClient->GetDefaultRoot())) ? this : fParent->GetMainFrame();
 }
 
+////////////////////////////////////////////////////////////////////////////////
+/// map window
+
+void TGWindow::MapWindow()
+{
+   gVirtualX->MapWindow(fId);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+/// map sub windows
+
+void TGWindow::MapSubwindows()
+{
+   gVirtualX->MapSubwindows(fId);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+/// map raised
+
+void TGWindow::MapRaised()
+{
+   gVirtualX->MapRaised(fId);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+/// unmap window
+
+void TGWindow::UnmapWindow()
+{
+   gVirtualX->UnmapWindow(fId);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+/// destroy window
+
+void TGWindow::DestroyWindow()
+{
+   gVirtualX->DestroyWindow(fId);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+/// destroy sub windows
+
+void TGWindow::DestroySubwindows()
+{
+   gVirtualX->DestroySubwindows(fId);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+/// raise window
+
+void TGWindow::RaiseWindow()
+{
+   gVirtualX->RaiseWindow(fId);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+/// lower window
+
+void TGWindow::LowerWindow()
+{
+   gVirtualX->LowerWindow(fId);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+/// iconify window
+
+void TGWindow::IconifyWindow()
+{
+   gVirtualX->IconifyWindow(fId);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+/// request focus
+
+void TGWindow::RequestFocus()
+{
+   gVirtualX->SetInputFocus(fId);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+/// set background color
+
+void TGWindow::SetBackgroundColor(Pixel_t color)
+{
+   gVirtualX->SetWindowBackground(fId, color);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+/// set background pixmap
+
+void TGWindow::SetBackgroundPixmap(Pixmap_t pixmap)
+{
+   gVirtualX->SetWindowBackgroundPixmap(fId, pixmap);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 /// Reparent window, make p the new parent and position the window at
 /// position (x,y) in new parent.