assert in OnSelected() fixed

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

diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index b3b92a7816a26c229f723303287e1a46ddf1a101..9ee4df2deb4245b8ef17c4226853eafe0f32aab8 100644 (file)
--- a/src/gtk/tbargtk.cpp
+++ b/src/gtk/tbargtk.cpp
@@ -41,7 +41,14 @@ extern wxCursor   g_globalCursor;
 
 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_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;
 
     if (g_blockEventsOnDrag) return;
     if (!tool->m_enabled) return;


@@ -115,6 +122,15 @@ static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget),
     return FALSE;
 }
 
     return FALSE;
 }
 

+//-----------------------------------------------------------------------------
+// InsertChild callback for wxToolBar
+//-----------------------------------------------------------------------------
+
+static void wxInsertChildInToolBar( wxToolBar* WXUNUSED(parent), wxWindow* WXUNUSED(child) )
+{
+    /* we don't do anything here but pray */
+}
+

 //-----------------------------------------------------------------------------
 // wxToolBar
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxToolBar
 //-----------------------------------------------------------------------------


@@ -147,11 +163,13 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id,
   long style, const wxString& name )
 {
     m_needParent = TRUE;
   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 ))
     {
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {

-        wxFAIL_MSG( _T("wxToolBar creation failed") );
+        wxFAIL_MSG( wxT("wxToolBar creation failed") );

        return FALSE;
     }
 
        return FALSE;
     }
 


@@ -257,19 +275,19 @@ void wxToolBar::OnMouseEnter( int toolIndex )
 
 wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
   const wxBitmap& pushedBitmap, bool toggle,
 
 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;
     
     wxCHECK_MSG( bitmap.Ok(), (wxToolBarTool *)NULL,
   const wxString& helpString1, const wxString& helpString2 )
 {
     m_hasToolAlready = TRUE;
     
     wxCHECK_MSG( bitmap.Ok(), (wxToolBarTool *)NULL,

-                 _T("invalid bitmap for wxToolBar icon") );
+                 wxT("invalid bitmap for wxToolBar icon") );

 
     wxCHECK_MSG( bitmap.GetBitmap() == NULL, (wxToolBarTool *)NULL,
 
     wxCHECK_MSG( bitmap.GetBitmap() == NULL, (wxToolBarTool *)NULL,

-                 _T("wxToolBar doesn't support GdkBitmap") );
+                 wxT("wxToolBar doesn't support GdkBitmap") );

 
     wxCHECK_MSG( bitmap.GetPixmap() != NULL, (wxToolBarTool *)NULL,
 
     wxCHECK_MSG( bitmap.GetPixmap() != NULL, (wxToolBarTool *)NULL,

-                 _T("wxToolBar::Add needs a wxBitmap") );
+                 wxT("wxToolBar::Add needs a wxBitmap") );

   
     GtkWidget *tool_pixmap = (GtkWidget *)NULL;
   
   
     GtkWidget *tool_pixmap = (GtkWidget *)NULL;
   


