wxASSERT_MSG instead of wxASSERT

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

diff --git a/src/mac/carbon/renderer.cpp b/src/mac/carbon/renderer.cpp
index fbe365ab67c8e54ec066afbad4fc03fec47d1032..8555ef47e3ba0a8d7a8ef3e622acc1f103a6e7e9 100644 (file)
--- a/src/mac/carbon/renderer.cpp
+++ b/src/mac/carbon/renderer.cpp
@@ -134,8 +134,8 @@ wxRendererMac::DrawHeaderButton(wxWindow *win,
 {
     const int CORNER = 1;
 
 {
     const int CORNER = 1;
 

-    const wxCoord x = rect.x,
-                  y = rect.y,
+    const wxCoord x = rect.x-1,
+                  y = rect.y-1,

                   w = rect.width,
                   h = rect.height;
 
                   w = rect.width,
                   h = rect.height;
 


@@ -244,11 +244,40 @@ wxRendererMac::DrawSplitterSash(wxWindow *win,
     //     a brushed metal one as they look quite differently... this is
     //     completely bogus anyhow, of course (TODO)
 
     //     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);
     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[] = 
+    {
+        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

 }
 
 }