Applied patch from Ticket #9563. Use just the rectangle of the widget with the focus...

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

diff --git a/src/os2/dcscreen.cpp b/src/os2/dcscreen.cpp
index 36f65d1de7eb7c0e0189238e004d0486b9dc3361..ce428ed8cd290fbb190c8d4ffd0eb0199625bcd7 100644 (file)
--- a/src/os2/dcscreen.cpp
+++ b/src/os2/dcscreen.cpp
@@ -1,18 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -21,36 +17,33 @@
 #define INCL_PM
 #include<os2.h>
 
 #define INCL_PM
 #include<os2.h>
 

+#include "wx/os2/dcscreen.h"
+

 #ifndef WX_PRECOMP
 #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"
 
 #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
 
 // 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()
 
 {
     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)
     //
 {
     //
     // 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