Applied patch for stipppled brushes,

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

diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp
index dfc1d7b6311d0a04e83375a7c3babf70efa2d47e..0f90b72a744d05b447935a8dd19d32b6f82c13cf 100644 (file)
--- a/src/gtk1/tbargtk.cpp
+++ b/src/gtk1/tbargtk.cpp
@@ -12,12 +12,22 @@
 #endif
 
 #include "wx/toolbar.h"
 #endif
 
 #include "wx/toolbar.h"

+
+#if wxUSE_TOOLBAR
+

 #include "wx/frame.h"
 
 #include "glib.h"
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
 #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
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------


@@ -30,10 +40,28 @@ extern bool   g_blockEventsOnDrag;
 
 static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *tool )
 {
 
 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 (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 );
 }
 
     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 )
 {
 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;
     
     if (g_blockEventsOnDrag) return TRUE;
     

-    /* we grey-out the tip text of disabled tool */

     
     wxToolBar *tb = tool->m_owner;
     
     
     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)
     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 );
             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 );
             gtk_tooltips_set_colors( GTK_TOOLBAR(tb->m_toolbar)->tooltips, tb->m_bg, tb->m_fg );

-       }
+        }

     }
     else
     {
         if (tb->m_fg->red == 0)
     }
     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 );
             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 */
   
     
     /* emit the event */
   


@@ -114,7 +147,12 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id,
 {
     m_needParent = TRUE;
 
 {
     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 );
 
 
     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();
     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);
     }
     }
     else
     {     
         m_widget = GTK_WIDGET(m_toolbar);
     }

-                                           
+                                            

     gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE );
     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;
 
     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 );
   
     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 );
     gtk_tooltips_set_colors( GTK_TOOLBAR(m_toolbar)->tooltips, m_bg, m_fg );

+#endif

 
     m_xMargin = 0;
     m_yMargin = 0;
     
 
     m_xMargin = 0;
     m_yMargin = 0;
     

-    m_parent->AddChild( this );
-
-    (m_parent->m_insertCallback)( m_parent, this );
+    m_parent->DoAddChild( this );

   
     PostCreation();
 
   
     PostCreation();
 


@@ -221,13 +279,16 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
       mask = bitmap.GetMask()->GetBitmap();
     
     tool_pixmap = gtk_pixmap_new( pixmap, mask );
       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,
     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;
 
     GtkToolbarChildType ctype = toggle ? GTK_TOOLBAR_CHILD_TOGGLEBUTTON
                                        : GTK_TOOLBAR_CHILD_BUTTON;


@@ -301,14 +362,14 @@ void wxToolBar::EnableTool(int toolIndex, bool enable)
         if (tool->m_index == toolIndex)
         {
             tool->m_enabled = 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();
             return;
         }
         node = node->Next();


@@ -325,9 +386,32 @@ void wxToolBar::ToggleTool( int toolIndex, bool toggle )
         wxToolBarTool *tool = (wxToolBarTool*)node->Data();
         if (tool->m_index == toolIndex)
         { 
         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)))
             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_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();
             return;
         }
         node = node->Next();


@@ -457,7 +541,7 @@ void wxToolBar::SetToolLongHelp(int toolIndex, const wxString& helpString)
         if (tool->m_index == toolIndex)
         { 
             tool->m_longHelpString = helpString;
         if (tool->m_index == toolIndex)
         { 
             tool->m_longHelpString = helpString;

-           return;
+            return;

         }
         node = node->Next();
     }
         }
         node = node->Next();
     }


@@ -476,7 +560,7 @@ void wxToolBar::SetToolShortHelp(int toolIndex, const wxString& helpString)
         if (tool->m_index == toolIndex)
         { 
             tool->m_shortHelpString = helpString;
         if (tool->m_index == toolIndex)
         { 
             tool->m_shortHelpString = helpString;

-           return;
+            return;

         }
         node = node->Next();
     }
         }
         node = node->Next();
     }


@@ -514,3 +598,4 @@ void wxToolBar::OnIdle( wxIdleEvent &WXUNUSED(ievent) )
     }
 }
 
     }
 }
 

+#endif