From 02fd8b9b6186623ed61019ac7e69ed9a4ef16773 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Fri, 16 Jan 2009 15:31:55 +0000 Subject: [PATCH] fixing infinite recursion for rotated text, introduced in cleanup r57915 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/graphics.h | 2 +- src/osx/carbon/graphics.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wx/graphics.h b/include/wx/graphics.h index aba3af1aa4..a00468f6ca 100644 --- a/include/wx/graphics.h +++ b/include/wx/graphics.h @@ -498,7 +498,7 @@ protected: wxGraphicsFont m_font; wxRasterOperationMode m_logicalFunction; -private: +protected: // implementations of overloaded public functions: we use different names // for them to avoid the virtual function hiding problems in the derived // classes diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp index 699842431c..6afb4468a4 100644 --- a/src/osx/carbon/graphics.cpp +++ b/src/osx/carbon/graphics.cpp @@ -2010,7 +2010,7 @@ void wxMacCoreGraphicsContext::DoDrawRotatedText(const wxString &str, if ( UMAGetSystemVersion() >= 0x1050 ) { // default implementation takes care of rotation and calls non rotated DrawText afterwards - wxGraphicsContext::DrawText( str, x, y, angle ); + wxGraphicsContext::DoDrawRotatedText( str, x, y, angle ); return; } #endif -- 2.50.0