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

corrected wxComboBox::GetBestSize()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-01-06 15:58:48 +00:00
parent 6f2a55e34a
commit a6fc8ae3c2
2 changed files with 42 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gtk/combobox.cpp
View File

@@ -668,7 +668,27 @@ bool wxComboBox::IsOwnGtkWindow( GdkWindow *window )
wxSize wxComboBox::DoGetBestSize() const wxSize wxComboBox::DoGetBestSize() const
{ {
wxSize ret( wxControl::DoGetBestSize() ); wxSize ret( wxControl::DoGetBestSize() );
if (ret.x < 100) ret.x = 100;
// we know better our horizontal extent: it depends on the longest string
// in the combobox
ret.x = 0;
if ( m_widget )
{
GdkFont *font = m_font.GetInternalFont();
wxCoord width;
size_t count = Number();
for ( size_t n = 0; n < count; n++ )
{
width = (wxCoord)gdk_string_width(font, GetString(n).mbc_str());
if ( width > ret.x )
ret.x = width;
}
}
// empty combobox should have some reasonable default size too
if ( ret.x < 100 )
ret.x = 100;
return ret; return ret;
} }

22
src/gtk1/combobox.cpp
View File

@@ -668,7 +668,27 @@ bool wxComboBox::IsOwnGtkWindow( GdkWindow *window )
wxSize wxComboBox::DoGetBestSize() const wxSize wxComboBox::DoGetBestSize() const
{ {
wxSize ret( wxControl::DoGetBestSize() ); wxSize ret( wxControl::DoGetBestSize() );
if (ret.x < 100) ret.x = 100;
// we know better our horizontal extent: it depends on the longest string
// in the combobox
ret.x = 0;
if ( m_widget )
{
GdkFont *font = m_font.GetInternalFont();
wxCoord width;
size_t count = Number();
for ( size_t n = 0; n < count; n++ )
{
width = (wxCoord)gdk_string_width(font, GetString(n).mbc_str());
if ( width > ret.x )
ret.x = width;
}
}
// empty combobox should have some reasonable default size too
if ( ret.x < 100 )
ret.x = 100;
return ret; return ret;
} }