don't hardcode 16/32 as sizes for small/normal icons (fixes bug 1862812)

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

diff --git a/include/wx/msw/dcscreen.h b/include/wx/msw/dcscreen.h
index 85da593a3bb5a6defac7843b4a16fae6dee244ae..f60bffa3d866b9ed6e2eb2ac3364508b31f055b9 100644 (file)
--- a/include/wx/msw/dcscreen.h
+++ b/include/wx/msw/dcscreen.h
@@ -12,29 +12,22 @@
 #ifndef _WX_MSW_DCSCREEN_H_
 #define _WX_MSW_DCSCREEN_H_
 
-#include "wx/dc.h"
+#include "wx/dcscreen.h"
+#include "wx/msw/dc.h"
 
-class WXDLLEXPORT wxScreenDC : public wxDC
+class WXDLLEXPORT wxScreenDCImpl : public wxMSWDCImpl
 {
 public:
     // Create a DC representing the whole screen
-    wxScreenDC();
+    wxScreenDCImpl( wxScreenDC *owner );
 
-    // these functions are obsolete and shouldn't be used
-
-    // Compatibility with X's requirements for drawing on top of all windows
-    wxDEPRECATED( static bool StartDrawingOnTop(wxWindow* window) );
-    wxDEPRECATED( static bool StartDrawingOnTop(wxRect* rect = NULL) );
-    wxDEPRECATED( static bool EndDrawingOnTop() );
-
-protected:
     virtual void DoGetSize(int *w, int *h) const
     {
         GetDeviceSize(w, h);
     }
 
-private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxScreenDC)
+    DECLARE_CLASS(wxScreenDCImpl)
+    DECLARE_NO_COPY_CLASS(wxScreenDCImpl)
 };
 
 #endif // _WX_MSW_DCSCREEN_H_