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:
@@ -90,12 +90,7 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
|
||||
|
||||
m_widget = gtk_option_menu_new();
|
||||
|
||||
wxSize newSize(size);
|
||||
if (newSize.x == -1)
|
||||
newSize.x = 80;
|
||||
if (newSize.y == -1)
|
||||
newSize.y = 26;
|
||||
SetSize( newSize.x, newSize.y );
|
||||
SetSizeOrDefault( size );
|
||||
|
||||
if ( style & wxCB_SORT )
|
||||
{
|
||||
@@ -429,4 +424,9 @@ size_t wxChoice::AppendHelper(GtkWidget *menu, const wxString& item)
|
||||
return index;
|
||||
}
|
||||
|
||||
wxSize wxChoice::DoGetBestSize() const
|
||||
{
|
||||
return wxSize(80, 26);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user