Use GetFont not m_font for GetCharHeight

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

diff --git a/src/cocoa/pen.mm b/src/cocoa/pen.mm
index 5446e50d4c7c6cb37a7f770aaa823f3227dc42c5..fcad9b39f2331145bea8723628eb23339f2ea6a7 100644 (file)
--- 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"
 
@@ -129,6 +131,7 @@ 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::FreeCocoaNSColor()
@@ -320,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
@@ -350,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()
@@ -366,4 +369,3 @@ int wxPen::GetCocoaLineDash(const float **pattern)
         *pattern = NULL;
     return 0;
 }
-