From: Julian Smart <julian@anthemion.co.uk>
Date: Tue, 13 Feb 2001 15:51:11 +0000 (+0000)
Subject: Further __WXGTK20__ fix
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/90fae67de990b712f49cf7f9033e20c0d3024c37

Further __WXGTK20__ fix


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

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 925fa24ba7..3b9379fb3e 100644
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -1334,7 +1334,7 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
 
     wxCHECK_RET( font, wxT("invalid font") );
 
-#ifdef __WXGTK20__
+#if defined(__WXGTK20__)
     wxCHECK_RET( m_context, wxT("no Pango context") );
 #endif
 
@@ -1378,7 +1378,7 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
         gdk_draw_line( m_window, m_textGC, x, ul_y, x + width, ul_y);
     }
 
-#ifdef __WXGTK20__
+#if defined(__WXGTK20__) && wxUSE_WCHAR_T
     g_object_unref( G_OBJECT( layout ) );
 #endif
 
diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index 925fa24ba7..3b9379fb3e 100644
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -1334,7 +1334,7 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
 
     wxCHECK_RET( font, wxT("invalid font") );
 
-#ifdef __WXGTK20__
+#if defined(__WXGTK20__)
     wxCHECK_RET( m_context, wxT("no Pango context") );
 #endif
 
@@ -1378,7 +1378,7 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
         gdk_draw_line( m_window, m_textGC, x, ul_y, x + width, ul_y);
     }
 
-#ifdef __WXGTK20__
+#if defined(__WXGTK20__) && wxUSE_WCHAR_T
     g_object_unref( G_OBJECT( layout ) );
 #endif