Rework the wxCusor ctor taking wx stock number to provide as many cursors as

[wxWidgets.git] / src / msw / dcscreen.cpp

diff --git a/src/msw/dcscreen.cpp b/src/msw/dcscreen.cpp
index a6f3948d1b3452865560c8150d3ffc7af254be46..26d350895dd0a03440566f4e5b8e76a46e8c8698 100644 (file)
--- a/src/msw/dcscreen.cpp
+++ b/src/msw/dcscreen.cpp
@@ -9,17 +9,15 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dcscreen.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#include "wx/dcscreen.h"
+

 #ifndef WX_PRECOMP
    #include "wx/string.h"
    #include "wx/window.h"
 #ifndef WX_PRECOMP
    #include "wx/string.h"
    #include "wx/window.h"


@@ -27,9 +25,7 @@
 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 

-#include "wx/dcscreen.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
+IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxDC)

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


@@ -40,11 +36,3 @@ wxScreenDC::wxScreenDC()
     // DrawText() to OPAQUE as required, otherwise always TRANSPARENT
     ::SetBkMode( GetHdc(), TRANSPARENT );
 }
     // DrawText() to OPAQUE as required, otherwise always TRANSPARENT
     ::SetBkMode( GetHdc(), TRANSPARENT );
 }

-
-void wxScreenDC::DoGetSize(int *width, int *height) const
-{
-    // skip wxWindowDC version because it doesn't work without a valid m_canvas
-    // (which we don't have)
-    wxDC::DoGetSize(width, height);
-}
-