projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replaced m_isRadioButton with a virtual function
[wxWidgets.git]
/
src
/
motif
/
dcscreen.cpp
diff --git
a/src/motif/dcscreen.cpp
b/src/motif/dcscreen.cpp
index df547fe628877bffdda5bbec0036e5b62f3a6b16..1da45d5e3935713455f9ae29d709db7bdba5f624 100644
(file)
--- a/
src/motif/dcscreen.cpp
+++ b/
src/motif/dcscreen.cpp
@@
-14,16
+14,21
@@
#endif
#include "wx/window.h"
#endif
#include "wx/window.h"
+#include "wx/frame.h"
#include "wx/dcscreen.h"
#include "wx/utils.h"
#include "wx/dcscreen.h"
#include "wx/utils.h"
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
#include <Xm/Xm.h>
#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)
IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
-#endif
WXWindow wxScreenDC::sm_overlayWindow = 0;
int wxScreenDC::sm_overlayWindowX = 0;
WXWindow wxScreenDC::sm_overlayWindow = 0;
int wxScreenDC::sm_overlayWindowX = 0;
@@
-60,6
+65,7
@@
wxScreenDC::wxScreenDC()
wxScreenDC::~wxScreenDC()
{
wxScreenDC::~wxScreenDC()
{
+ EndDrawingOnTop();
}
bool wxScreenDC::StartDrawingOnTop(wxWindow* window)
}
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);
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;
window->GetParent()->ClientToScreen(& x, & y);
window->GetSize(& width, & height);
rect.x = x; rect.y = y;