X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b1da76e108995e64e8af5ba08d090d0e210c5240..866592d872daa1f4e3d44948d7d3a6c90b0af9d0:/src/gtk/tbargtk.cpp

diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index 6cfe891c2d..0f90b72a74 100644
--- a/src/gtk/tbargtk.cpp
+++ b/src/gtk/tbargtk.cpp
@@ -12,12 +12,22 @@
 #endif
 
 #include "wx/toolbar.h"
+
+#if wxUSE_TOOLBAR
+
 #include "wx/frame.h"
 
 #include "glib.h"
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
@@ -30,10 +40,28 @@ extern bool   g_blockEventsOnDrag;
 
 static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *tool )
 {
+    if (g_isIdle) wxapp_install_idle_handler();
+
     if (g_blockEventsOnDrag) return;
     if (!tool->m_enabled) return;
 
-    if (tool->m_isToggle) tool->m_toggleState = !tool->m_toggleState;
+    if (tool->m_isToggle)
+    { 
+        tool->m_toggleState = !tool->m_toggleState;
+	
+	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 );
+	}
+    }
 
     tool->m_owner->OnLeftClick( tool->m_index, tool->m_toggleState );
 }
@@ -45,34 +73,39 @@ static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *to
 static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget), 
   GdkEventCrossing *WXUNUSED(gdk_event), wxToolBarTool *tool )
 {
+    if (g_isIdle) wxapp_install_idle_handler();
+
     if (g_blockEventsOnDrag) return TRUE;
     
-    /* we grey-out the tip text of disabled tool */
     
     wxToolBar *tb = tool->m_owner;
     
+#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)
-	{
+        {
             tb->m_fg->red = 0;
             tb->m_fg->green = 0;
             tb->m_fg->blue = 0;
             gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(tb->m_toolbar) ), tb->m_fg );
+            
             gtk_tooltips_set_colors( GTK_TOOLBAR(tb->m_toolbar)->tooltips, tb->m_bg, tb->m_fg );
-	}
+        }
     }
     else
     {
         if (tb->m_fg->red == 0)
-	{
+        {
             tb->m_fg->red = 33000;
             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 );
             gtk_tooltips_set_colors( GTK_TOOLBAR(tb->m_toolbar)->tooltips, tb->m_bg, tb->m_fg );
-	}
+        }
     }
+#endif
     
     /* emit the event */
   
@@ -114,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 );
 
@@ -128,15 +166,25 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id,
     if (style & wxTB_DOCKABLE)
     {
         m_widget = gtk_handle_box_new();
-	gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_toolbar) );
-	gtk_widget_show( GTK_WIDGET(m_toolbar) );
+        gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_toolbar) );
+        gtk_widget_show( GTK_WIDGET(m_toolbar) );
+        
+#if (GTK_MINOR_VERSION > 0)
+        if (style & wxTB_FLAT)
+            gtk_handle_box_set_shadow_type( GTK_HANDLE_BOX(m_widget), GTK_SHADOW_NONE );
+#endif
     }
     else
     {     
         m_widget = GTK_WIDGET(m_toolbar);
     }
-					    
+                                            
     gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE );
+    
+#if (GTK_MINOR_VERSION > 0)
+    if (style & wxTB_FLAT)
+        gtk_toolbar_set_button_relief( GTK_TOOLBAR(m_toolbar), GTK_RELIEF_NONE );
+#endif
 
     m_fg = new GdkColor;
     m_fg->red = 0;
@@ -150,14 +198,24 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id,
     m_bg->blue = 50000;
     gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ), m_bg );
   
+#if (GTK_MINOR_VERSION > 0)
+    gtk_tooltips_force_window( GTK_TOOLBAR(m_toolbar)->tooltips );
+
+    GtkStyle *g_style = 
+      gtk_style_copy(
+         gtk_widget_get_style( 
+            GTK_TOOLBAR(m_toolbar)->tooltips->tip_window ) );
+            
+    g_style->bg[GTK_STATE_NORMAL] = *m_bg;
+    gtk_widget_set_style( GTK_TOOLBAR(m_toolbar)->tooltips->tip_window, g_style );
+#else
     gtk_tooltips_set_colors( GTK_TOOLBAR(m_toolbar)->tooltips, m_bg, m_fg );
+#endif
 
     m_xMargin = 0;
     m_yMargin = 0;
     
-    m_parent->AddChild( this );
-
-    (m_parent->m_insertCallback)( m_parent, this );
+    m_parent->DoAddChild( this );
   
     PostCreation();
 
@@ -204,13 +262,13 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
     m_hasToolAlready = TRUE;
     
     wxCHECK_MSG( bitmap.Ok(), (wxToolBarTool *)NULL,
-                 "invalid bitmap for wxToolBar icon" );
+                 _T("invalid bitmap for wxToolBar icon") );
 
     wxCHECK_MSG( bitmap.GetBitmap() == NULL, (wxToolBarTool *)NULL,
-                 "wxToolBar doesn't support GdkBitmap" );
+                 _T("wxToolBar doesn't support GdkBitmap") );
 
     wxCHECK_MSG( bitmap.GetPixmap() != NULL, (wxToolBarTool *)NULL,
-                 "wxToolBar::Add needs a wxBitmap" );
+                 _T("wxToolBar::Add needs a wxBitmap") );
   
     GtkWidget *tool_pixmap = (GtkWidget *)NULL;
   
