Aplied patch [ 816113 ] Inconsistent GetCharWidth over platforms

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

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index cf9d48a9f5ae924b89b8a8495d899b78d5d12d66..04f1e7da3c27f6bdfbd3c433ab9cb9b780ced8a3 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -3371,7 +3371,7 @@ int wxWindowGTK::GetCharWidth() const
     PangoFontDescription *desc = m_font.GetNativeFontInfo()->description;
     PangoLayout *layout = pango_layout_new(context);
     pango_layout_set_font_description(layout, desc);
     PangoFontDescription *desc = m_font.GetNativeFontInfo()->description;
     PangoLayout *layout = pango_layout_new(context);
     pango_layout_set_font_description(layout, desc);

-    pango_layout_set_text(layout, "H", 1);
+    pango_layout_set_text(layout, "g", 1);

     PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data;
 
     PangoRectangle rect;
     PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data;
 
     PangoRectangle rect;


@@ -3383,7 +3383,7 @@ int wxWindowGTK::GetCharWidth() const
 #else
     GdkFont *font = m_font.GetInternalFont( 1.0 );
 
 #else
     GdkFont *font = m_font.GetInternalFont( 1.0 );
 

-    return gdk_string_width( font, "H" );
+    return gdk_string_width( font, "g" );

 #endif
 }
 
 #endif
 }
 

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index cf9d48a9f5ae924b89b8a8495d899b78d5d12d66..04f1e7da3c27f6bdfbd3c433ab9cb9b780ced8a3 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -3371,7 +3371,7 @@ int wxWindowGTK::GetCharWidth() const
     PangoFontDescription *desc = m_font.GetNativeFontInfo()->description;
     PangoLayout *layout = pango_layout_new(context);
     pango_layout_set_font_description(layout, desc);
     PangoFontDescription *desc = m_font.GetNativeFontInfo()->description;
     PangoLayout *layout = pango_layout_new(context);
     pango_layout_set_font_description(layout, desc);

-    pango_layout_set_text(layout, "H", 1);
+    pango_layout_set_text(layout, "g", 1);

     PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data;
 
     PangoRectangle rect;
     PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data;
 
     PangoRectangle rect;


@@ -3383,7 +3383,7 @@ int wxWindowGTK::GetCharWidth() const
 #else
     GdkFont *font = m_font.GetInternalFont( 1.0 );
 
 #else
     GdkFont *font = m_font.GetInternalFont( 1.0 );
 

-    return gdk_string_width( font, "H" );
+    return gdk_string_width( font, "g" );

 #endif
 }
 
 #endif
 }
 

diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp
index 126dea09aa7a4b1382c23c84f76c152e0c0a583a..15bf719bd15ef4c5b54a59e243a5a109b74ed8a0 100644 (file)
--- a/src/mac/carbon/dc.cpp
+++ b/src/mac/carbon/dc.cpp
@@ -1679,7 +1679,7 @@ wxCoord   wxDC::GetCharWidth(void) const
     if ( UMAGetSystemVersion() < 0x1000 || ((wxFont*)&m_font)->GetNoAntiAliasing() )
         useGetThemeText = false ;
 #endif
     if ( UMAGetSystemVersion() < 0x1000 || ((wxFont*)&m_font)->GetNoAntiAliasing() )
         useGetThemeText = false ;
 #endif

-    char text[] = "H" ;
+    char text[] = "g" ;

 #if TARGET_CARBON
     if ( useGetThemeText )
     {
 #if TARGET_CARBON
     if ( useGetThemeText )
     {

diff --git a/src/mac/dc.cpp b/src/mac/dc.cpp
index 126dea09aa7a4b1382c23c84f76c152e0c0a583a..15bf719bd15ef4c5b54a59e243a5a109b74ed8a0 100644 (file)
--- a/src/mac/dc.cpp
+++ b/src/mac/dc.cpp
@@ -1679,7 +1679,7 @@ wxCoord   wxDC::GetCharWidth(void) const
     if ( UMAGetSystemVersion() < 0x1000 || ((wxFont*)&m_font)->GetNoAntiAliasing() )
         useGetThemeText = false ;
 #endif
     if ( UMAGetSystemVersion() < 0x1000 || ((wxFont*)&m_font)->GetNoAntiAliasing() )
         useGetThemeText = false ;
 #endif

-    char text[] = "H" ;
+    char text[] = "g" ;

 #if TARGET_CARBON
     if ( useGetThemeText )
     {
 #if TARGET_CARBON
     if ( useGetThemeText )
     {