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

Moved allocate size correction code from combobox

Browse Source 
to toolbar code since that is where the problem
    is and it affects other controls, too.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2006-12-12 21:43:55 +00:00
parent 0cdd04ad99
commit 86b6546709
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/gtk/combobox.cpp
View File

@@ -201,29 +201,6 @@ gtkcombobox_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
}
}
extern "C" {
static
void gtkcombobox_size_callback( GtkWidget *widget,
GtkAllocation *alloc,
wxWindow *win )
{
if (win->GetParent()->m_wxwindow) return;
// we are probably a wxToolBar
wxSize size = win->GetEffectiveMinSize();
if (size.y != alloc->height)
{
GtkAllocation alloc2;
alloc2.x = alloc->x;
alloc2.y = (alloc->height - size.y + 3) / 2;
alloc2.width = alloc->width;
alloc2.height = size.y;
gtk_widget_size_allocate( widget, &alloc2 );
}
}
}
#endif
//-----------------------------------------------------------------------------
@@ -373,9 +350,6 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
g_signal_connect_after (m_widget, "changed",
G_CALLBACK (gtkcombobox_changed_callback), this);
// Connect to in order to correct size_allocate events
g_signal_connect_after (m_widget, "size_allocate",
G_CALLBACK (gtkcombobox_size_callback), this);
}
else
#endif

26
src/gtk/tbargtk.cpp
View File

@@ -215,6 +215,27 @@ static gint gtk_toolbar_tool_callback( GtkWidget *WXUNUSED(widget),
}
}
extern "C" {
static
void gtktoolwidget_size_callback( GtkWidget *widget,
GtkAllocation *alloc,
wxWindow *win )
{
// this shouldn't happen...
if (win->GetParent()->m_wxwindow) return;
wxSize size = win->GetEffectiveMinSize();
if (size.y != alloc->height)
{
GtkAllocation alloc2;
alloc2.x = alloc->x;
alloc2.y = (alloc->height - size.y + 3) / 2;
alloc2.width = alloc->width;
alloc2.height = size.y;
gtk_widget_size_allocate( widget, &alloc2 );
}
}
}
//-----------------------------------------------------------------------------
// InsertChild callback for wxToolBar
//-----------------------------------------------------------------------------
@@ -453,6 +474,11 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
(const char *) NULL,
posGtk
);
// connect after in order to correct size_allocate events
g_signal_connect_after (tool->GetControl()->m_widget, "size_allocate",
G_CALLBACK (gtktoolwidget_size_callback), tool->GetControl());
break;
}