For consistency between WMs and with MSW, TOOL_WINDOW explicitly includes NO_TASKBAR

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index aa4e7ee76ea8501e7deaab4a58fa63bdad88e7d7..c5cbc54a40aeb2a750c09703897926ded776834a 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -451,8 +451,18 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
             m_widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 #if GTK_CHECK_VERSION(2,1,0)
             if (style & wxFRAME_TOOL_WINDOW)
             m_widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 #if GTK_CHECK_VERSION(2,1,0)
             if (style & wxFRAME_TOOL_WINDOW)

+            {

                 gtk_window_set_type_hint(GTK_WINDOW(m_widget),
                                          GDK_WINDOW_TYPE_HINT_UTILITY);
                 gtk_window_set_type_hint(GTK_WINDOW(m_widget),
                                          GDK_WINDOW_TYPE_HINT_UTILITY);

+                
+                // On some WMs, like KDE, a TOOL_WINDOW will still show
+                // on the taskbar, but on Gnome a TOOL_WINDOW will not.
+                // For consistency between WMs and with Windows, we 
+                // should set the NO_TASKBAR flag which will apply
+                // the set_skip_taskbar_hint if it is available,
+                // ensuring no taskbar entry will appear.
+                style |= wxFRAME_NO_TASKBAR;
+            }

 #endif
 
         }
 #endif
 
         }

diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index aa4e7ee76ea8501e7deaab4a58fa63bdad88e7d7..c5cbc54a40aeb2a750c09703897926ded776834a 100644 (file)
--- a/src/gtk1/toplevel.cpp
+++ b/src/gtk1/toplevel.cpp
@@ -451,8 +451,18 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
             m_widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 #if GTK_CHECK_VERSION(2,1,0)
             if (style & wxFRAME_TOOL_WINDOW)
             m_widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 #if GTK_CHECK_VERSION(2,1,0)
             if (style & wxFRAME_TOOL_WINDOW)

+            {

                 gtk_window_set_type_hint(GTK_WINDOW(m_widget),
                                          GDK_WINDOW_TYPE_HINT_UTILITY);
                 gtk_window_set_type_hint(GTK_WINDOW(m_widget),
                                          GDK_WINDOW_TYPE_HINT_UTILITY);

+                
+                // On some WMs, like KDE, a TOOL_WINDOW will still show
+                // on the taskbar, but on Gnome a TOOL_WINDOW will not.
+                // For consistency between WMs and with Windows, we 
+                // should set the NO_TASKBAR flag which will apply
+                // the set_skip_taskbar_hint if it is available,
+                // ensuring no taskbar entry will appear.
+                style |= wxFRAME_NO_TASKBAR;
+            }

 #endif
 
         }
 #endif
 
         }