cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid GtkHandleBox and GtkEventBox with GTK+4

Browse Source
This commit is contained in:
Paul Cornett 2017-12-17 21:52:00 -08:00
parent 3c2f575f8e
commit cefcd83ee6
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gtk/toolbar.cpp
View File

@ -423,6 +423,10 @@ bool wxToolBar::Create( wxWindow *parent,
#endif #endif
GtkSetStyle(); GtkSetStyle();
#ifdef __WXGTK4__
m_widget = m_toolbar;
#else
wxGCC_WARNING_SUPPRESS(deprecated-declarations)
if ((style & wxTB_DOCKABLE) if ((style & wxTB_DOCKABLE)
#ifdef __WXGTK3__ #ifdef __WXGTK3__
// using GtkHandleBox prevents toolbar from drawing with GTK+ >= 3.19.7 // using GtkHandleBox prevents toolbar from drawing with GTK+ >= 3.19.7
@ -445,8 +449,10 @@ bool wxToolBar::Create( wxWindow *parent,
m_widget = gtk_event_box_new(); m_widget = gtk_event_box_new();
ConnectWidget( m_widget ); ConnectWidget( m_widget );
} }
g_object_ref(m_widget);
gtk_container_add(GTK_CONTAINER(m_widget), GTK_WIDGET(m_toolbar)); gtk_container_add(GTK_CONTAINER(m_widget), GTK_WIDGET(m_toolbar));
wxGCC_WARNING_RESTORE()
#endif // !__WXGTK4__
g_object_ref(m_widget);
gtk_widget_show(GTK_WIDGET(m_toolbar)); gtk_widget_show(GTK_WIDGET(m_toolbar));
m_parent->DoAddChild( this ); m_parent->DoAddChild( this );