another DMC build fix (http://thread.gmane.org/gmane.comp.lib.wxwidgets.devel/93155)

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

diff --git a/include/wx/gtk/dcscreen.h b/include/wx/gtk/dcscreen.h
index c2be00de89cfd4c3a49044c04863f4739e41de84..1e8a9425acc0f87c5a189a64710e5e066cb2274a 100644 (file)
--- a/include/wx/gtk/dcscreen.h
+++ b/include/wx/gtk/dcscreen.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKDCSCREENH__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKDCSCREENH__


@@ -12,36 +12,42 @@
 
 #include "wx/dcclient.h"
 
 
 #include "wx/dcclient.h"
 

-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxScreenDC;
-

 //-----------------------------------------------------------------------------
 // wxScreenDC
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxScreenDC
 //-----------------------------------------------------------------------------
 

-class wxScreenDC: public wxPaintDC
+#if wxUSE_NEW_DC
+class WXDLLIMPEXP_CORE wxGTKScreenImplDC : public wxGTKWindowImplDC
+#else
+#define wxGTKScreenImplDC wxScreenDC
+class WXDLLIMPEXP_CORE wxScreenDC : public wxWindowDC
+#endif

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxScreenDC)
-

 public:
 public:

-  wxScreenDC(void);
-  ~wxScreenDC(void);
-
-  static bool StartDrawingOnTop( wxWindow *window );
-  static bool StartDrawingOnTop( wxRectangle *rect = (wxRectangle *) NULL );
-  static bool EndDrawingOnTop(void);
-  
-  // implementation
-  
-  static GdkWindow  *sm_overlayWindow;
-  static int         sm_overlayWindowX;
-  static int         sm_overlayWindowY;
-};

 
 

+#if wxUSE_NEW_DC
+    wxGTKScreenImplDC( wxScreenDC *owner );
+#else
+    wxScreenDC();

 #endif
 
 #endif
 

-    // __GTKDCSCREENH__
+    ~wxGTKScreenImplDC();
+
+    static bool StartDrawingOnTop(wxWindow * WXUNUSED(window))
+        { return true; }
+    static bool StartDrawingOnTop(wxRect * WXUNUSED(rect) =  NULL)
+        { return true; }
+    static bool EndDrawingOnTop() { return true; }
+
+
+protected:
+    virtual void DoGetSize(int *width, int *height) const;
+
+    void Init();
+
+private:
+    DECLARE_ABSTRACT_CLASS(wxGTKScreenImplDC)
+};
+
+#endif // __GTKDCSCREENH__