diff options
| author | Bill Spitzak <spitzak@gmail.com> | 1999-04-10 08:09:39 +0000 |
|---|---|---|
| committer | Bill Spitzak <spitzak@gmail.com> | 1999-04-10 08:09:39 +0000 |
| commit | fa29bbdc0f872bb739754ced1893e3529e9d9b12 (patch) | |
| tree | 61dd838b5dcf9e59aa1f4014594bc5cf03bcb20b /src/Fl_x.cxx | |
| parent | 69302ebb675bfa241babf44b90dfb3d1c821728d (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_x.cxx')
| -rw-r--r-- | src/Fl_x.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx index ceb847fd8..96f264646 100644 --- a/src/Fl_x.cxx +++ b/src/Fl_x.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_x.cxx,v 1.24.2.1 1999/03/15 07:06:46 bill Exp $" +// "$Id: Fl_x.cxx,v 1.24.2.2 1999/04/10 08:09:39 bill Exp $" // // X specific code for the Fast Light Tool Kit (FLTK). // @@ -543,6 +543,7 @@ Fl_X* Fl_X::set_xid(Fl_Window* w, Window xid) { x->region = 0; x->wait_for_expose = 1; Fl_X::first = x; + if (w->modal()) {Fl::modal_ = w; fl_fix_focus();} return x; } @@ -628,8 +629,6 @@ void Fl_X::make_xid(Fl_Window* w, XVisualInfo *visual, Colormap colormap) w->set_visible(); w->handle(FL_SHOW); // get child windows to appear w->redraw(); - fl_fix_focus(); // if this is modal we must fix focus now - //XInstallColormap(fl_display, colormap); if (!w->parent() && !attr.override_redirect) { // Communicate all kinds 'o junk to the X Window Manager: @@ -824,5 +823,5 @@ void Fl_Window::make_current() { #endif // -// End of "$Id: Fl_x.cxx,v 1.24.2.1 1999/03/15 07:06:46 bill Exp $". +// End of "$Id: Fl_x.cxx,v 1.24.2.2 1999/04/10 08:09:39 bill Exp $". // |