Lots of Pango etc up-ports from HEAD.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2003-02-11 11:35:15 +00:00
parent 7cc3aa347b
commit adb5f43a58
22 changed files with 447 additions and 266 deletions

View File

@@ -750,13 +750,11 @@ wxSize wxComboBox::DoGetBestSize() const
ret.x = 0;
if ( m_widget )
{
GdkFont *font = m_font.GetInternalFont();
wxCoord width;
size_t count = Number();
int width;
size_t count = GetCount();
for ( size_t n = 0; n < count; n++ )
{
width = (wxCoord)gdk_string_width(font, wxGTK_CONV( GetString(n) ) );
GetTextExtent( GetString(n), &width, NULL, NULL, NULL, &m_font );
if ( width > ret.x )
ret.x = width;
}