summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2002-04-29 20:18:01 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2002-04-29 20:18:01 +0000
commitc8aebffa8894a0b7a39e19e5341c6c0f4dc552af (patch)
tree636126ae962c4b963fd944cd20e9714bffce2cc5
parente845bebc6f240ea957756667b72a2d5abddde102 (diff)
Flag menu and tooltip windows as WS_EX_TOOLWINDOW so they don't appear in
the task bar... git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2131 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--CHANGES2
-rw-r--r--src/Fl_win32.cxx10
2 files changed, 8 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES
index 544b9f1b4..a7d046216 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
CHANGES IN FLTK 1.1.0rc1
+ - Tooltip windows would show up in the task bar under
+ WIN32.
- Now append trailing slash to directory names in names
in WIN32 version of scandir(). This takes care of a
file chooser performance problem with large
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx
index e521de106..4845efd91 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.27 2002/04/16 07:47:31 spitzak Exp $"
+// "$Id: Fl_win32.cxx,v 1.33.2.37.2.28 2002/04/29 20:18:01 easysw Exp $"
//
// WIN32-specific code for the Fast Light Tool Kit (FLTK).
//
@@ -975,8 +975,10 @@ Fl_X* Fl_X::make(Fl_Window* w) {
styleEx |= WS_EX_WINDOWEDGE | WS_EX_CONTROLPARENT;
int xwm = xp , ywm = yp , bt, bx, by;
switch (fake_X_wm(w, xwm, ywm, bt, bx, by)) {
- // No border (user for menus)
- case 0: style |= WS_POPUP; break;
+ // No border (used for menus)
+ case 0: style |= WS_POPUP;
+ styleEx != WS_EX_TOOLWINDOW;
+ break;
// Thin border and title bar
case 1: style |= WS_DLGFRAME | WS_CAPTION; break;
@@ -1179,5 +1181,5 @@ void Fl_Window::make_current() {
}
//
-// End of "$Id: Fl_win32.cxx,v 1.33.2.37.2.27 2002/04/16 07:47:31 spitzak Exp $".
+// End of "$Id: Fl_win32.cxx,v 1.33.2.37.2.28 2002/04/29 20:18:01 easysw Exp $".
//