X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..10a59880771fae005b31e003916a028267b54427:/src/msw/dcscreen.cpp

diff --git a/src/msw/dcscreen.cpp b/src/msw/dcscreen.cpp
index 511c3b25bc..a6f3948d1b 100644
--- a/src/msw/dcscreen.cpp
+++ b/src/msw/dcscreen.cpp
@@ -1,15 +1,15 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcscreen.cpp
+// Name:        src/msw/dcscreen.cpp
 // Purpose:     wxScreenDC class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows licence
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "dcscreen.h"
 #endif
 
@@ -29,26 +29,22 @@
 
 #include "wx/dcscreen.h"
 
-
 IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
 
 // Create a DC representing the whole screen
-wxScreenDC::wxScreenDC(void)
+wxScreenDC::wxScreenDC()
 {
-  m_hDC = (WXHDC) ::GetDC((HWND) NULL);
-  m_hDCCount ++;
+    m_hDC = (WXHDC) ::GetDC((HWND) NULL);
 
-  // the background mode is only used for text background
-  // and is set in DrawText() to OPAQUE as required, other-
-  // wise always TRANSPARENT, RR
-  ::SetBkMode( GetHdc(), TRANSPARENT );
+    // the background mode is only used for text background and is set in
+    // DrawText() to OPAQUE as required, otherwise always TRANSPARENT
+    ::SetBkMode( GetHdc(), TRANSPARENT );
 }
 
-wxScreenDC::~wxScreenDC(void)
+void wxScreenDC::DoGetSize(int *width, int *height) const
 {
-  SelectOldObjects(m_hDC);
-  ::ReleaseDC((HWND) NULL, (HDC) m_hDC);
-  m_hDC = 0;
-  m_hDCCount --;
+    // skip wxWindowDC version because it doesn't work without a valid m_canvas
+    // (which we don't have)
+    wxDC::DoGetSize(width, height);
 }