X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1175aa4e13bc3cf9ae9c5cf9458bc0cfd23796ce..ec52467188b876c4f21f2528d99730827a27b76e:/src/x11/dcclient.cpp

diff --git a/src/x11/dcclient.cpp b/src/x11/dcclient.cpp
index 37b47a4dbf..8f16fa74e3 100644
--- a/src/x11/dcclient.cpp
+++ b/src/x11/dcclient.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "dcclient.h"
-#endif
-
 #include "wx/dcclient.h"
 #include "wx/dcmemory.h"
 #include "wx/window.h"
@@ -1670,13 +1666,11 @@ wxCoord wxWindowDC::GetCharWidth() const
 #if wxUSE_UNICODE
     PangoLayout *layout = pango_layout_new( m_context );
 
-    if (!m_fontdesc)
-    {
-        char *crash = NULL;
-        *crash = 0;
-    }
-
-    pango_layout_set_font_description(layout, m_fontdesc);
+    if (m_fontdesc)
+	pango_layout_set_font_description(layout, m_fontdesc);
+    else
+	pango_layout_set_font_description(layout, this->GetFont().GetNativeFontInfo()->description);
+	
     pango_layout_set_text(layout, "H", 1 );
     int w,h;
     pango_layout_get_pixel_size(layout, &w, &h);
@@ -1706,14 +1700,11 @@ wxCoord wxWindowDC::GetCharHeight() const
 #if wxUSE_UNICODE
     PangoLayout *layout = pango_layout_new( m_context );
 
-    if (!m_fontdesc)
-    {
-        char *crash = NULL;
-        *crash = 0;
-    }
-
-    pango_layout_set_font_description(layout, m_fontdesc);
-
+    if (m_fontdesc)
+	pango_layout_set_font_description(layout, m_fontdesc);
+    else
+	pango_layout_set_font_description(layout, this->GetFont().GetNativeFontInfo()->description);
+	
     pango_layout_set_text(layout, "H", 1 );
     int w,h;
     pango_layout_get_pixel_size(layout, &w, &h);
@@ -1772,14 +1763,10 @@ void wxWindowDC::SetFont( const wxFont &font )
 
     m_font = font;
     
+    return;
+    
 #if wxUSE_UNICODE
-    if (m_font.Ok())
-    {
-        if (m_fontdesc)
-            pango_font_description_free( m_fontdesc );
-
-        m_fontdesc = pango_font_description_copy( m_font.GetNativeFontInfo()->description );
-    }
+    m_fontdesc = font.GetNativeFontInfo()->description;
 #endif
 }