wxWindow::GetBestSize() added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -113,12 +113,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
|
||||
// make it more useable
|
||||
gtk_combo_set_use_arrows_always(GTK_COMBO(m_widget), TRUE);
|
||||
|
||||
wxSize newSize = size;
|
||||
if (newSize.x == -1)
|
||||
newSize.x = 100;
|
||||
if (newSize.y == -1)
|
||||
newSize.y = 26;
|
||||
SetSize( newSize.x, newSize.y );
|
||||
SetSizeOrDefault( size );
|
||||
|
||||
GtkWidget *list = GTK_COMBO(m_widget)->list;
|
||||
|
||||
@@ -660,4 +655,9 @@ bool wxComboBox::IsOwnGtkWindow( GdkWindow *window )
|
||||
(window == GTK_COMBO(m_widget)->button->window ) );
|
||||
}
|
||||
|
||||
wxSize wxComboBox::DoGetBestSize() const
|
||||
{
|
||||
return wxSize(100, 26);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user