Removed usage of GetInternalFont.

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

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index c9e3cceac2b568532a13cfae7e7692ce6cc88aa7..485f3fbdfb67497cae39bdc6eedc97d7dcc3b483 100644 (file)
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -448,14 +448,11 @@ wxSize wxChoice::DoGetBestSize() const
     ret.x = 0;
     if ( m_widget )
     {
     ret.x = 0;
     if ( m_widget )
     {

-        GdkFont *font = m_font.GetInternalFont();
-
-        wxCoord width;
+        int width;

         size_t count = GetCount();
         for ( size_t n = 0; n < count; n++ )
         {
         size_t count = GetCount();
         for ( size_t n = 0; n < count; n++ )
         {

-            // FIXME GTK 2.0
-            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;
         }
             if ( width > ret.x )
                 ret.x = width;
         }

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index ee0cc2e8d5a590cf991002118210fa931b96e72c..8ed30aed1068ab60622e86846e0d2926130659c2 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -750,13 +750,11 @@ wxSize wxComboBox::DoGetBestSize() const
     ret.x = 0;
     if ( m_widget )
     {
     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++ )
         {
         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;
         }
             if ( width > ret.x )
                 ret.x = width;
         }

diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp
index c9e3cceac2b568532a13cfae7e7692ce6cc88aa7..485f3fbdfb67497cae39bdc6eedc97d7dcc3b483 100644 (file)
--- a/src/gtk1/choice.cpp
+++ b/src/gtk1/choice.cpp
@@ -448,14 +448,11 @@ wxSize wxChoice::DoGetBestSize() const
     ret.x = 0;
     if ( m_widget )
     {
     ret.x = 0;
     if ( m_widget )
     {

-        GdkFont *font = m_font.GetInternalFont();
-
-        wxCoord width;
+        int width;

         size_t count = GetCount();
         for ( size_t n = 0; n < count; n++ )
         {
         size_t count = GetCount();
         for ( size_t n = 0; n < count; n++ )
         {

-            // FIXME GTK 2.0
-            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;
         }
             if ( width > ret.x )
                 ret.x = width;
         }

diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index ee0cc2e8d5a590cf991002118210fa931b96e72c..8ed30aed1068ab60622e86846e0d2926130659c2 100644 (file)
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/combobox.cpp
@@ -750,13 +750,11 @@ wxSize wxComboBox::DoGetBestSize() const
     ret.x = 0;
     if ( m_widget )
     {
     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++ )
         {
         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;
         }
             if ( width > ret.x )
                 ret.x = width;
         }