Interface fixes for Phoenix

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

diff --git a/include/wx/msw/dcscreen.h b/include/wx/msw/dcscreen.h
index eccf1d7847a6bb258d91147fc0738579cd271563..8d64f32bf36fe3fb3862f50baa6b0f332a29cc25 100644 (file)
--- a/include/wx/msw/dcscreen.h
+++ b/include/wx/msw/dcscreen.h
@@ -6,36 +6,29 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_DCSCREEN_H_
-#define _WX_DCSCREEN_H_
+#ifndef _WX_MSW_DCSCREEN_H_
+#define _WX_MSW_DCSCREEN_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "dcscreen.h"
-#endif
+#include "wx/dcscreen.h"
+#include "wx/msw/dc.h"
 
-#include "wx/dcclient.h"
-
-class WXDLLEXPORT wxScreenDC : public wxWindowDC
+class WXDLLIMPEXP_CORE wxScreenDCImpl : public wxMSWDCImpl
 {
 public:
     // Create a DC representing the whole screen
-    wxScreenDC();
-
-    // Compatibility with X's requirements for drawing on top of all windows
-    static bool StartDrawingOnTop(wxWindow* WXUNUSED(window)) { return TRUE; }
-    static bool StartDrawingOnTop(wxRect* WXUNUSED(rect) = NULL) { return TRUE; }
-    static bool EndDrawingOnTop() { return TRUE; }
+    wxScreenDCImpl( wxScreenDC *owner );
 
-protected:
-    virtual void DoGetSize(int *width, int *height) const;
+    virtual void DoGetSize(int *w, int *h) const
+    {
+        GetDeviceSize(w, h);
+    }
 
-private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxScreenDC)
+    DECLARE_CLASS(wxScreenDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl);
 };
 
-#endif
-    // _WX_DCSCREEN_H_
+#endif // _WX_MSW_DCSCREEN_H_