Merge in from trunk r68626 - r68683

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

diff --git a/include/wx/dcscreen.h b/include/wx/dcscreen.h
index 6b25147b50932e35b6e5beacac14194b7946c281..6b1fc2f2da4e17eaa26fd43b14db31261f2edee2 100644 (file)
--- a/include/wx/dcscreen.h
+++ b/include/wx/dcscreen.h
@@ -12,25 +12,25 @@
 #ifndef _WX_DCSCREEN_H_BASE_
 #define _WX_DCSCREEN_H_BASE_
 
 #ifndef _WX_DCSCREEN_H_BASE_
 #define _WX_DCSCREEN_H_BASE_
 

-#if defined(__WXPALMOS__)
-#include "wx/palmos/dcscreen.h"
-#elif defined(__WXMSW__)
-#include "wx/msw/dcscreen.h"
-#elif defined(__WXMOTIF__)
-#include "wx/motif/dcscreen.h"
-#elif defined(__WXGTK__)
-#include "wx/gtk/dcscreen.h"
-#elif defined(__WXX11__)
-#include "wx/x11/dcscreen.h"
-#elif defined(__WXMGL__)
-#include "wx/mgl/dcscreen.h"
-#elif defined(__WXMAC__)
-#include "wx/mac/dcscreen.h"
-#elif defined(__WXCOCOA__)
-#include "wx/cocoa/dcscreen.h"
-#elif defined(__WXPM__)
-#include "wx/os2/dcscreen.h"
-#endif
+#include "wx/defs.h"
+#include "wx/dc.h"
+
+class WXDLLIMPEXP_CORE wxScreenDC : public wxDC
+{
+public:
+    wxScreenDC();
+
+    static bool StartDrawingOnTop(wxWindow * WXUNUSED(window))
+        { return true; }
+    static bool StartDrawingOnTop(wxRect * WXUNUSED(rect) =  NULL)
+        { return true; }
+    static bool EndDrawingOnTop()
+        { return true; }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxScreenDC)
+};
+

 
 #endif
     // _WX_DCSCREEN_H_BASE_
 
 #endif
     // _WX_DCSCREEN_H_BASE_