mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Return 0 after processing WM_PAINT message.

Browse Source 
Fix clip test in fl_draw().


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1944 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2002-01-23 16:58:01 +00:00
parent c9b5b36906
commit 492b81c240
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -1,5 +1,9 @@
CHANGES IN FLTK 1.1.0b11
- The WIN32 code didn't return 0 from the window
procedure after handling WM_PAINT messages.
- fl_draw() would incorrectly test the clipping of
labels the lay outside the bounding box.
- filename_relative() didn't always return the correct
relative path.
- Updated the test makefile to work with more versions

6
src/Fl_win32.cxx
View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_win32.cxx,v 1.33.2.37.2.15 2002/01/09 15:23:09 easysw Exp $"
// "$Id: Fl_win32.cxx,v 1.33.2.37.2.16 2002/01/23 16:58:01 easysw Exp $"
//
// WIN32-specific code for the Fast Light Tool Kit (FLTK).
//
@ -518,7 +518,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
// This convinces MSWindows we have painted whatever they wanted
// us to paint, and stops it from sending WM_PAINT messages:
ValidateRgn(hWnd,NULL);
} break;
} return 0;
case WM_LBUTTONDOWN: mouse_event(window, 0, 1, wParam, lParam); return 0;
case WM_LBUTTONDBLCLK:mouse_event(window, 1, 1, wParam, lParam); return 0;
@ -1049,5 +1049,5 @@ void Fl_Window::make_current() {
}
//
// End of "$Id: Fl_win32.cxx,v 1.33.2.37.2.15 2002/01/09 15:23:09 easysw Exp $".
// End of "$Id: Fl_win32.cxx,v 1.33.2.37.2.16 2002/01/23 16:58:01 easysw Exp $".
//

6
src/fl_draw.cxx
View File

@ -1,5 +1,5 @@
//
// "$Id: fl_draw.cxx,v 1.6.2.4.2.9 2002/01/01 15:11:32 easysw Exp $"
// "$Id: fl_draw.cxx,v 1.6.2.4.2.10 2002/01/23 16:58:01 easysw Exp $"
//
// Label drawing code for the Fast Light Tool Kit (FLTK).
//
@ -263,7 +263,7 @@ void fl_draw(
Fl_Image* img,
int draw_symbols) {
if ((!str || !*str) && !img) return;
if (w && h && !fl_not_clipped(x, y, w, h)) return;
if (w && h && !fl_not_clipped(x, y, w, h) && (align & FL_ALIGN_INSIDE)) return;
if (align & FL_ALIGN_CLIP) fl_clip(x, y, w, h);
fl_draw(str, x, y, w, h, align, fl_draw, img, draw_symbols);
if (align & FL_ALIGN_CLIP) fl_pop_clip();
@ -327,5 +327,5 @@ void fl_measure(const char* str, int& w, int& h, int draw_symbols) {
}
//
// End of "$Id: fl_draw.cxx,v 1.6.2.4.2.9 2002/01/01 15:11:32 easysw Exp $".
// End of "$Id: fl_draw.cxx,v 1.6.2.4.2.10 2002/01/23 16:58:01 easysw Exp $".
//