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

Patch to make wxComboBox work in Toolbars.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2001-11-13 15:18:06 +00:00
parent 17271c793e
commit 4494ad58e8
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk/combobox.cpp
View File

@@ -178,8 +178,14 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
if (new_size.y > size_best.y) if (new_size.y > size_best.y)
new_size.y = size_best.y; new_size.y = size_best.y;
if ((new_size.x != size.x) || (new_size.y != size.y)) if ((new_size.x != size.x) || (new_size.y != size.y))
{
SetSize( new_size.x, new_size.y ); SetSize( new_size.x, new_size.y );
// This is required for tool bar support
gtk_widget_set_usize( m_widget, new_size.x, new_size.y );
}
SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) ); SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) );
SetForegroundColour( parent->GetForegroundColour() ); SetForegroundColour( parent->GetForegroundColour() );

6
src/gtk1/combobox.cpp
View File

@@ -178,8 +178,14 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
if (new_size.y > size_best.y) if (new_size.y > size_best.y)
new_size.y = size_best.y; new_size.y = size_best.y;
if ((new_size.x != size.x) || (new_size.y != size.y)) if ((new_size.x != size.x) || (new_size.y != size.y))
{
SetSize( new_size.x, new_size.y ); SetSize( new_size.x, new_size.y );
// This is required for tool bar support
gtk_widget_set_usize( m_widget, new_size.x, new_size.y );
}
SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) ); SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) );
SetForegroundColour( parent->GetForegroundColour() ); SetForegroundColour( parent->GetForegroundColour() );