X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e51701313a307d4dfbbf5493b87aa53537822a5..6493aacaeb7b22b9fa35c559f7753e9fec0da71f:/src/cocoa/pen.mm

diff --git a/src/cocoa/pen.mm b/src/cocoa/pen.mm
index 02fb79cb31..fcad9b39f2 100644
--- a/src/cocoa/pen.mm
+++ b/src/cocoa/pen.mm
@@ -6,11 +6,13 @@
 // Created:     2003/08/02
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
-#include "wx/setup.h"
-#include "wx/pen.h"
+#include "wx/wxprec.h"
+#ifndef WX_PRECOMP
+    #include "wx/pen.h"
+#endif //WX_PRECOMP
 #include "wx/bitmap.h"
 #include "wx/colour.h"
 
@@ -27,27 +29,34 @@ public:
         int width = 1, int style = wxSOLID,
         const wxBitmap& stipple = wxNullBitmap);
     wxPenRefData(const wxPenRefData& data);
-    ~wxPenRefData() { Free(); }
+    ~wxPenRefData() { FreeCocoaNSColor(); FreeCocoaDash(); }
 
     void SetWidth(int Width) { m_width = Width; }
-    void SetStyle(int Style) { m_style = Style; }
+    void SetStyle(int Style)
+    {   FreeCocoaNSColor();
+        FreeCocoaDash();
+        m_style = Style;
+    }
     void SetJoin(int Join) { m_join = Join; }
     void SetCap(int Cap) { m_cap = Cap; }
-    void SetColour(const wxColour& col) { Free(); m_colour = col; }
+    void SetColour(const wxColour& col) { FreeCocoaNSColor(); m_colour = col; }
     void SetDashes(int nb_dashes, const wxDash *Dash)
     {
+        FreeCocoaDash();
         m_nbDash = nb_dashes;
         m_dash = (wxDash *)Dash;
     }
     void SetStipple(const wxBitmap& Stipple)
     {
-        Free();
+        FreeCocoaNSColor();
         m_stipple = Stipple;
         m_style = wxSTIPPLE;
     }
     WX_NSColor GetNSColor();
+    int GetCocoaLineDash(const float **pattern);
 protected:
-    void Free();
+    void FreeCocoaNSColor();
+    void FreeCocoaDash();
 
     int             m_width;
     int             m_style;
@@ -58,11 +67,42 @@ protected:
     wxDash         *m_dash;
     wxBitmap        m_stipple;
     WX_NSColor      m_cocoaNSColor;
+    float          *m_cocoaDash;
+
+    // Predefined dash patterns
+    static const int scm_countDot;
+    static const float scm_patternDot[];
+    static const int scm_countLongDash;
+    static const float scm_patternLongDash[];
+    static const int scm_countShortDash;
+    static const float scm_patternShortDash[];
+    static const int scm_countDotDash;
+    static const float scm_patternDotDash[];
 private:
     // Don't allow assignment
     wxPenRefData& operator=(const wxPenRefData& data);
 };
 
+const int wxPenRefData::scm_countDot = 1;
+const float wxPenRefData::scm_patternDot[] = {
+    1.0
+};
+const int wxPenRefData::scm_countLongDash = 1;
+const float wxPenRefData::scm_patternLongDash[] = {
+    10.0
+};
+const int wxPenRefData::scm_countShortDash = 1;
+const float wxPenRefData::scm_patternShortDash[] = {
+    5.0
+};
+const int wxPenRefData::scm_countDotDash = 4;
+const float wxPenRefData::scm_patternDotDash[] = {
+    1.0
+,   1.0
+,   5.0
+,   1.0
+};
+
 #define M_PENDATA ((wxPenRefData *)m_refData)
 
 inline wxPenRefData::wxPenRefData(const wxColour& colour,
@@ -77,6 +117,7 @@ inline wxPenRefData::wxPenRefData(const wxColour& colour,
     m_dash = 0;
     m_stipple = stipple;
     m_cocoaNSColor = nil;
+    m_cocoaDash = NULL;
 }
 
 inline wxPenRefData::wxPenRefData(const wxPenRefData& data)
@@ -90,14 +131,21 @@ inline wxPenRefData::wxPenRefData(const wxPenRefData& data)
     m_dash = data.m_dash;
     m_stipple = data.m_stipple;
     m_cocoaNSColor = [data.m_cocoaNSColor retain];
+    m_cocoaDash = NULL;
 }
 
