Rename wxWebNavigationError to wxWebViewNavigationError and wxWebNavigationEvent...

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

diff --git a/src/os2/dcscreen.cpp b/src/os2/dcscreen.cpp
index 2fa80efcef84997caaec905f9fadaf61a6ab3890..3681c889e4c70c94e518b93328021c9cf0922248 100644 (file)
--- a/src/os2/dcscreen.cpp
+++ b/src/os2/dcscreen.cpp
@@ -12,12 +12,7 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#define INCL_DEV
-#define INCL_GPI
-#define INCL_PM
-#include<os2.h>
-
-#include "wx/dcscreen.h"
+#include "wx/os2/dcscreen.h"
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
@@ -26,23 +21,24 @@
 
 #include "wx/os2/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
+IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxPMDCImpl)
 
 // Create a DC representing the whole screen
-wxScreenDC::wxScreenDC()
+wxScreenDCImpl::wxScreenDCImpl( wxScreenDC *owner ) :
+    wxPMDCImpl( owner )
 {
     m_hDC = ::WinOpenWindowDC(HWND_DESKTOP);
     m_hPS = ::WinGetScreenPS(HWND_DESKTOP);
     ::GpiSetBackMix(m_hPS, BM_LEAVEALONE);
 } // end of wxScreenDC::wxScreenDC()
 
-void wxScreenDC::DoGetSize( int* pnWidth,
-                            int* pnHeight ) const
+void wxScreenDCImpl::DoGetSize( int* pnWidth,
+                                int* pnHeight ) const
 {
     //
     // Skip wxWindowDC version because it doesn't work without a valid m_canvas
     // (which we don't have)
     //
-    wxDC::DoGetSize( pnWidth, pnHeight );
+    wxPMDCImpl::DoGetSize( pnWidth, pnHeight );
 
 } // end of wxScreenDC::DoGetSize