Avoid conflict between new transparency API and old background support.

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

diff --git a/include/wx/msw/dcscreen.h b/include/wx/msw/dcscreen.h
index 035e547e2330e5825f6e26cf522745143f1292f5..f48275e41b9809f8cbf0471f7a9fd79403af59f8 100644 (file)
--- a/include/wx/msw/dcscreen.h
+++ b/include/wx/msw/dcscreen.h
@@ -9,33 +9,32 @@
 // Licence:     wxWindows 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/dc.h"

 
 

-#include "wx/dcclient.h"
-
-class WXDLLEXPORT wxScreenDC : public wxWindowDC
+class WXDLLEXPORT wxScreenDC : public wxDC

 {
 public:
     // Create a DC representing the whole screen
     wxScreenDC();
 
 {
 public:
     // Create a DC representing the whole screen
     wxScreenDC();
 

-    // Compatibility with X's requirements for drawing on top of all windows
+    // Compatibility with X's requirements for drawing on top of all windows:
+    // they don't do anything under MSW

     static bool StartDrawingOnTop(wxWindow* WXUNUSED(window)) { return true; }
     static bool StartDrawingOnTop(wxRect* WXUNUSED(rect) = NULL) { return true; }
     static bool EndDrawingOnTop() { return true; }
 
 protected:
     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;
+    virtual void DoGetSize(int *w, int *h) const
+    {
+        GetDeviceSize(w, h);
+    }

 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxScreenDC)
 };
 
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxScreenDC)
 };
 

-#endif
-    // _WX_DCSCREEN_H_
+#endif // _WX_MSW_DCSCREEN_H_