don't call release() on non-owned buffer in wchar_t build (closes #10964); copy utf8_...

[wxWidgets.git] / src / gtk1 / window.cpp

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 87a178d91e1d2fb938d90bcc85e072b286e2dedf..48d7db19273dad2e5e8660ef7e29cdc70316e92f 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -239,7 +239,7 @@ extern bool g_mainThreadLocked;
 #if wxUSE_THREADS
 #   define DEBUG_MAIN_THREAD \
         wxASSERT_MSG( !g_mainThreadLocked || !wxThread::IsMain(), \
-                      "GUI reentrancy detected" )
+                      "GUI reentrancy detected" );
 #else
 #   define DEBUG_MAIN_THREAD
 #endif
@@ -3240,12 +3240,12 @@ int wxWindowGTK::GetCharWidth() const
     return gdk_string_width( gfont, "g" );
 }
 
-void wxWindowGTK::GetTextExtent( const wxString& string,
-                                 int *x,
-                                 int *y,
-                                 int *descent,
-                                 int *externalLeading,
-                                 const wxFont *theFont ) const
+void wxWindowGTK::DoGetTextExtent(const wxString& string,
+                                  int *x,
+                                  int *y,
+                                  int *descent,
+                                  int *externalLeading,
+                                  const wxFont *theFont) const
 {
     wxFont fontToUse = theFont ? *theFont : GetFont();