summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2003-05-20 19:09:33 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2003-05-20 19:09:33 +0000
commitc0e40ac55e81153484706890faa5f72c941511ea (patch)
treec889826436508a17ae579ddc19a441f2891ff758 /src
parent9a7fb54d465c3ba3c0fdefdd3f804a7954a0c185 (diff)
Potential fixes for double-buffered subwindows on WIN32 (STR #1)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2988 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
-rw-r--r--src/Fl_Double_Window.cxx13
-rw-r--r--src/Fl_win32.cxx7
2 files changed, 6 insertions, 14 deletions
diff --git a/src/Fl_Double_Window.cxx b/src/Fl_Double_Window.cxx
index 40a17bc5d..e48700105 100644
--- a/src/Fl_Double_Window.cxx
+++ b/src/Fl_Double_Window.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_Double_Window.cxx,v 1.12.2.4.2.7 2003/01/30 21:41:40 easysw Exp $"
+// "$Id: Fl_Double_Window.cxx,v 1.12.2.4.2.8 2003/05/20 19:09:32 easysw Exp $"
//
// Double-buffered window code for the Fast Light Tool Kit (FLTK).
//
@@ -187,15 +187,6 @@ extern void fl_restore_clip();
void Fl_Double_Window::flush() {flush(0);}
void Fl_Double_Window::flush(int eraseoverlay) {
-#ifdef WIN32
- // Windows seems to have trouble doing the double-buffer thing in sub-
- // windows, so only create the backbuffer stuff for top-level windows.
- if (parent()) {
- Fl_Window::flush();
- return;
- }
-#endif // WIN32
-
make_current(); // make sure fl_gc is non-zero
Fl_X *myi = Fl_X::i(this);
if (!myi->other_xid) {
@@ -308,5 +299,5 @@ Fl_Double_Window::~Fl_Double_Window() {
}
//
-// End of "$Id: Fl_Double_Window.cxx,v 1.12.2.4.2.7 2003/01/30 21:41:40 easysw Exp $".
+// End of "$Id: Fl_Double_Window.cxx,v 1.12.2.4.2.8 2003/05/20 19:09:32 easysw Exp $".
//
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx
index 1f1f774f7..3116f78d4 100644
--- a/src/Fl_win32.cxx
+++ b/src/Fl_win32.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_win32.cxx,v 1.33.2.37.2.44 2003/01/30 21:43:11 easysw Exp $"
+// "$Id: Fl_win32.cxx,v 1.33.2.37.2.45 2003/05/20 19:09:33 easysw Exp $"
//
// WIN32-specific code for the Fast Light Tool Kit (FLTK).
//
@@ -613,7 +613,8 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
fl_save_pen();
i->flush();
fl_restore_pen();
- ValidateRgn(hWnd,i->region);
+ if (window->parent()) ValidateRgn(hWnd,0);
+ else ValidateRgn(hWnd,i->region);
window->clear_damage();
} return 0;
@@ -1192,5 +1193,5 @@ void Fl_Window::make_current() {
}
//
-// End of "$Id: Fl_win32.cxx,v 1.33.2.37.2.44 2003/01/30 21:43:11 easysw Exp $".
+// End of "$Id: Fl_win32.cxx,v 1.33.2.37.2.45 2003/05/20 19:09:33 easysw Exp $".
//