@@ -221,13 +279,16 @@ 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 );
 
     wxToolBarTool *tool = new wxToolBarTool( this, toolIndex, bitmap, pushedBitmap,
                                              toggle, clientData,
                                              helpString1, helpString2,
-					     tool_pixmap );
+                                             tool_pixmap );
 
     GtkToolbarChildType ctype = toggle ? GTK_TOOLBAR_CHILD_TOGGLEBUTTON
                                        : GTK_TOOLBAR_CHILD_BUTTON;
@@ -238,7 +299,7 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
                       ctype,
                       (GtkWidget *)NULL,
                       (const char *)NULL,
-                      helpString1,
+                      helpString1.mbc_str(),
                       "",
                       tool_pixmap,
                       (GtkSignalFunc)gtk_toolbar_callback,
@@ -264,7 +325,7 @@ void wxToolBar::AddSeparator()
 
 void wxToolBar::ClearTools()
 {
-    wxFAIL_MSG( "wxToolBar::ClearTools not implemented" );
+    wxFAIL_MSG( _T("wxToolBar::ClearTools not implemented") );
 }
 
 bool wxToolBar::Realize()
@@ -301,20 +362,20 @@ void wxToolBar::EnableTool(int toolIndex, bool enable)
         if (tool->m_index == toolIndex)
         {
             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 (tool->m_item)
-	        gtk_widget_set_sensitive( tool->m_item, enable );
-*/
-		
+            
+#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;
         }
         node = node->Next();
     }
   
-    wxFAIL_MSG( "wrong toolbar index" );
+    wxFAIL_MSG( _T("wrong toolbar index") );
 }
 
 void wxToolBar::ToggleTool( int toolIndex, bool toggle ) 
@@ -325,15 +386,38 @@ 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();
     }
   
-    wxFAIL_MSG( "wrong toolbar index" );
+    wxFAIL_MSG( _T("wrong toolbar index") );
 }
 
 wxObject *wxToolBar::GetToolClientData( int index ) const
@@ -346,7 +430,7 @@ wxObject *wxToolBar::GetToolClientData( int index ) const
         node = node->Next();
     }
   
-    wxFAIL_MSG( "wrong toolbar index" );
+    wxFAIL_MSG( _T("wrong toolbar index") );
   
     return (wxObject*)NULL;
 }
@@ -361,7 +445,7 @@ bool wxToolBar::GetToolState(int toolIndex) const
         node = node->Next();
     }
   
-    wxFAIL_MSG( "wrong toolbar index" );
+    wxFAIL_MSG( _T("wrong toolbar index") );
   
     return FALSE;
 }
@@ -376,14 +460,14 @@ bool wxToolBar::GetToolEnabled(int toolIndex) const
         node = node->Next();
     }
   
-    wxFAIL_MSG( "wrong toolbar index" );
+    wxFAIL_MSG( _T("wrong toolbar index") );
   
     return FALSE;
 }
 
 void wxToolBar::SetMargins( int x, int y )
 {
-    wxCHECK_RET( !m_hasToolAlready, "wxToolBar::SetMargins must be called before adding tool." );
+    wxCHECK_RET( !m_hasToolAlready, _T("wxToolBar::SetMargins must be called before adding tool.") );
     
     if (x > 2) gtk_toolbar_append_space( m_toolbar );  // oh well
     
@@ -393,7 +477,7 @@ void wxToolBar::SetMargins( int x, int y )
 
 void wxToolBar::SetToolPacking( int WXUNUSED(packing) )
 {
-    wxFAIL_MSG( "wxToolBar::SetToolPacking not implemented" );
+    wxFAIL_MSG( _T("wxToolBar::SetToolPacking not implemented") );
 }
 
 void wxToolBar::SetToolSeparation( int separation )
@@ -425,9 +509,9 @@ wxString wxToolBar::GetToolLongHelp(int toolIndex)
         node = node->Next();
     }
   
-    wxFAIL_MSG( "wrong toolbar index" );
+    wxFAIL_MSG( _T("wrong toolbar index") );
     
-    return "";
+    return _T("");
 }
 
 wxString wxToolBar::GetToolShortHelp(int toolIndex)
@@ -443,9 +527,9 @@ wxString wxToolBar::GetToolShortHelp(int toolIndex)
         node = node->Next();
     }
   
-    wxFAIL_MSG( "wrong toolbar index" );
+    wxFAIL_MSG( _T("wrong toolbar index") );
     
-    return "";
+    return _T("");
 }
 
 void wxToolBar::SetToolLongHelp(int toolIndex, const wxString& helpString)
@@ -457,12 +541,12 @@ void wxToolBar::SetToolLongHelp(int toolIndex, const wxString& helpString)
         if (tool->m_index == toolIndex)
         { 
             tool->m_longHelpString = helpString;
-	    return;
+            return;
         }
         node = node->Next();
     }
   
-    wxFAIL_MSG( "wrong toolbar index" );
+    wxFAIL_MSG( _T("wrong toolbar index") );
     
     return;
 }
@@ -476,12 +560,12 @@ void wxToolBar::SetToolShortHelp(int toolIndex, const wxString& helpString)
         if (tool->m_index == toolIndex)
         { 
             tool->m_shortHelpString = helpString;
-	    return;
+            return;
         }
         node = node->Next();
     }
   
-    wxFAIL_MSG( "wrong toolbar index" );
+    wxFAIL_MSG( _T("wrong toolbar index") );
     
     return;
 }
@@ -514,3 +598,4 @@ void wxToolBar::OnIdle( wxIdleEvent &WXUNUSED(ievent) )
     }
 }
 
+#endif