Useful little fix that automatically hides the busy cursor in modal dialogs.

[wxWidgets.git] / src / gtk / tbargtk.cpp

diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index 651c6ba0819e0ddb533f154be431c7b91e0e3602..0f90b72a744d05b447935a8dd19d32b6f82c13cf 100644 (file)
--- a/src/gtk/tbargtk.cpp
+++ b/src/gtk/tbargtk.cpp
@@ -80,8 +80,8 @@ static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget),
     
     wxToolBar *tb = tool->m_owner;
     
-    /* we grey-out the tip text of disabled tool */
-#if 0
+#if (GTK_MINOR_VERSION == 0)
+    /* we grey-out the tip text of disabled tool in GTK 1.0 */
     if (tool->m_enabled)
     {
         if (tb->m_fg->red != 0)
@@ -91,17 +91,7 @@ static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget),
             tb->m_fg->blue = 0;
             gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(tb->m_toolbar) ), tb->m_fg );
             
-#if (GTK_MINOR_VERSION > 0)
-            GtkStyle *g_style = 
-              gtk_style_copy(
-                gtk_widget_get_style( 
-                   GTK_TOOLBAR(tb->m_toolbar)->tooltips->tip_window ) );
-            
-            g_style->fg[GTK_STATE_NORMAL] = *tb->m_fg;
-            gtk_widget_set_style( GTK_TOOLBAR(tb->m_toolbar)->tooltips->tip_window, g_style );
-#else
             gtk_tooltips_set_colors( GTK_TOOLBAR(tb->m_toolbar)->tooltips, tb->m_bg, tb->m_fg );
-#endif
         }
     }
     else
@@ -112,17 +102,7 @@ static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget),
             tb->m_fg->green = 33000;
             tb->m_fg->blue = 33000;
             gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(tb->m_toolbar) ), tb->m_fg );
-#if (GTK_MINOR_VERSION > 0)
-            GtkStyle *g_style = 
-              gtk_style_copy(
-                gtk_widget_get_style( 
-                   GTK_TOOLBAR(tb->m_toolbar)->tooltips->tip_window ) );
-            
-            g_style->fg[GTK_STATE_NORMAL] = *tb->m_fg;
-            gtk_widget_set_style( GTK_TOOLBAR(tb->m_toolbar)->tooltips->tip_window, g_style );
-#else
             gtk_tooltips_set_colors( GTK_TOOLBAR(tb->m_toolbar)->tooltips, tb->m_bg, tb->m_fg );
-#endif
         }
     }
 #endif
@@ -167,7 +147,12 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id,
 {
     m_needParent = TRUE;
 
-    PreCreation( parent, id, pos, size, style, name );
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+    {
+        wxFAIL_MSG( _T("wxToolBar creation failed") );
+       return FALSE;
+    }
 
     m_tools.DeleteContents( TRUE );
 
@@ -294,7 +279,9 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
       mask = bitmap.GetMask()->GetBitmap();
     
     tool_pixmap = gtk_pixmap_new( pixmap, mask );
+#if (GTK_MINOR_VERSION > 0)
     gtk_pixmap_set_build_insensitive( GTK_PIXMAP(tool_pixmap), TRUE );
+#endif
     
     gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 );
 
@@ -376,11 +363,12 @@ void wxToolBar::EnableTool(int toolIndex, bool enable)
         {
             tool->m_enabled = enable;
             
-/*   we don't disable the tools for now as the bitmaps don't get
-     greyed anyway and this also disables tooltips */
-
+#if (GTK_MINOR_VERSION > 0)
+            /* we don't disable the tools for GTK 1.0 as the bitmaps don't get
+               greyed anyway and this also disables tooltips */
             if (tool->m_item)
                 gtk_widget_set_sensitive( tool->m_item, enable );
+#endif
                 
             return;
         }
@@ -398,9 +386,32 @@ void wxToolBar::ToggleTool( int toolIndex, bool toggle )
         wxToolBarTool *tool = (wxToolBarTool*)node->Data();
         if (tool->m_index == toolIndex)
         { 
-            tool->m_toggleState = toggle;
             if ((tool->m_item) && (GTK_IS_TOGGLE_BUTTON(tool->m_item)))
+           {
+                tool->m_toggleState = toggle;
+               
+               if (tool->m_bitmap2.Ok())
+               {
+                   wxBitmap bitmap = tool->m_bitmap1;
+                   if (tool->m_toggleState) bitmap = tool->m_bitmap2;
+           
+                    GtkPixmap *pixmap = GTK_PIXMAP( tool->m_pixmap );
+           
+                    GdkBitmap *mask = (GdkBitmap *) NULL;
+                    if (bitmap.GetMask()) mask = bitmap.GetMask()->GetBitmap();
+  
+                    gtk_pixmap_set( pixmap, bitmap.GetPixmap(), mask );
+               }
+               
+                gtk_signal_disconnect_by_func( GTK_OBJECT(tool->m_item), 
+                  GTK_SIGNAL_FUNC(gtk_toolbar_callback), (gpointer*)tool );
+               
                 gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(tool->m_item), toggle );
+               
+                gtk_signal_connect( GTK_OBJECT(tool->m_item), "clicked",
+                  GTK_SIGNAL_FUNC(gtk_toolbar_callback), (gpointer*)tool );
+           }
+
             return;
         }
         node = node->Next();