Restore TAB in accelerator string wrong removed by r62791.

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

diff --git a/src/os2/dcscreen.cpp b/src/os2/dcscreen.cpp
index 36f65d1de7eb7c0e0189238e004d0486b9dc3361..3681c889e4c70c94e518b93328021c9cf0922248 100644 (file)
--- a/src/os2/dcscreen.cpp
+++ b/src/os2/dcscreen.cpp
@@ -1,56 +1,44 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcscreen.cpp
+// Name:        src/os2/dcscreen.cpp
 // Purpose:     wxScreenDC class
 // Author:      David Webster
 // Modified by:
 // Created:     10/14/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "dcscreen.h"
-#endif
-
 // 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/os2/dcscreen.h"
 
 #ifndef WX_PRECOMP
-   #include "wx/string.h"
-   #include "wx/window.h"
+    #include "wx/string.h"
+    #include "wx/window.h"
 #endif
 
 #include "wx/os2/private.h"
 
-#include "wx/dcscreen.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
-                   );
-} // end of wxScreenDC::DoGetSize
+    wxPMDCImpl::DoGetSize( pnWidth, pnHeight );
 
+} // end of wxScreenDC::DoGetSize