-inline void wxPenRefData::Free()
+inline void wxPenRefData::FreeCocoaNSColor()
 {
     [m_cocoaNSColor release];
     m_cocoaNSColor = nil;
 }
 
+inline void wxPenRefData::FreeCocoaDash()
+{
+    delete m_cocoaDash;
+    m_cocoaDash = NULL;
+}
+
 inline WX_NSColor wxPenRefData::GetNSColor()
 {
     if(!m_cocoaNSColor)
@@ -136,6 +184,61 @@ inline WX_NSColor wxPenRefData::GetNSColor()
     return m_cocoaNSColor;
 }
 
+int wxPenRefData::GetCocoaLineDash(const float **pattern)
+{
+    int count;
+    switch( m_style )
+    {
+    case wxDOT:
+        count = scm_countDot;
+        if(pattern)
+            *pattern = scm_patternDot;
+        break;
+    case wxLONG_DASH:
+        count = scm_countLongDash;
+        if(pattern)
+            *pattern = scm_patternLongDash;
+        break;
+    case wxSHORT_DASH:
+        count = scm_countShortDash;
+        if(pattern)
+            *pattern = scm_patternShortDash;
+        break;
+    case wxDOT_DASH:
+        count = scm_countDotDash;
+        if(pattern)
+            *pattern = scm_patternDotDash;
+        break;
+    case wxUSER_DASH:
+        count = m_nbDash;
+        if(pattern)
+        {
+            if(!m_cocoaDash)
+            {
+                m_cocoaDash = new float[count];
+                for(int i=0; i<count; i++)
+                    m_cocoaDash[i] = m_dash[i];
+            }
+            *pattern = m_cocoaDash;
+        }
+        break;
+    case wxTRANSPARENT:
+    case wxSTIPPLE:
+    case wxBDIAGONAL_HATCH:
+    case wxCROSSDIAG_HATCH:
+    case wxFDIAGONAL_HATCH:
+    case wxCROSS_HATCH:
+    case wxHORIZONTAL_HATCH:
+    case wxVERTICAL_HATCH:
+    case wxSOLID:
+    default:
+        count = 0;
+        if(pattern)
+            *pattern = NULL;
+    }
+    return count;
+}
+
 // ========================================================================
 // wxPen
 // ========================================================================
@@ -220,27 +323,27 @@ void wxPen::SetStipple(const wxBitmap& Stipple)
 
 wxColour& wxPen::GetColour() const
 {
-    return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); 
+    return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour);
 }
 
 int wxPen::GetWidth() const
 {
-    return (M_PENDATA ? M_PENDATA->m_width : 0); 
+    return (M_PENDATA ? M_PENDATA->m_width : 0);
 }
 
 int wxPen::GetStyle() const
 {
-    return (M_PENDATA ? M_PENDATA->m_style : 0); 
+    return (M_PENDATA ? M_PENDATA->m_style : 0);
 }
 
 int wxPen::GetJoin() const
 {
-    return (M_PENDATA ? M_PENDATA->m_join : 0); 
+    return (M_PENDATA ? M_PENDATA->m_join : 0);
 }
 
 int wxPen::GetCap() const
 {
-    return (M_PENDATA ? M_PENDATA->m_cap : 0); 
+    return (M_PENDATA ? M_PENDATA->m_cap : 0);
 }
 
 int wxPen::GetDashes(wxDash **ptr) const
@@ -250,7 +353,7 @@ int wxPen::GetDashes(wxDash **ptr) const
 
 wxBitmap *wxPen::GetStipple() const
 {
-    return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); 
+    return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL);
 }
 
 WX_NSColor wxPen::GetNSColor()
@@ -258,3 +361,11 @@ WX_NSColor wxPen::GetNSColor()
     return (M_PENDATA ? M_PENDATA->GetNSColor() : nil);
 }
 
+int wxPen::GetCocoaLineDash(const float **pattern)
+{
+    if(M_PENDATA)
+        return M_PENDATA->GetCocoaLineDash(pattern);
+    if(pattern)
+        *pattern = NULL;
+    return 0;
+}