X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab171e95021482a8a0c0e24ebe050fa0181e7af0..fada8bef05c36e3bae29f9442f8d32b024905207:/src/gtk/dcscreen.cpp?ds=sidebyside

diff --git a/src/gtk/dcscreen.cpp b/src/gtk/dcscreen.cpp
index 9883225620..e32427f51e 100644
--- a/src/gtk/dcscreen.cpp
+++ b/src/gtk/dcscreen.cpp
@@ -11,6 +11,7 @@
 #include "wx/wxprec.h"
 
 #include "wx/dcscreen.h"
+#include "wx/gtk/dcscreen.h"
 
 #ifndef WX_PRECOMP
     #include "wx/window.h"
@@ -20,36 +21,23 @@
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 
-
 //-----------------------------------------------------------------------------
-// wxScreenDC
+// wxScreenDCImpl
 //-----------------------------------------------------------------------------
 
-#if wxUSE_NEW_DC
-IMPLEMENT_ABSTRACT_CLASS(wxGTKScreenImplDC, wxGTKWindowImplDC)
-#else
-IMPLEMENT_ABSTRACT_CLASS(wxScreenDC,wxWindowDC)
-#endif
+IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl)
 
-#if wxUSE_NEW_DC
-wxGTKScreenImplDC::wxGTKScreenImplDC( wxScreenDC *owner ) 
-  : wxGTKWindowImplDC( owner )
+wxScreenDCImpl::wxScreenDCImpl( wxScreenDC *owner ) 
+  : wxWindowDCImpl( owner )
 { 
     Init(); 
 }
 
-#else
-wxScreenDC::wxScreenDC() 
-{ 
-    Init(); 
-}
-#endif
-
-void wxGTKScreenImplDC::Init()
+void wxScreenDCImpl::Init()
 {
     m_ok = false;
     m_cmap = gdk_colormap_get_system();
-    m_window = gdk_get_default_root_window();
+    m_gdkwindow = gdk_get_default_root_window();
 
     m_context = gdk_pango_context_get();
     // Note: The Sun customised version of Pango shipping with Solaris 10
@@ -68,7 +56,7 @@ void wxGTKScreenImplDC::Init()
     gdk_gc_set_subwindow( m_bgGC, GDK_INCLUDE_INFERIORS );
 }
 
-wxGTKScreenImplDC::~wxGTKScreenImplDC()
+wxScreenDCImpl::~wxScreenDCImpl()
 {
     gdk_gc_set_subwindow( m_penGC, GDK_CLIP_BY_CHILDREN );
     gdk_gc_set_subwindow( m_brushGC, GDK_CLIP_BY_CHILDREN );
@@ -76,7 +64,7 @@ wxGTKScreenImplDC::~wxGTKScreenImplDC()
     gdk_gc_set_subwindow( m_bgGC, GDK_CLIP_BY_CHILDREN );
 }
 
-void wxGTKScreenImplDC::DoGetSize(int *width, int *height) const
+void wxScreenDCImpl::DoGetSize(int *width, int *height) const
 {
     wxDisplaySize(width, height);
 }