non-pch build fix for wxUSE_DISPLAY==0

[wxWidgets.git] / src / cocoa / pen.mm

diff --git a/src/cocoa/pen.mm b/src/cocoa/pen.mm
index b82e879cad28019684cfebc352d857b8ce593bf3..b5e6e36065644ff2db5c46c1d90954d61211d0cf 100644 (file)
--- a/src/cocoa/pen.mm
+++ b/src/cocoa/pen.mm
@@ -10,11 +10,12 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+

 #ifndef WX_PRECOMP
     #include "wx/pen.h"
 #ifndef WX_PRECOMP
     #include "wx/pen.h"

+    #include "wx/bitmap.h"
+    #include "wx/colour.h"

 #endif //WX_PRECOMP
 #endif //WX_PRECOMP

-#include "wx/bitmap.h"
-#include "wx/colour.h"

 
 #import <AppKit/NSColor.h>
 
 
 #import <AppKit/NSColor.h>
 


@@ -23,7 +24,6 @@
 // ========================================================================
 class WXDLLEXPORT wxPenRefData: public wxGDIRefData
 {
 // ========================================================================
 class WXDLLEXPORT wxPenRefData: public wxGDIRefData
 {

-    friend class WXDLLEXPORT wxPen;

 public:
     wxPenRefData(const wxColour& colour = wxNullColour,
         int width = 1, int style = wxSOLID,
 public:
     wxPenRefData(const wxColour& colour = wxNullColour,
         int width = 1, int style = wxSOLID,


@@ -53,7 +53,7 @@ public:
         m_style = wxSTIPPLE;
     }
     WX_NSColor GetNSColor();
         m_style = wxSTIPPLE;
     }
     WX_NSColor GetNSColor();

-    int GetCocoaLineDash(const float **pattern);
+    int GetCocoaLineDash(const CGFloat **pattern);

 protected:
     void FreeCocoaNSColor();
     void FreeCocoaDash();
 protected:
     void FreeCocoaNSColor();
     void FreeCocoaDash();


@@ -67,36 +67,39 @@ protected:
     wxDash         *m_dash;
     wxBitmap        m_stipple;
     WX_NSColor      m_cocoaNSColor;
     wxDash         *m_dash;
     wxBitmap        m_stipple;
     WX_NSColor      m_cocoaNSColor;

-    float          *m_cocoaDash;
+    CGFloat        *m_cocoaDash;

 
     // Predefined dash patterns
     static const int scm_countDot;
 
     // Predefined dash patterns
     static const int scm_countDot;

-    static const float scm_patternDot[];
+    static const CGFloat scm_patternDot[];

     static const int scm_countLongDash;
     static const int scm_countLongDash;

-    static const float scm_patternLongDash[];
+    static const CGFloat scm_patternLongDash[];

     static const int scm_countShortDash;
     static const int scm_countShortDash;

-    static const float scm_patternShortDash[];
+    static const CGFloat scm_patternShortDash[];

     static const int scm_countDotDash;
     static const int scm_countDotDash;

-    static const float scm_patternDotDash[];
+    static const CGFloat scm_patternDotDash[];
+
+    friend class WXDLLIMPEXP_FWD_CORE wxPen;
+

 private:
     // Don't allow assignment
     wxPenRefData& operator=(const wxPenRefData& data);
 };
 
 const int wxPenRefData::scm_countDot = 1;
 private:
     // Don't allow assignment
     wxPenRefData& operator=(const wxPenRefData& data);
 };
 
 const int wxPenRefData::scm_countDot = 1;

-const float wxPenRefData::scm_patternDot[] = {
+const CGFloat wxPenRefData::scm_patternDot[] = {

     1.0
 };
 const int wxPenRefData::scm_countLongDash = 1;
     1.0
 };
 const int wxPenRefData::scm_countLongDash = 1;

-const float wxPenRefData::scm_patternLongDash[] = {
+const CGFloat wxPenRefData::scm_patternLongDash[] = {

     10.0
 };
 const int wxPenRefData::scm_countShortDash = 1;
     10.0
 };
 const int wxPenRefData::scm_countShortDash = 1;

-const float wxPenRefData::scm_patternShortDash[] = {
+const CGFloat wxPenRefData::scm_patternShortDash[] = {

     5.0
 };
 const int wxPenRefData::scm_countDotDash = 4;
     5.0
 };
 const int wxPenRefData::scm_countDotDash = 4;

-const float wxPenRefData::scm_patternDotDash[] = {
+const CGFloat wxPenRefData::scm_patternDotDash[] = {

     1.0
 ,   1.0
 ,   5.0
     1.0
 ,   1.0
 ,   5.0


@@ -184,7 +187,7 @@ inline WX_NSColor wxPenRefData::GetNSColor()
     return m_cocoaNSColor;
 }
 
     return m_cocoaNSColor;
 }
 

-int wxPenRefData::GetCocoaLineDash(const float **pattern)
+int wxPenRefData::GetCocoaLineDash(const CGFloat **pattern)

 {
     int count;
     switch( m_style )
 {
     int count;
     switch( m_style )


@@ -215,7 +218,7 @@ int wxPenRefData::GetCocoaLineDash(const float **pattern)
         {
             if(!m_cocoaDash)
             {
         {
             if(!m_cocoaDash)
             {

-                m_cocoaDash = new float[count];
+                m_cocoaDash = new CGFloat[count];

                 for(int i=0; i<count; i++)
                     m_cocoaDash[i] = m_dash[i];
             }
                 for(int i=0; i<count; i++)
                     m_cocoaDash[i] = m_dash[i];
             }


@@ -303,7 +306,7 @@ void wxPen::SetColour(const wxColour& col)
     M_PENDATA->SetColour(col);
 }
 
     M_PENDATA->SetColour(col);
 }
 

-void wxPen::SetColour(const unsigned char r, const unsigned char g, const unsigned char b)
+void wxPen::SetColour(unsigned char r, unsigned char g, unsigned char b)

 {
     AllocExclusive();
     M_PENDATA->SetColour(wxColour(r, g, b));
 {
     AllocExclusive();
     M_PENDATA->SetColour(wxColour(r, g, b));


@@ -361,7 +364,7 @@ WX_NSColor wxPen::GetNSColor()
     return (M_PENDATA ? M_PENDATA->GetNSColor() : nil);
 }
 
     return (M_PENDATA ? M_PENDATA->GetNSColor() : nil);
 }
 

-int wxPen::GetCocoaLineDash(const float **pattern)
+int wxPen::GetCocoaLineDash(const CGFloat **pattern)

 {
     if(M_PENDATA)
         return M_PENDATA->GetCocoaLineDash(pattern);
 {
     if(M_PENDATA)
         return M_PENDATA->GetCocoaLineDash(pattern);