projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sync'ed show-window flag in MDI child constructor; added initial wxKill implementation
[wxWidgets.git]
/
src
/
motif
/
dcscreen.cpp
diff --git
a/src/motif/dcscreen.cpp
b/src/motif/dcscreen.cpp
index 1b0597df23a1a5608bcd467fe710ada2ba3cc1a0..1da45d5e3935713455f9ae29d709db7bdba5f624 100644
(file)
--- a/
src/motif/dcscreen.cpp
+++ b/
src/motif/dcscreen.cpp
@@
-14,6
+14,7
@@
#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"
@@
-64,6
+65,7
@@
wxScreenDC::wxScreenDC()
wxScreenDC::~wxScreenDC()
{
wxScreenDC::~wxScreenDC()
{
+ EndDrawingOnTop();
}
bool wxScreenDC::StartDrawingOnTop(wxWindow* window)
}
bool wxScreenDC::StartDrawingOnTop(wxWindow* window)
@@
-71,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;