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

implemented GetBestSize() for wxChoice

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-11-23 19:43:02 +00:00
parent 01d981ec6d
commit 29f54b9b37
2 changed files with 50 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/gtk/choice.cpp
View File

@@ -407,7 +407,31 @@ size_t wxChoice::GtkAppendHelper(GtkWidget *menu, const wxString& item)
wxSize wxChoice::DoGetBestSize() const wxSize wxChoice::DoGetBestSize() const
{ {
wxSize ret( wxControl::DoGetBestSize() ); wxSize ret( wxControl::DoGetBestSize() );
if (ret.x < 80) ret.x = 80;
// we know better our horizontal extent: it depends on the longest string
// we have
ret.x = 0;
if ( m_widget )
{
GdkFont *font = m_font.GetInternalFont();
wxCoord width;
size_t count = GetCount();
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;
}
// for the choice "=" button
ret.x += 20;
}
// but not less than the minimal width
if ( ret.x < 80 )
ret.x = 80;
ret.y = 16 + gdk_char_height( m_widget->style->font, 'H' ); ret.y = 16 + gdk_char_height( m_widget->style->font, 'H' );
return ret; return ret;
} }

26
src/gtk1/choice.cpp
View File

@@ -407,7 +407,31 @@ size_t wxChoice::GtkAppendHelper(GtkWidget *menu, const wxString& item)
wxSize wxChoice::DoGetBestSize() const wxSize wxChoice::DoGetBestSize() const
{ {
wxSize ret( wxControl::DoGetBestSize() ); wxSize ret( wxControl::DoGetBestSize() );
if (ret.x < 80) ret.x = 80;
// we know better our horizontal extent: it depends on the longest string
// we have
ret.x = 0;
if ( m_widget )
{
GdkFont *font = m_font.GetInternalFont();
wxCoord width;
size_t count = GetCount();
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;
}
// for the choice "=" button
ret.x += 20;
}
// but not less than the minimal width
if ( ret.x < 80 )
ret.x = 80;
ret.y = 16 + gdk_char_height( m_widget->style->font, 'H' ); ret.y = 16 + gdk_char_height( m_widget->style->font, 'H' );
return ret; return ret;
} }