From 2b1ff57f1ee08eb970520de784816c4115bd84f0 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Sat, 3 Apr 2004 03:21:54 +0000
Subject: [PATCH] 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
---
 src/gtk/choice.cpp    | 2 +-
 src/gtk/combobox.cpp  | 2 +-
 src/gtk1/choice.cpp   | 2 +-
 src/gtk1/combobox.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index 6eef00f624..97eb8e1203 100644
--- 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 e619060405..43ed08ba4a 100644
--- 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 6eef00f624..97eb8e1203 100644
--- 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 e619060405..43ed08ba4a 100644
--- 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;
         }
-- 
2.45.2