update to 2.9.0

[wxWidgets.git] / include / wx / gtk / dcscreen.h

diff --git a/include/wx/gtk/dcscreen.h b/include/wx/gtk/dcscreen.h
index 3b23ae32046a2a3b41b32ab49b77b09e09c670a7..79ed9959a907b048e5786b07b3fd594fba007788 100644 (file)
--- a/include/wx/gtk/dcscreen.h
+++ b/include/wx/gtk/dcscreen.h
@@ -12,37 +12,39 @@
 
 #include "wx/dcclient.h"
 
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxScreenDC;
-
 //-----------------------------------------------------------------------------
 // wxScreenDC
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxScreenDC : public wxPaintDC
+#if wxUSE_NEW_DC
+class WXDLLIMPEXP_CORE wxGTKScreenImplDC : public wxGTKWindowImplDC
+#else
+#define wxGTKScreenImplDC wxScreenDC
+class WXDLLIMPEXP_CORE wxScreenDC : public wxWindowDC
+#endif
 {
 public:
+
+#if wxUSE_NEW_DC
+    wxGTKScreenImplDC( wxScreenDC *owner );
+#else
     wxScreenDC();
-    virtual ~wxScreenDC();
+#endif
 
-    static bool StartDrawingOnTop( wxWindow *window );
-    static bool StartDrawingOnTop( wxRect *rect = (wxRect *) NULL );
-    static bool EndDrawingOnTop();
+    ~wxGTKScreenImplDC();
 
-    // implementation
+    static bool StartDrawingOnTop( wxWindow *window ) { return true; }
+    static bool StartDrawingOnTop( wxRect *rect = (wxRect *) NULL ) { return true; }
+    static bool EndDrawingOnTop() { return true; }
 
-    static GdkWindow  *sm_overlayWindow;
-    static int         sm_overlayWindowX;
-    static int         sm_overlayWindowY;
 
 protected:
     virtual void DoGetSize(int *width, int *height) const;
+    
+    void Init();
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxScreenDC)
+    DECLARE_ABSTRACT_CLASS(wxGTKScreenImplDC)
 };
 
 #endif