more DC changes for wxX11

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/x11/dcscreen.h b/include/wx/x11/dcscreen.h
index 667ea6dcc5fd40c211ae92d58652e97abf0332dc..07cc7dac214dcf8172aafc94947cae3cd06f6321 100644 (file)
--- a/include/wx/x11/dcscreen.h
+++ b/include/wx/x11/dcscreen.h
@@ -13,32 +13,23 @@
 #define _WX_DCSCREEN_H_
 
 #include "wx/dcclient.h"
+#include "wx/x11/dcclient.h"
 
 //-----------------------------------------------------------------------------
 // wxScreenDC
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxScreenDC : public wxPaintDC
+class WXDLLIMPEXP_CORE wxScreenDCImpl : public wxPaintDCImpl
 {
 public:
-    wxScreenDC();
-    virtual ~wxScreenDC();
-
-    static bool StartDrawingOnTop( wxWindow *window );
-    static bool StartDrawingOnTop( wxRect *rect = (wxRect *) NULL );
-    static bool EndDrawingOnTop();
-
-    // implementation
-
-    static WXWindow   *sm_overlayWindow;
-    static int         sm_overlayWindowX;
-    static int         sm_overlayWindowY;
+    wxScreenDCImpl( wxDC *owner);
+    virtual ~wxScreenDCImpl();
 
 protected:
     virtual void DoGetSize(int *width, int *height) const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxScreenDC)
+    DECLARE_CLASS(wxScreenDCImpl)
 };
 
 

diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index 194e4422fbaf3a1c56fb37564e5fdbcbc1c31089..5bf809d34b873df8f1d676b03e88029e2bc489df 100644 (file)
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -56,6 +56,12 @@
 #include "wx/mac/dcscreen.h"
 #endif
 
+#ifdef __WXX11__
+#include "wx/x11/dcclient.h"
+#include "wx/x11/dcmemory.h"
+#include "wx/x11/dcscreen.h"
+#endif
+
 //----------------------------------------------------------------------------
 // wxDCFactory
 //----------------------------------------------------------------------------

diff --git a/src/x11/dcscreen.cpp b/src/x11/dcscreen.cpp
index 58ac7e3a18e8e9f8ada153ac00ea22f4cebbf5a5..1683688160224c3317637064ed9ab0f55c705e5f 100644 (file)
--- a/src/x11/dcscreen.cpp
+++ b/src/x11/dcscreen.cpp
@@ -13,6 +13,7 @@
 #include "wx/wxprec.h"
 
 #include "wx/dcscreen.h"
+#include "wx/x11/dcscreen.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
@@ -25,21 +26,14 @@
 
 #include "wx/x11/private.h"
 
-//-----------------------------------------------------------------------------
-// global data initialization
-//-----------------------------------------------------------------------------
-
-WXWindow *wxScreenDC::sm_overlayWindow  = (WXWindow*) NULL;
-int wxScreenDC::sm_overlayWindowX = 0;
-int wxScreenDC::sm_overlayWindowY = 0;
-
 //-----------------------------------------------------------------------------
 // wxScreenDC
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxScreenDC,wxPaintDC)
+IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl,wxPaintDCImpl)
 
-wxScreenDC::wxScreenDC()
+wxScreenDCImpl::wxScreenDCImpl( wxDC* owner ) :
+  wxPaintDCImpl( owner )
 {
     m_ok = false;
 
@@ -48,7 +42,7 @@ wxScreenDC::wxScreenDC()
     int screen = DefaultScreen( (Display*) m_display );
     m_cmap = (WXColormap) DefaultColormap( (Display*) m_display, screen );
 
-    m_window = (WXWindow) RootWindow( (Display*) m_display, screen );
+    m_x11window = (WXWindow) RootWindow( (Display*) m_display, screen );
 
     m_isScreenDC = true;
 
@@ -65,49 +59,11 @@ wxScreenDC::wxScreenDC()
     XSetSubwindowMode( (Display*) m_display, (GC) m_bgGC, IncludeInferiors );
 }
 
-wxScreenDC::~wxScreenDC()
+wxScreenDCImpl::~wxScreenDCImpl()
 {
     XSetSubwindowMode( (Display*) m_display, (GC) m_penGC, ClipByChildren );
     XSetSubwindowMode( (Display*) m_display, (GC) m_brushGC, ClipByChildren );
     XSetSubwindowMode( (Display*) m_display, (GC) m_textGC, ClipByChildren );
     XSetSubwindowMode( (Display*) m_display, (GC) m_bgGC, ClipByChildren );
-
-    EndDrawingOnTop();
-}
-
-bool wxScreenDC::StartDrawingOnTop( wxWindow *window )
-{
-    if (!window) return StartDrawingOnTop();
-
-    int x = 0;
-    int y = 0;
-    window->GetPosition( &x, &y );
-    int w = 0;
-    int h = 0;
-    window->GetSize( &w, &h );
-    window->ClientToScreen( &x, &y );
-
-    wxRect rect;
-    rect.x = x;
-    rect.y = y;
-    rect.width = 0;
-    rect.height = 0;
-
-    return StartDrawingOnTop( &rect );
 }
 
-bool wxScreenDC::StartDrawingOnTop( wxRect *WXUNUSED(rectIn) )
-{
-    // VZ: should we do the same thing that wxMotif wxScreenDC does here?
-    return true;
-}
-
-bool wxScreenDC::EndDrawingOnTop()
-{
-    return true;
-}
-
-void wxScreenDC::DoGetSize(int *width, int *height) const
-{
-    wxDisplaySize(width, height);
-}