wchar_t is now always required, updated chartype.h check accordingly

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

diff --git a/include/wx/msw/dcscreen.h b/include/wx/msw/dcscreen.h
index 16c15281691b2f38143f1be31d1e707d9e9ec04f..8635b18afdf9a819c3e376329beeec89a2cec077 100644 (file)
--- a/include/wx/msw/dcscreen.h
+++ b/include/wx/msw/dcscreen.h
@@ -1,39 +1,34 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcscreen.h
+// Name:        wx/msw/dcscreen.h

 // Purpose:     wxScreenDC class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Purpose:     wxScreenDC class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __DCSCREENH__
-#define __DCSCREENH__
+#ifndef _WX_MSW_DCSCREEN_H_
+#define _WX_MSW_DCSCREEN_H_

 
 

-#ifdef __GNUG__
-#pragma interface "dcscreen.h"
-#endif
+#include "wx/dcscreen.h"
+#include "wx/msw/dc.h"

 
 

-#include "wx/dc.h"
-
-class WXDLLEXPORT wxScreenDC: public wxDC
+class WXDLLIMPEXP_CORE wxScreenDCImpl : public wxMSWDCImpl

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxScreenDC)
+public:
+    // Create a DC representing the whole screen
+    wxScreenDCImpl( wxScreenDC *owner );

 
 

- public:
-  // Create a DC representing the whole screen
-  wxScreenDC(void);
-  ~wxScreenDC(void);
+    virtual void DoGetSize(int *w, int *h) const
+    {
+        GetDeviceSize(w, h);
+    }

 
 

-  // Compatibility with X's requirements for
-  // drawing on top of all windows
-  static bool StartDrawingOnTop(wxWindow *window) { return TRUE; }
-  static bool StartDrawingOnTop(wxRectangle *rect = NULL) { return TRUE; }
-  static bool EndDrawingOnTop(void) { return TRUE; }
+    DECLARE_CLASS(wxScreenDCImpl)
+    DECLARE_NO_COPY_CLASS(wxScreenDCImpl)

 };
 
 };
 

-#endif
-    // __DCSCREENH__
+#endif // _WX_MSW_DCSCREEN_H_