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

diff --git a/include/wx/graphics.h b/include/wx/graphics.h
index aba3af1aa40d8b09d608414e3b497cec3c6c915c..a00468f6ca4baccbacbb64d57e8da8eb2f353419 100644 (file)
--- 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 699842431cea4f1ee1a0b29829c23cda224e5760..6afb4468a4f2eb71ca2886cf9ff12ae06d7765f6 100644 (file)
--- 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