wxMenuItem code cleanup, removing duplicate and unneccessary code

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

diff --git a/include/wx/gtk1/dcscreen.h b/include/wx/gtk1/dcscreen.h
index b53d12c8a8e38ffd9916590d932a9028f8c23a8b..abbdb6b9a58739f747799e35f6763c7959d96355 100644 (file)
--- a/include/wx/gtk1/dcscreen.h
+++ b/include/wx/gtk1/dcscreen.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcscreen.h
+// Name:        wx/gtk1/dcscreen.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -10,38 +10,30 @@
 #ifndef __GTKDCSCREENH__
 #define __GTKDCSCREENH__
 
 #ifndef __GTKDCSCREENH__
 #define __GTKDCSCREENH__
 

-#include "wx/dcclient.h"
+#include "wx/gtk1/dcclient.h"

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// classes
+// wxScreenDCImpl

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-class wxScreenDC;
-
-//-----------------------------------------------------------------------------
-// wxScreenDC
-//-----------------------------------------------------------------------------
-
-class wxScreenDC: public wxPaintDC
+class WXDLLIMPEXP_CORE wxScreenDCImpl : public wxPaintDCImpl

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxScreenDC)
-

 public:
 public:

-  wxScreenDC();
-  ~wxScreenDC();
+    wxScreenDCImpl(wxScreenDC *owner);
+    virtual ~wxScreenDCImpl();

 
 

-  static bool StartDrawingOnTop( wxWindow *window );
-  static bool StartDrawingOnTop( wxRect *rect = (wxRect *) NULL );
-  static bool EndDrawingOnTop();
+    // implementation

 
 

-  // implementation
+    static GdkWindow  *sm_overlayWindow;
+    static int         sm_overlayWindowX;
+    static int         sm_overlayWindowY;

 
 

-  static GdkWindow  *sm_overlayWindow;
-  static int         sm_overlayWindowX;
-  static int         sm_overlayWindowY;
-};
+protected:
+    virtual void DoGetSize(int *width, int *height) const;

 
 

-#endif
+private:
+    DECLARE_DYNAMIC_CLASS(wxScreenDCImpl)
+};

 
 

-    // __GTKDCSCREENH__
+#endif // __GTKDCSCREENH__