m_font may not have been set yet. Default to letting GetTextExtent

call GetFont.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index 6eef00f62464aaa8624cee8ed764329769eeadde..97eb8e120328d6edf4420f2c40eb70f1774fd69e 100644 (file)
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -542,7 +542,7 @@ wxSize wxChoice::DoGetBestSize() const
         size_t count = GetCount();
         for ( size_t n = 0; n < count; n++ )
         {
-            GetTextExtent( GetString(n), &width, NULL, NULL, NULL, &m_font );
+            GetTextExtent( GetString(n), &width, NULL, NULL, NULL );
             if ( width > ret.x )
                 ret.x = width;
         }

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index e6190604055dc272d8640b39b321693118940be1..43ed08ba4abbc08b5575ca19b6cec007496ad632 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -779,7 +779,7 @@ wxSize wxComboBox::DoGetBestSize() const
         size_t count = GetCount();
         for ( size_t n = 0; n < count; n++ )
         {
-            GetTextExtent( GetString(n), &width, NULL, NULL, NULL, &m_font );
+            GetTextExtent( GetString(n), &width, NULL, NULL, NULL );
             if ( width > ret.x )
                 ret.x = width;
         }

diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp
index 6eef00f62464aaa8624cee8ed764329769eeadde..97eb8e120328d6edf4420f2c40eb70f1774fd69e 100644 (file)
--- a/src/gtk1/choice.cpp
+++ b/src/gtk1/choice.cpp
@@ -542,7 +542,7 @@ wxSize wxChoice::DoGetBestSize() const
         size_t count = GetCount();
         for ( size_t n = 0; n < count; n++ )
         {
-            GetTextExtent( GetString(n), &width, NULL, NULL, NULL, &m_font );
+            GetTextExtent( GetString(n), &width, NULL, NULL, NULL );
             if ( width > ret.x )
                 ret.x = width;
         }

diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index e6190604055dc272d8640b39b321693118940be1..43ed08ba4abbc08b5575ca19b6cec007496ad632 100644 (file)
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/combobox.cpp
@@ -779,7 +779,7 @@ wxSize wxComboBox::DoGetBestSize() const
         size_t count = GetCount();
         for ( size_t n = 0; n < count; n++ )
         {
-            GetTextExtent( GetString(n), &width, NULL, NULL, NULL, &m_font );
+            GetTextExtent( GetString(n), &width, NULL, NULL, NULL );
             if ( width > ret.x )
                 ret.x = width;
         }