diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-01-23 16:58:01 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-01-23 16:58:01 +0000 |
| commit | 492b81c24026b44e5a8e377d5e07f234c2bedd62 (patch) | |
| tree | 51fe6f8083867d5614904e9b0b7a8a4f18aaae5c /src | |
| parent | c9b5b36906f0b44fc074f8d10acc4be1741e7c7a (diff) | |
Return 0 after processing WM_PAINT message.
Fix clip test in fl_draw().
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1944 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_win32.cxx | 6 | ||||
| -rw-r--r-- | src/fl_draw.cxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx index d9dc2e87b..af31bef82 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.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 $". // diff --git a/src/fl_draw.cxx b/src/fl_draw.cxx index 9287dd084..2209642fb 100644 --- a/src/fl_draw.cxx +++ b/src/fl_draw.cxx @@ -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 $". // |