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

Avoid deprecated GtkAlignment with GTK3

Browse Source
This commit is contained in:
Paul Cornett
2017-11-25 10:54:32 -08:00
parent cf02d15646
commit ee0b07fc31
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gtk/toolbar.cpp
View File

@@ -242,11 +242,17 @@ arrow_button_press_event(GtkToggleButton* button, GdkEventButton* event, wxToolB
void wxToolBar::AddChildGTK(wxWindowGTK* child) void wxToolBar::AddChildGTK(wxWindowGTK* child)
{ {
GtkToolItem* item = gtk_tool_item_new();
#ifdef __WXGTK3__
gtk_widget_set_valign(child->m_widget, GTK_ALIGN_CENTER);
gtk_widget_set_halign(child->m_widget, GTK_ALIGN_CENTER);
gtk_container_add(GTK_CONTAINER(item), child->m_widget);
#else
GtkWidget* align = gtk_alignment_new(0.5, 0.5, 0, 0); GtkWidget* align = gtk_alignment_new(0.5, 0.5, 0, 0);
gtk_widget_show(align); gtk_widget_show(align);
gtk_container_add(GTK_CONTAINER(align), child->m_widget); gtk_container_add(GTK_CONTAINER(align), child->m_widget);
GtkToolItem* item = gtk_tool_item_new();
gtk_container_add(GTK_CONTAINER(item), align); gtk_container_add(GTK_CONTAINER(item), align);
#endif
// position will be corrected in DoInsertTool if necessary // position will be corrected in DoInsertTool if necessary
gtk_toolbar_insert(GTK_TOOLBAR(gtk_bin_get_child(GTK_BIN(m_widget))), item, -1); gtk_toolbar_insert(GTK_TOOLBAR(gtk_bin_get_child(GTK_BIN(m_widget))), item, -1);
} }
@@ -625,7 +631,11 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
wxWindow* control = tool->GetControl(); wxWindow* control = tool->GetControl();
if (gtk_widget_get_parent(control->m_widget) == NULL) if (gtk_widget_get_parent(control->m_widget) == NULL)
AddChildGTK(control); AddChildGTK(control);
#ifdef __WXGTK3__
tool->m_item = GTK_TOOL_ITEM(gtk_widget_get_parent(control->m_widget));
#else
tool->m_item = GTK_TOOL_ITEM(gtk_widget_get_parent(gtk_widget_get_parent(control->m_widget))); tool->m_item = GTK_TOOL_ITEM(gtk_widget_get_parent(gtk_widget_get_parent(control->m_widget)));
#endif
if (gtk_toolbar_get_item_index(m_toolbar, tool->m_item) != int(pos)) if (gtk_toolbar_get_item_index(m_toolbar, tool->m_item) != int(pos))
{ {
g_object_ref(tool->m_item); g_object_ref(tool->m_item);