Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/msw/dcscreen.h b/include/wx/msw/dcscreen.h
index 85da593a3bb5a6defac7843b4a16fae6dee244ae..f85bbe2ff3de6254812b01aa33397aa745ae10f3 100644 (file)
--- a/include/wx/msw/dcscreen.h
+++ b/include/wx/msw/dcscreen.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,29 +11,22 @@
 #ifndef _WX_MSW_DCSCREEN_H_
 #define _WX_MSW_DCSCREEN_H_
 
 #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 WXDLLIMPEXP_CORE wxScreenDCImpl : public wxMSWDCImpl

 {
 public:
     // Create a DC representing the whole screen
 {
 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);
     }
 
     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_MSW_DCSCREEN_H_
 };
 
 #endif // _WX_MSW_DCSCREEN_H_