X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4c151c737e514a8b8ccdc6eebc9a6d421e8d59ec..acc0ebd7a871124d4d6b36069340227e6c584f38:/src/motif/dcscreen.cpp diff --git a/src/motif/dcscreen.cpp b/src/motif/dcscreen.cpp index df547fe628..1da45d5e39 100644 --- a/src/motif/dcscreen.cpp +++ b/src/motif/dcscreen.cpp @@ -14,16 +14,21 @@ #endif #include "wx/window.h" +#include "wx/frame.h" #include "wx/dcscreen.h" #include "wx/utils.h" +#ifdef __VMS__ +#pragma message disable nosimpint +#endif #include <Xm/Xm.h> +#ifdef __VMS__ +#pragma message enable nosimpint +#endif -#include <wx/motif/private.h> +#include "wx/motif/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC) -#endif WXWindow wxScreenDC::sm_overlayWindow = 0; int wxScreenDC::sm_overlayWindowX = 0; @@ -60,6 +65,7 @@ wxScreenDC::wxScreenDC() wxScreenDC::~wxScreenDC() { + EndDrawingOnTop(); } bool wxScreenDC::StartDrawingOnTop(wxWindow* window) @@ -67,7 +73,7 @@ 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;