Applied [ 1059554 ] patch for [1028659] fixes a couple of bugs with menus

[wxWidgets.git] / src / mac / carbon / renderer.cpp

diff --git a/src/mac/carbon/renderer.cpp b/src/mac/carbon/renderer.cpp
index 8555ef47e3ba0a8d7a8ef3e622acc1f103a6e7e9..571c40c75d65abb040d775d119baba3de2ff1dde 100644 (file)
--- a/src/mac/carbon/renderer.cpp
+++ b/src/mac/carbon/renderer.cpp
@@ -6,7 +6,7 @@
 // Created:     20.07.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// License:     wxWindows license
+// License:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -32,6 +32,9 @@
 #endif //WX_PRECOMP
 
 #include "wx/renderer.h"
+#include "wx/toplevel.h"
+#include "wx/dcclient.h"
+#include "wx/mac/uma.h"
 
 // ----------------------------------------------------------------------------
 // wxRendererMac: our wxRendererNative implementation
@@ -240,44 +243,88 @@ wxRendererMac::DrawSplitterSash(wxWindow *win,
                                 wxOrientation orient,
                                 int WXUNUSED(flags))
 {
-    // VZ: we have to somehow determine if we're drawing a normal sash or
-    //     a brushed metal one as they look quite differently... this is
-    //     completely bogus anyhow, of course (TODO)
-
-#if 0
-    dc.SetPen(*wxLIGHT_GREY_PEN);
-    dc.SetBrush(*wxWHITE_BRUSH);
-    if ( orient == wxVERTICAL )
-        dc.DrawRectangle(position, 0, 7, size.y);
-    else
-        dc.DrawRectangle(0, position, size.x, 7);
-#else
-    // Do the gradient fill:
-    static int grayValues[] = 
+#if ( TARGET_API_MAC_OSX == 1 ) && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 )
+    if ( UMAGetSystemVersion() >= 0x1030 )
     {
-        0xA0, 0xF6, 0xED, 0xE4, 0xE2, 0xD0, 0xA0
-    };
-    dc.SetBrush( *wxTRANSPARENT_BRUSH );
-    if ( orient == wxVERTICAL )
-    {
-        int i;
-        for (i=0; i < (int)WXSIZEOF(grayValues); i++) 
+        bool hasMetal = win->MacGetTopLevelWindow()->MacGetMetalAppearance() ;
+        SInt32 height ;
+        GetThemeMetric( kThemeMetricSmallPaneSplitterHeight , &height ) ;
+        HIRect splitterRect ;
+        if ( orient == wxVERTICAL )
+            splitterRect = CGRectMake( position , 0 , height, size.y);
+        else
+            splitterRect = CGRectMake( 0 , position , size.x , height );
+        HIViewConvertRect( &splitterRect , (HIViewRef) win->GetHandle() , (HIViewRef) win->MacGetTopLevelWindow()->GetHandle() ) ;
+
+        // under compositing we should only draw when called by the OS, otherwise just issue a redraw command
+        // strange redraw errors occur if we don't do this
+
+        if ( dc.IsKindOf( CLASSINFO( wxPaintDC ) ) == false )
         {
-            dc.SetPen( wxPen( wxColour( grayValues[i] , grayValues[i] , grayValues[i] ),
-                            1 , wxSOLID ) );
-            dc.DrawRectangle( position+i, 0, 1, size.y );
+            Rect r = { (short) splitterRect.origin.y , (short) splitterRect.origin.x , 
+                (short) (splitterRect.origin.y + splitterRect.size.height) , (short) (splitterRect.origin.x + splitterRect.size.width) } ;
+            RgnHandle updateRgn = NewRgn() ;
+            RectRgn( updateRgn , &r ) ;
+            HIViewSetNeedsDisplayInRegion( (HIViewRef) win->GetHandle() , updateRgn , true ) ;
+            DisposeRgn( updateRgn ) ;
+        }
+        else
+        {
+            CGContextRef cgContext ;
+            Rect bounds ;
+            GetPortBounds( (CGrafPtr) dc.m_macPort , &bounds ) ;
+            QDBeginCGContext( (CGrafPtr) dc.m_macPort , &cgContext ) ;
+            CGContextTranslateCTM( cgContext , 0 , bounds.bottom - bounds.top ) ;
+            CGContextScaleCTM( cgContext , 1 , -1 ) ;
+
+            {
+                HIThemeSplitterDrawInfo drawInfo ;
+                drawInfo.version = 0 ;
+                drawInfo.state = kThemeStateActive ;
+                drawInfo.adornment = hasMetal ? kHIThemeSplitterAdornmentMetal : kHIThemeSplitterAdornmentNone ;
+                HIThemeDrawPaneSplitter( &splitterRect , &drawInfo , cgContext , kHIThemeOrientationNormal ) ;    
+            }
+            QDEndCGContext( (CGrafPtr) dc.m_macPort , &cgContext ) ;
         }
     }
     else
+#endif
     {
-        int i;
-        for (i=0; i < (int)WXSIZEOF(grayValues); i++) 
+#if 0
+        dc.SetPen(*wxLIGHT_GREY_PEN);
+        dc.SetBrush(*wxWHITE_BRUSH);
+        if ( orient == wxVERTICAL )
+            dc.DrawRectangle(position, 0, 7, size.y);
+        else
+            dc.DrawRectangle(0, position, size.x, 7);
+#else
+        // Do the gradient fill:
+        static int grayValues[] = 
         {
-            dc.SetPen( wxPen( wxColour( grayValues[i] , grayValues[i] , grayValues[i] ),
-                            1 , wxSOLID ) );
-            dc.DrawRectangle( 0, position+i, size.x, 1 );
+            0xA0, 0xF6, 0xED, 0xE4, 0xE2, 0xD0, 0xA0
+        };
+        dc.SetBrush( *wxTRANSPARENT_BRUSH );
+        if ( orient == wxVERTICAL )
+        {
+            int i;
+            for (i=0; i < (int)WXSIZEOF(grayValues); i++) 
+            {
+                dc.SetPen( wxPen( wxColour( grayValues[i] , grayValues[i] , grayValues[i] ),
+                                1 , wxSOLID ) );
+                dc.DrawRectangle( position+i, 0, 1, size.y );
+            }
+        }
+        else
+        {
+            int i;
+            for (i=0; i < (int)WXSIZEOF(grayValues); i++) 
+            {
+                dc.SetPen( wxPen( wxColour( grayValues[i] , grayValues[i] , grayValues[i] ),
+                                1 , wxSOLID ) );
+                dc.DrawRectangle( 0, position+i, size.x, 1 );
+            }
         }
-    }
 #endif
+    }
 }