[gtk] fixed bug that caused segfaults in wxYield when wxToolBar has non-button control (m_item was no defined, rather then being set to NULL)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4826 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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 );
|
gtk_toolbar_append_widget( m_toolbar, control->m_widget, (const char *) NULL, (const char *) NULL );
|
||||||
|
|
||||||
GtkRequisition req;
|
GtkRequisition req;
|
||||||
|
@@ -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 );
|
gtk_toolbar_append_widget( m_toolbar, control->m_widget, (const char *) NULL, (const char *) NULL );
|
||||||
|
|
||||||
GtkRequisition req;
|
GtkRequisition req;
|
||||||
|
Reference in New Issue
Block a user