X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..d48687a0719620cc888072db31bb3814dea400ab:/src/motif/dcscreen.cpp

diff --git a/src/motif/dcscreen.cpp b/src/motif/dcscreen.cpp
index 1b0597df23..360acdfe14 100644
--- a/src/motif/dcscreen.cpp
+++ b/src/motif/dcscreen.cpp
@@ -1,21 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcscreen.cpp
+// Name:        src/motif/dcscreen.cpp
 // Purpose:     wxScreenDC class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// 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"
 
-#include "wx/window.h"
 #include "wx/dcscreen.h"
-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/window.h"
+    #include "wx/frame.h"
+#endif
 
 #ifdef __VMS__
 #pragma message disable nosimpint
@@ -38,7 +41,7 @@ wxScreenDC::wxScreenDC()
 {
     m_display = wxGetDisplay();
     Display* display = (Display*) m_display;
-    
+
     if (sm_overlayWindow)
     {
         m_pixmap = sm_overlayWindow;
@@ -47,7 +50,7 @@ wxScreenDC::wxScreenDC()
     }
     else
         m_pixmap = (WXPixmap) RootWindow(display, DefaultScreen(display));
-    
+
     XGCValues gcvalues;
     gcvalues.foreground = BlackPixel (display, DefaultScreen (display));
     gcvalues.background = WhitePixel (display, DefaultScreen (display));
@@ -57,13 +60,14 @@ wxScreenDC::wxScreenDC()
     m_gc = XCreateGC (display, RootWindow (display, DefaultScreen (display)),
         GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
         &gcvalues);
-    
-    m_backgroundPixel = (int) gcvalues.background;
-    m_ok = TRUE;
+
+    m_backgroundPixel = gcvalues.background;
+    m_ok = true;
 }
 
 wxScreenDC::~wxScreenDC()
 {
+    EndDrawingOnTop();
 }
 
 bool wxScreenDC::StartDrawingOnTop(wxWindow* window)
@@ -71,28 +75,28 @@ bool wxScreenDC::StartDrawingOnTop(wxWindow* window)
     wxRect rect;
     int x, y, width, height;
     window->GetPosition(& x, & y);
-    if (window->GetParent())
+    if (window->GetParent() && !window->IsKindOf(CLASSINFO(wxFrame)))
         window->GetParent()->ClientToScreen(& x, & y);
     window->GetSize(& width, & height);
     rect.x = x; rect.y = y;
     rect.width = width; rect.height = height;
-    
+
     return StartDrawingOnTop(& rect);
 }
 
 bool wxScreenDC::StartDrawingOnTop(wxRect* rect)
 {
     if (sm_overlayWindow)
-        return FALSE;
-    
+        return false;
+
     Display *dpy = (Display*) wxGetDisplay();
     Pixmap screenPixmap = RootWindow(dpy, DefaultScreen(dpy));
-    
+
     int x = 0;
     int y = 0;
     int width, height;
     wxDisplaySize(&width, &height);
-    
+
     if (rect)
     {
         x = rect->x; y = rect->y;
@@ -100,23 +104,23 @@ bool wxScreenDC::StartDrawingOnTop(wxRect* rect)
     }
     sm_overlayWindowX = x;
     sm_overlayWindowY = y;
-    
+
     XSetWindowAttributes attributes;
     attributes.override_redirect = True;
     unsigned long valueMask = CWOverrideRedirect;
-    
+
     sm_overlayWindow = (WXWindow) XCreateWindow(dpy, screenPixmap, x, y, width, height, 0,
         wxDisplayDepth(), InputOutput,
         DefaultVisual(dpy, 0), valueMask,
         & attributes);
-    
+
     if (sm_overlayWindow)
     {
         XMapWindow(dpy, (Window) sm_overlayWindow);
-        return TRUE;
+        return true;
     }
     else
-        return FALSE;
+        return false;
 }
 
 bool wxScreenDC::EndDrawingOnTop()
@@ -125,8 +129,8 @@ bool wxScreenDC::EndDrawingOnTop()
     {
         XDestroyWindow((Display*) wxGetDisplay(), (Window) sm_overlayWindow);
         sm_overlayWindow = 0;
-        return TRUE;
+        return true;
     }
     else
-        return FALSE;
+        return false;
 }