summaryrefslogtreecommitdiff
path: root/src/Fl_win32.cxx
diff options
context:
space:
mode:
authorBill Spitzak <spitzak@gmail.com>1999-04-10 08:09:39 +0000
committerBill Spitzak <spitzak@gmail.com>1999-04-10 08:09:39 +0000
commitfa29bbdc0f872bb739754ced1893e3529e9d9b12 (patch)
tree61dd838b5dcf9e59aa1f4014594bc5cf03bcb20b /src/Fl_win32.cxx
parent69302ebb675bfa241babf44b90dfb3d1c821728d (diff)
1. ~Fl_Widget(), Fl_Widget::hide(), and Fl_Widget::deactivate() no longer send
FL_LEAVE, FL_RELEASE, or FL_UNFOCUS events to the widget. This seems to be desirable behavior and fixes a crash in flwm. 2. After you show() a window, Fl::damage() should be true and remain true until the window is actually drawn and up to date. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@530 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_win32.cxx')
-rw-r--r--src/Fl_win32.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx
index 36c0e24de..8f424b701 100644
--- a/src/Fl_win32.cxx
+++ b/src/Fl_win32.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_win32.cxx,v 1.33.2.4 1999/04/01 14:45:47 mike Exp $"
+// "$Id: Fl_win32.cxx,v 1.33.2.5 1999/04/10 08:09:38 bill Exp $"
//
// WIN32-specific code for the Fast Light Tool Kit (FLTK).
//
@@ -733,7 +733,7 @@ Fl_X* Fl_X::make(Fl_Window* w) {
ShowWindow(x->xid, fl_show_iconic ? SW_SHOWMINNOACTIVE :
fl_capture? SW_SHOWNOACTIVATE : SW_SHOWNORMAL);
fl_show_iconic = 0;
- fl_fix_focus();
+ if (w->modal()) {Fl::modal_ = w; fl_fix_focus();}
return x;
}
@@ -905,5 +905,5 @@ void Fl_Window::make_current() {
}
//
-// End of "$Id: Fl_win32.cxx,v 1.33.2.4 1999/04/01 14:45:47 mike Exp $".
+// End of "$Id: Fl_win32.cxx,v 1.33.2.5 1999/04/10 08:09:38 bill Exp $".
//