copy item text for app menu items from wx menus

[wxWidgets.git] / src / osx / carbon / graphics.cpp

diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp
index f82d40c8bc65fb62f934bc7bcbd26116ef9271a9..c5d4b5b90005336fc755cfabcd5cc36c16b47e36 100644 (file)
--- a/src/osx/carbon/graphics.cpp
+++ b/src/osx/carbon/graphics.cpp
@@ -798,9 +798,9 @@ void wxMacCoreGraphicsBrushData::CalculateShadingValues (void *info, const CGFlo
     {
         // Start
         out[0] = stops.comps[0].red;
-        out[1] = stops.comps[1].green;
-        out[2] = stops.comps[2].blue;
-        out[3] = stops.comps[3].alpha;
+        out[1] = stops.comps[0].green;
+        out[2] = stops.comps[0].blue;
+        out[3] = stops.comps[0].alpha;
     }
     else if (f >= 1.0)
     {
@@ -1240,7 +1240,7 @@ public :
     virtual void Transform( const wxGraphicsMatrixData* matrix );
 
     // gets the bounding box enclosing all points (possibly including control points)
-    virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *y) const;
+    virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const;
 
     virtual bool Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle = wxODDEVEN_RULE) const;
 private :
@@ -1545,7 +1545,7 @@ public :
             m_userOffset = CGContextConvertSizeToUserSpace( m_cg, CGSizeMake( 0.5 , 0.5 ) );
             CGContextTranslateCTM( m_cg, m_userOffset.width , m_userOffset.height );
         }
-        else 
+        else
         {
             m_userOffset = CGSizeMake(0.0, 0.0);
         }