more GTK2+ANSI fixes

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

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 707f88fbc56a7c2f884b22fb5d4815a8e085fb96..9372246ca327a632f023718c2bd15bfe408e1d5e 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -1473,6 +1473,8 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
     const wxCharBuffer data = wxConvUTF8.cWC2MB( text );
 #else
     const wxWCharBuffer wdata = wxConvLocal.cMB2WC( text );
     const wxCharBuffer data = wxConvUTF8.cWC2MB( text );
 #else
     const wxWCharBuffer wdata = wxConvLocal.cMB2WC( text );

+    if ( !wdata )
+        return;

     const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
 #endif
     size_t datalen = strlen((const char*)data);
     const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
 #endif
     size_t datalen = strlen((const char*)data);


@@ -1714,7 +1716,11 @@ void wxWindowDC::DoGetTextExtent(const wxString &string,
 #else
     const wxWCharBuffer wdata = wxConvLocal.cMB2WC( string );
     if ( !wdata )
 #else
     const wxWCharBuffer wdata = wxConvLocal.cMB2WC( string );
     if ( !wdata )

+    {
+        if (width) (*width) = 0;
+        if (height) (*height) = 0;

         return;
         return;

+    }

     const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
     const char *dataUTF8 = (const char *)data;
 #endif
     const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
     const char *dataUTF8 = (const char *)data;
 #endif

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index 707f88fbc56a7c2f884b22fb5d4815a8e085fb96..9372246ca327a632f023718c2bd15bfe408e1d5e 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -1473,6 +1473,8 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
     const wxCharBuffer data = wxConvUTF8.cWC2MB( text );
 #else
     const wxWCharBuffer wdata = wxConvLocal.cMB2WC( text );
     const wxCharBuffer data = wxConvUTF8.cWC2MB( text );
 #else
     const wxWCharBuffer wdata = wxConvLocal.cMB2WC( text );

+    if ( !wdata )
+        return;

     const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
 #endif
     size_t datalen = strlen((const char*)data);
     const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
 #endif
     size_t datalen = strlen((const char*)data);


@@ -1714,7 +1716,11 @@ void wxWindowDC::DoGetTextExtent(const wxString &string,
 #else
     const wxWCharBuffer wdata = wxConvLocal.cMB2WC( string );
     if ( !wdata )
 #else
     const wxWCharBuffer wdata = wxConvLocal.cMB2WC( string );
     if ( !wdata )

+    {
+        if (width) (*width) = 0;
+        if (height) (*height) = 0;

         return;
         return;

+    }

     const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
     const char *dataUTF8 = (const char *)data;
 #endif
     const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
     const char *dataUTF8 = (const char *)data;
 #endif