@@ -296,7 +314,7 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
 
     GtkWidget *item = gtk_toolbar_append_element
                      (
 
     GtkWidget *item = gtk_toolbar_append_element
                      (

-                      GTK_TOOLBAR(m_toolbar),
+                      m_toolbar,

                       ctype,
                       (GtkWidget *)NULL,
                       (const char *)NULL,
                       ctype,
                       (GtkWidget *)NULL,
                       (const char *)NULL,


@@ -309,6 +327,11 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
 
     tool->m_item = item;
 
 
     tool->m_item = item;
 

+    GtkRequisition req;
+    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
+    m_width = req.width;
+    m_height = req.height;
+

     gtk_signal_connect( GTK_OBJECT(tool->m_item),
                         "enter_notify_event", 
                         GTK_SIGNAL_FUNC(gtk_toolbar_enter_callback),
     gtk_signal_connect( GTK_OBJECT(tool->m_item),
                         "enter_notify_event", 
                         GTK_SIGNAL_FUNC(gtk_toolbar_enter_callback),


@@ -319,6 +342,29 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
     return tool;
 }
 
     return tool;
 }
 

+bool wxToolBar::AddControl(wxControl *control)
+{
+    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);
+    
+    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_height = req.height;
+
+    m_tools.Append( tool );
+    
+    return TRUE;
+}
+

 void wxToolBar::AddSeparator()
 {
     gtk_toolbar_append_space( m_toolbar );
 void wxToolBar::AddSeparator()
 {
     gtk_toolbar_append_space( m_toolbar );


@@ -326,7 +372,7 @@ void wxToolBar::AddSeparator()
 
 void wxToolBar::ClearTools()
 {
 
 void wxToolBar::ClearTools()
 {

-    wxFAIL_MSG( _T("wxToolBar::ClearTools not implemented") );
+    wxFAIL_MSG( wxT("wxToolBar::ClearTools not implemented") );

 }
 
 bool wxToolBar::Realize()
 }
 
 bool wxToolBar::Realize()


@@ -376,7 +422,7 @@ void wxToolBar::EnableTool(int toolIndex, bool enable)
         node = node->Next();
     }
   
         node = node->Next();
     }
   

-    wxFAIL_MSG( _T("wrong toolbar index") );
+    wxFAIL_MSG( wxT("wrong toolbar index") );

 }
 
 void wxToolBar::ToggleTool( int toolIndex, bool toggle ) 
 }
 
 void wxToolBar::ToggleTool( int toolIndex, bool toggle ) 


@@ -404,13 +450,9 @@ void wxToolBar::ToggleTool( int toolIndex, bool toggle )
                     gtk_pixmap_set( pixmap, bitmap.GetPixmap(), mask );
                }
                
                     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_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;
            }
 
             return;


@@ -418,7 +460,7 @@ void wxToolBar::ToggleTool( int toolIndex, bool toggle )
         node = node->Next();
     }
   
         node = node->Next();
     }
   

-    wxFAIL_MSG( _T("wrong toolbar index") );
+    wxFAIL_MSG( wxT("wrong toolbar index") );

 }
 
 wxObject *wxToolBar::GetToolClientData( int index ) const
 }
 
 wxObject *wxToolBar::GetToolClientData( int index ) const


@@ -431,7 +473,7 @@ wxObject *wxToolBar::GetToolClientData( int index ) const
         node = node->Next();
     }
   
         node = node->Next();
     }
   

-    wxFAIL_MSG( _T("wrong toolbar index") );
+    wxFAIL_MSG( wxT("wrong toolbar index") );

   
     return (wxObject*)NULL;
 }
   
     return (wxObject*)NULL;
 }


@@ -446,7 +488,7 @@ bool wxToolBar::GetToolState(int toolIndex) const
         node = node->Next();
     }
   
         node = node->Next();
     }
   

-    wxFAIL_MSG( _T("wrong toolbar index") );
+    wxFAIL_MSG( wxT("wrong toolbar index") );

   
     return FALSE;
 }
   
     return FALSE;
 }


@@ -461,14 +503,14 @@ bool wxToolBar::GetToolEnabled(int toolIndex) const
         node = node->Next();
     }
   
         node = node->Next();
     }
   

-    wxFAIL_MSG( _T("wrong toolbar index") );
+    wxFAIL_MSG( wxT("wrong toolbar index") );

   
     return FALSE;
 }
 
 void wxToolBar::SetMargins( int x, int y )
 {
   
     return FALSE;
 }
 
 void wxToolBar::SetMargins( int x, int y )
 {

-    wxCHECK_RET( !m_hasToolAlready, _T("wxToolBar::SetMargins must be called before adding tool.") );
+    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 > 2) gtk_toolbar_append_space( m_toolbar );  // oh well
     


@@ -478,7 +520,7 @@ void wxToolBar::SetMargins( int x, int y )
 
 void wxToolBar::SetToolPacking( int WXUNUSED(packing) )
 {
 
 void wxToolBar::SetToolPacking( int WXUNUSED(packing) )
 {

-    wxFAIL_MSG( _T("wxToolBar::SetToolPacking not implemented") );
+    wxFAIL_MSG( wxT("wxToolBar::SetToolPacking not implemented") );

 }
 
 void wxToolBar::SetToolSeparation( int separation )
 }
 
 void wxToolBar::SetToolSeparation( int separation )


