fixed wxFRAME_TOOL_WINDOW to use 'utility' type hint instead of not rendering any...

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

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index f0258fbd24c39a2aa59f42d7771ae28435cc9379..f6262969853136b5921dbc6e987a715debb18af7 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -430,10 +430,6 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
     //     e.g. in wxTaskBarIconAreaGTK
     if (m_widget == NULL)
     {
     //     e.g. in wxTaskBarIconAreaGTK
     if (m_widget == NULL)
     {

-        GtkWindowType win_type = GTK_WINDOW_TOPLEVEL;
-        if (style & wxFRAME_TOOL_WINDOW)
-            win_type = GTK_WINDOW_POPUP;
-

         if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)
         {
 #ifdef __WXGTK20__
         if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)
         {
 #ifdef __WXGTK20__


@@ -450,7 +446,12 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
         }
         else
         {
         }
         else
         {

-            m_widget = gtk_window_new(win_type);
+            m_widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+        
+            if (style & wxFRAME_TOOL_WINDOW)
+                gtk_window_set_type_hint(GTK_WINDOW(m_widget),
+                                         GDK_WINDOW_TYPE_HINT_UTILITY);
+

         }
     }
 
         }
     }
 

diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index f0258fbd24c39a2aa59f42d7771ae28435cc9379..f6262969853136b5921dbc6e987a715debb18af7 100644 (file)
--- a/src/gtk1/toplevel.cpp
+++ b/src/gtk1/toplevel.cpp
@@ -430,10 +430,6 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
     //     e.g. in wxTaskBarIconAreaGTK
     if (m_widget == NULL)
     {
     //     e.g. in wxTaskBarIconAreaGTK
     if (m_widget == NULL)
     {

-        GtkWindowType win_type = GTK_WINDOW_TOPLEVEL;
-        if (style & wxFRAME_TOOL_WINDOW)
-            win_type = GTK_WINDOW_POPUP;
-

         if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)
         {
 #ifdef __WXGTK20__
         if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)
         {
 #ifdef __WXGTK20__


@@ -450,7 +446,12 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
         }
         else
         {
         }
         else
         {

-            m_widget = gtk_window_new(win_type);
+            m_widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+        
+            if (style & wxFRAME_TOOL_WINDOW)
+                gtk_window_set_type_hint(GTK_WINDOW(m_widget),
+                                         GDK_WINDOW_TYPE_HINT_UTILITY);
+

         }
     }
 
         }
     }