[gtk] fixed bug that caused segfaults in wxYield when wxToolBar has non-button contr...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4826 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index 970873c7e291747307b2b1b155a26a8781143c7d..1e0f1d9f5f76bd2528dc135e1ce31db87269cfc3 100644 (file)
--- a/src/gtk/tbargtk.cpp
+++ b/src/gtk/tbargtk.cpp
@@ -354,6 +354,7 @@ bool wxToolBar::AddControl(wxControl *control)
     
     wxToolBarTool *tool = new wxToolBarTool(control);
     
     
     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_toolbar_append_widget( m_toolbar, control->m_widget, (const char *) NULL, (const char *) NULL );
     
     GtkRequisition req;

diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp
index 970873c7e291747307b2b1b155a26a8781143c7d..1e0f1d9f5f76bd2528dc135e1ce31db87269cfc3 100644 (file)
--- a/src/gtk1/tbargtk.cpp
+++ b/src/gtk1/tbargtk.cpp
@@ -354,6 +354,7 @@ bool wxToolBar::AddControl(wxControl *control)
     
     wxToolBarTool *tool = new wxToolBarTool(control);
     
     
     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_toolbar_append_widget( m_toolbar, control->m_widget, (const char *) NULL, (const char *) NULL );
     
     GtkRequisition req;