wxPostScriptDC::DrawText now uses descent to determine baseline (instead of rough...

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

diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp
index 6e5b301d48f62173e2bfca9d7e1c322de68a54bc..7df75acd3a96e474feecc10da9f0cf03f77f3712 100644 (file)
--- a/src/gtk1/tbargtk.cpp
+++ b/src/gtk1/tbargtk.cpp
@@ -41,7 +41,14 @@ extern wxCursor   g_globalCursor;
 
 static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *tool )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
+    if (g_isIdle) 
+        wxapp_install_idle_handler();
+
+    if (tool->m_owner->m_blockNextEvent)
+    { 
+        tool->m_owner->m_blockNextEvent = FALSE;
+        return;
+    }
 
     if (g_blockEventsOnDrag) return;
     if (!tool->m_enabled) return;
@@ -115,6 +122,15 @@ static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget),
     return FALSE;
 }
 
+//-----------------------------------------------------------------------------
+// InsertChild callback for wxToolBar
+//-----------------------------------------------------------------------------
+
+static void wxInsertChildInToolBar( wxToolBar* WXUNUSED(parent), wxWindow* WXUNUSED(child) )
+{
+    /* we don't do anything here but pray */
+}
+
 //-----------------------------------------------------------------------------
 // wxToolBar
 //-----------------------------------------------------------------------------
@@ -147,6 +163,8 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id,
   long style, const wxString& name )
 {
     m_needParent = TRUE;
+    m_blockNextEvent = FALSE;
+    m_insertCallback = (wxInsertChildFunction)wxInsertChildInToolBar;
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
@@ -160,7 +178,7 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id,
     m_toolbar = GTK_TOOLBAR( gtk_toolbar_new( GTK_ORIENTATION_HORIZONTAL,
                                               GTK_TOOLBAR_ICONS ) );
 
-    m_separation = 5;
+    m_separation = 7;
     gtk_toolbar_set_space_size( m_toolbar, m_separation );
     m_hasToolAlready = FALSE;
 
@@ -257,7 +275,7 @@ void wxToolBar::OnMouseEnter( int toolIndex )
 
 wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
   const wxBitmap& pushedBitmap, bool toggle,
-  float WXUNUSED(xPos), float WXUNUSED(yPos), wxObject *clientData,
+  wxCoord WXUNUSED(xPos), wxCoord WXUNUSED(yPos), wxObject *clientData,
   const wxString& helpString1, const wxString& helpString2 )
 {
     m_hasToolAlready = TRUE;
@@ -296,7 +314,7 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
 
     GtkWidget *item = gtk_toolbar_append_element
                      (
-                      GTK_TOOLBAR(m_toolbar),
+                      m_toolbar,
                       ctype,
                       (GtkWidget *)NULL,
                       (const char *)NULL,
@@ -309,6 +327,11 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
 
     tool->m_item = item;
 
+    GtkRequisition req;
+    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
+    m_width = req.width + m_xMargin;
+    m_height = req.height + 2*m_yMargin + 4;
+
     gtk_signal_connect( GTK_OBJECT(tool->m_item),
                         "enter_notify_event", 
                         GTK_SIGNAL_FUNC(gtk_toolbar_enter_callback),
@@ -319,38 +342,64 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
     return tool;
 }
 
-void wxToolBar::AddSeparator()
+bool wxToolBar::AddControl(wxControl *control)
 {
-    gtk_toolbar_append_space( m_toolbar );
+    wxCHECK_MSG( control, FALSE, wxT("toolbar: can't insert NULL control") );
+
+    wxCHECK_MSG( control->GetParent() == this, FALSE,
+                 wxT("control must have toolbar as parent") );
+
+    m_hasToolAlready = TRUE;
+    
+    wxToolBarTool *tool = new wxToolBarTool(control);
+    
+    tool -> m_item = NULL;
+    gtk_toolbar_append_widget( m_toolbar, control->m_widget, (const char *) NULL, (const char *) NULL );
+    
+    GtkRequisition req;
+    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
+    m_width = req.width + m_xMargin;
+    m_height = req.height + 2*m_yMargin + 4;
+
+    m_tools.Append( tool );
+    
+    return TRUE;
 }
 
-void wxToolBar::ClearTools()
+void wxToolBar::AddSeparator()
 {
-    wxFAIL_MSG( wxT("wxToolBar::ClearTools not implemented") );
+    gtk_toolbar_append_space( m_toolbar );
 }
 
-bool wxToolBar::Realize()
+bool wxToolBar::DeleteTool(int toolIndex)
 {
-    m_x = 0;
-    m_y = 0;
-    m_width = 100;
-    m_height = 0;
-  
     wxNode *node = m_tools.First();
     while (node)
     {
         wxToolBarTool *tool = (wxToolBarTool*)node->Data();
-        if (tool->m_bitmap1.Ok())
+        if (tool->m_index == toolIndex)
         {
-            int tool_height = tool->m_bitmap1.GetHeight();
-            if (tool_height > m_height) m_height = tool_height;
+            if (tool->m_control)
+                tool->m_control->Destroy();
+            else
+                gtk_widget_destroy( tool->m_item );
+            m_tools.DeleteNode( node );
+           
+            return TRUE;
         }
-    
         node = node->Next();
     }
-  
-    m_height += 5 + 2*m_yMargin;
-   
+
+    return FALSE;
+}
+
+void wxToolBar::ClearTools()
+{
+    wxFAIL_MSG( wxT("wxToolBar::ClearTools not implemented") );
+}
+
+bool wxToolBar::Realize()
+{
     return TRUE;
 }
 
@@ -404,13 +453,9 @@ void wxToolBar::ToggleTool( int toolIndex, bool toggle )
                     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 );
+                m_blockNextEvent = TRUE;  // we cannot use gtk_signal_disconnect here
                
                 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;
@@ -470,7 +515,7 @@ void wxToolBar::SetMargins( int x, int y )
 {
     wxCHECK_RET( !m_hasToolAlready, wxT("wxToolBar::SetMargins must be called before adding tool.") );
     
-    if (x > 2) gtk_toolbar_append_space( m_toolbar );  // oh well
+    if (x > 1) gtk_toolbar_append_space( m_toolbar );  // oh well
     
     m_xMargin = x;
     m_yMargin = y;
@@ -626,12 +671,12 @@ void wxToolBar::OnInternalIdle()
        while (node)
         {
            wxToolBarTool *tool = (wxToolBarTool*)node->Data();
-           if (!tool->m_item->window)
-               break;
+           node = node->Next();
+           
+           if (!tool->m_item || !tool->m_item->window)
+               continue;
            else
                gdk_window_set_cursor( tool->m_item->window, cursor.GetCursor() );
-               
-           node = node->Next();
         }
     }