applying patch, fixes #10523

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

diff --git a/src/motif/dcscreen.cpp b/src/motif/dcscreen.cpp
index 9186c5352f33d5f785e68b3a555b0c5207d8bfb1..31101b5dc8299fa42b7bf4629f10f5665047241f 100644 (file)
--- a/src/motif/dcscreen.cpp
+++ b/src/motif/dcscreen.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/motif/dcscreen.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/motif/dcscreen.cpp

-// Purpose:     wxScreenDC class
+// Purpose:     wxScreenDCImpl class

 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98


@@ -12,12 +12,11 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/dcscreen.h"
-

 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/window.h"
     #include "wx/frame.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/window.h"
     #include "wx/frame.h"

+    #include "wx/dcscreen.h"

 #endif
 
 #ifdef __VMS__
 #endif
 
 #ifdef __VMS__


@@ -29,15 +28,17 @@
 #endif
 
 #include "wx/motif/private.h"
 #endif
 
 #include "wx/motif/private.h"

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

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
+IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl)

 
 

-WXWindow wxScreenDC::sm_overlayWindow = 0;
-int wxScreenDC::sm_overlayWindowX = 0;
-int wxScreenDC::sm_overlayWindowY = 0;
+WXWindow wxScreenDCImpl::sm_overlayWindow = 0;
+int wxScreenDCImpl::sm_overlayWindowX = 0;
+int wxScreenDCImpl::sm_overlayWindowY = 0;

 
 // Create a DC representing the whole screen
 
 // Create a DC representing the whole screen

-wxScreenDC::wxScreenDC()
+wxScreenDCImpl::wxScreenDCImpl(wxScreenDC *owner)
+              : wxWindowDCImpl(owner)

 {
     m_display = wxGetDisplay();
     Display* display = (Display*) m_display;
 {
     m_display = wxGetDisplay();
     Display* display = (Display*) m_display;


@@ -61,16 +62,16 @@ wxScreenDC::wxScreenDC()
         GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
         &gcvalues);
 
         GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
         &gcvalues);
 

-    m_backgroundPixel = (int) gcvalues.background;
+    m_backgroundPixel = gcvalues.background;

     m_ok = true;
 }
 
     m_ok = true;
 }
 

-wxScreenDC::~wxScreenDC()
+wxScreenDCImpl::~wxScreenDCImpl()

 {
     EndDrawingOnTop();
 }
 
 {
     EndDrawingOnTop();
 }
 

-bool wxScreenDC::StartDrawingOnTop(wxWindow* window)
+bool wxScreenDCImpl::StartDrawingOnTop(wxWindow* window)

 {
     wxRect rect;
     int x, y, width, height;
 {
     wxRect rect;
     int x, y, width, height;


@@ -84,7 +85,7 @@ bool wxScreenDC::StartDrawingOnTop(wxWindow* window)
     return StartDrawingOnTop(& rect);
 }
 
     return StartDrawingOnTop(& rect);
 }
 

-bool wxScreenDC::StartDrawingOnTop(wxRect* rect)
+bool wxScreenDCImpl::StartDrawingOnTop(wxRect* rect)

 {
     if (sm_overlayWindow)
         return false;
 {
     if (sm_overlayWindow)
         return false;


@@ -123,7 +124,7 @@ bool wxScreenDC::StartDrawingOnTop(wxRect* rect)
         return false;
 }
 
         return false;
 }
 

-bool wxScreenDC::EndDrawingOnTop()
+bool wxScreenDCImpl::EndDrawingOnTop()

 {
     if (sm_overlayWindow)
     {
 {
     if (sm_overlayWindow)
     {