summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES2
-rw-r--r--src/Fl_mac.cxx20
2 files changed, 12 insertions, 10 deletions
diff --git a/CHANGES b/CHANGES
index 818837ecd..a07df5b26 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
CHANGES IN FLTK 1.1.8
+ - Fixed OS X bug that would hide tooltips before
+ they were shown (STR #1392)
- Fixed Fl_Tabs tooltip reappearing (STR #1324)
- Added a new demo game called "Block Attack!"
- Updated the Sudoku game to show a notice about Hard and
diff --git a/src/Fl_mac.cxx b/src/Fl_mac.cxx
index 3a54b64ad..001c58794 100644
--- a/src/Fl_mac.cxx
+++ b/src/Fl_mac.cxx
@@ -1906,17 +1906,17 @@ void Fl_X::make(Fl_Window* w)
if (w->size_range_set) w->size_range_();
- //if (winclass != kHelpWindowClass) {
+ if (winclass != kHelpWindowClass) {
Fl_Tooltip::enter(0);
- if (w->size_range_set) w->size_range_();
- ShowWindow(x->xid);
- if (fl_show_iconic) {
- fl_show_iconic = 0;
- CollapseWindow( x->xid, true ); // \todo Mac ; untested
- } else {
- w->set_visible();
- }
- //}
+ }
+ if (w->size_range_set) w->size_range_();
+ ShowWindow(x->xid);
+ if (fl_show_iconic) {
+ fl_show_iconic = 0;
+ CollapseWindow( x->xid, true ); // \todo Mac ; untested
+ } else {
+ w->set_visible();
+ }
Rect rect;
GetWindowBounds(x->xid, kWindowContentRgn, &rect);