X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b6a582bef796b43ad4cf0a96bd40bfd631460c6..f9cff6e17341ea95da89eaa27f78b32f11291e12:/src/gtk1/window.cpp diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index 87a178d91e..48d7db1927 100644 --- 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();