don't try to access empty wxIconBundle in gtk_frame_realized_callback

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

diff --git a/src/msw/dcscreen.cpp b/src/msw/dcscreen.cpp
index def411e0a6e47cd8ec50344453f3cf41b6e207f9..26d350895dd0a03440566f4e5b8e76a46e8c8698 100644 (file)
--- a/src/msw/dcscreen.cpp
+++ b/src/msw/dcscreen.cpp
@@ -6,20 +6,18 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWidgets 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__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
+#include "wx/dcscreen.h"
+
 #ifndef WX_PRECOMP
    #include "wx/string.h"
    #include "wx/window.h"
@@ -27,9 +25,7 @@
 
 #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()
@@ -40,11 +36,3 @@ wxScreenDC::wxScreenDC()
     // 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);
-}
-