@@ -510,9 +552,9 @@ wxString wxToolBar::GetToolLongHelp(int toolIndex)
         node = node->Next();
     }
   
         node = node->Next();
     }
   

-    wxFAIL_MSG( _T("wrong toolbar index") );
+    wxFAIL_MSG( wxT("wrong toolbar index") );

     
     

-    return _T("");
+    return wxT("");

 }
 
 wxString wxToolBar::GetToolShortHelp(int toolIndex)
 }
 
 wxString wxToolBar::GetToolShortHelp(int toolIndex)


@@ -528,9 +570,9 @@ wxString wxToolBar::GetToolShortHelp(int toolIndex)
         node = node->Next();
     }
   
         node = node->Next();
     }
   

-    wxFAIL_MSG( _T("wrong toolbar index") );
+    wxFAIL_MSG( wxT("wrong toolbar index") );

     
     

-    return _T("");
+    return wxT("");

 }
 
 void wxToolBar::SetToolLongHelp(int toolIndex, const wxString& helpString)
 }
 
 void wxToolBar::SetToolLongHelp(int toolIndex, const wxString& helpString)


@@ -547,7 +589,7 @@ void wxToolBar::SetToolLongHelp(int toolIndex, const wxString& helpString)
         node = node->Next();
     }
   
         node = node->Next();
     }
   

-    wxFAIL_MSG( _T("wrong toolbar index") );
+    wxFAIL_MSG( wxT("wrong toolbar index") );

     
     return;
 }
     
     return;
 }


@@ -566,7 +608,7 @@ void wxToolBar::SetToolShortHelp(int toolIndex, const wxString& helpString)
         node = node->Next();
     }
   
         node = node->Next();
     }
   

-    wxFAIL_MSG( _T("wrong toolbar index") );
+    wxFAIL_MSG( wxT("wrong toolbar index") );

     
     return;
 }
     
     return;
 }


@@ -604,26 +646,34 @@ void wxToolBar::OnInternalIdle()
     wxCursor cursor = m_cursor;
     if (g_globalCursor.Ok()) cursor = g_globalCursor;
 
     wxCursor cursor = m_cursor;
     if (g_globalCursor.Ok()) cursor = g_globalCursor;
 

-    if (cursor.Ok() && m_currentGdkCursor != cursor)
+    if (cursor.Ok())

     {
     {

-        wxCursor oldGdkCursor = m_currentGdkCursor;
-        m_currentGdkCursor = cursor;
+        /* I now set the cursor the anew in every OnInternalIdle call
+          as setting the cursor in a parent window also effects the
+          windows above so that checking for the current cursor is
+          not possible. */
+          
+        if (HasFlag(wxTB_DOCKABLE))
+       {
+           /* if the toolbar is dockable, then m_widget stands for the
+              GtkHandleBox widget, which uses its own window so that we
+              can set the cursor for it. if the toolbar is not dockable,
+              m_widget comes from m_toolbar which uses its parent's
+              window ("windowless windows") and thus we cannot set the
+              cursor. */
+           gdk_window_set_cursor( m_widget->window, cursor.GetCursor() );
+       }

        
         wxNode *node = m_tools.First();
        while (node)
         {
            wxToolBarTool *tool = (wxToolBarTool*)node->Data();
        
         wxNode *node = m_tools.First();
        while (node)
         {
            wxToolBarTool *tool = (wxToolBarTool*)node->Data();

-           if (!tool->m_item->window)
-           {
-               /* windows not yet realized. come back later. */
-                m_currentGdkCursor = oldGdkCursor;
-               break;
-           }
-           else
-           {
-               gdk_window_set_cursor( tool->m_item->window, m_currentGdkCursor.GetCursor() );
-           }

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

+           
+           if (!tool->m_item || !tool->m_item->window)
+               continue;
+           else
+               gdk_window_set_cursor( tool->m_item->window, cursor.GetCursor() );

         }
     }
 
         }
     }