slowly approaching dcscreen...

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

diff --git a/src/mac/carbon/renderer.cpp b/src/mac/carbon/renderer.cpp
index e93325ca69144a9e827a5f3e2cfdc8d51e8aaa48..c1cf97a2e4c200b490affe641f1a53852851b2dd 100644 (file)
--- a/src/mac/carbon/renderer.cpp
+++ b/src/mac/carbon/renderer.cpp
@@ -32,6 +32,8 @@
 #endif //WX_PRECOMP
 
 #include "wx/renderer.h"
+#include "wx/toplevel.h"
+#include "wx/dcclient.h"
 #include "wx/mac/uma.h"
 
 // ----------------------------------------------------------------------------
@@ -259,8 +261,8 @@ wxRendererMac::DrawSplitterSash(wxWindow *win,
 
         if ( dc.IsKindOf( CLASSINFO( wxPaintDC ) ) == false )
         {
-            Rect r = { splitterRect.origin.y , splitterRect.origin.x , 
-                splitterRect.origin.y + splitterRect.size.height , splitterRect.origin.x + splitterRect.size.width } ;
+            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 ) ;
@@ -268,6 +270,8 @@ wxRendererMac::DrawSplitterSash(wxWindow *win,
         }
         else
         {
+#if wxMAC_USE_CORE_GRAPHICS
+#else
             CGContextRef cgContext ;
             Rect bounds ;
             GetPortBounds( (CGrafPtr) dc.m_macPort , &bounds ) ;
@@ -283,6 +287,7 @@ wxRendererMac::DrawSplitterSash(wxWindow *win,
                 HIThemeDrawPaneSplitter( &splitterRect , &drawInfo , cgContext , kHIThemeOrientationNormal ) ;    
             }
             QDEndCGContext( (CGrafPtr) dc.m_macPort , &cgContext ) ;
+#endif
         }
     }
     else