summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES2
-rw-r--r--src/Fl_win32.cxx9
2 files changed, 6 insertions, 5 deletions
diff --git a/CHANGES b/CHANGES
index 258ffd55f..52da1824a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
CHANGES IN FLTK 1.1.0rc2
- Portability fixes.
+ - Fixed WM_PAINT handling under WIN32 - didn't validate
+ the correct region that was drawn.
- Fl_Multiline_Output would insert the enter key.
- Fl_File_Browser didn't clip items to the column width.
- Fl_Window::draw() cleared the window label but didn't
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx
index 4d0aaf30d..fb1fb3843 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.32 2002/05/01 23:45:52 easysw Exp $"
+// "$Id: Fl_win32.cxx,v 1.33.2.37.2.33 2002/05/06 21:15:48 easysw Exp $"
//
// WIN32-specific code for the Fast Light Tool Kit (FLTK).
//
@@ -593,10 +593,12 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
if (i->region) {
InvalidateRgn(hWnd,i->region,FALSE);
GetUpdateRgn(hWnd,i->region,0);
+ ValidateRgn(hWnd,i->region);
}
} else {
if (!i->region) i->region = CreateRectRgn(0,0,0,0);
GetUpdateRgn(hWnd,i->region,0);
+ ValidateRgn(hWnd,i->region);
}
window->clear_damage(window->damage()|FL_DAMAGE_EXPOSE);
// These next two statements should not be here, so that all update
@@ -607,9 +609,6 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
i->flush();
fl_restore_pen();
window->clear_damage();
- // This convinces MSWindows we have painted whatever they wanted
- // us to paint, and stops it from sending WM_PAINT messages:
- ValidateRgn(hWnd,NULL);
} return 0;
case WM_LBUTTONDOWN: mouse_event(window, 0, 1, wParam, lParam); return 0;
@@ -1183,5 +1182,5 @@ void Fl_Window::make_current() {
}
//
-// End of "$Id: Fl_win32.cxx,v 1.33.2.37.2.32 2002/05/01 23:45:52 easysw Exp $".
+// End of "$Id: Fl_win32.cxx,v 1.33.2.37.2.33 2002/05/06 21:15:48 easysw Exp $".
//