making sure it is only breaking at newlines for measuring

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

diff --git a/src/mac/carbon/pen.cpp b/src/mac/carbon/pen.cpp
index e2f0df1545eb3ca2af8de4a3b5c410a7da425642..7f0acfebe5349bf668a4bd69535537e51519fc6c 100644 (file)
--- a/src/mac/carbon/pen.cpp
+++ b/src/mac/carbon/pen.cpp
@@ -1,19 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        pen.cpp
+// Name:        src/mac/carbon/pen.cpp

 // Purpose:     wxPen
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     wxPen
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 

-#include "wx/utils.h"

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

+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif
+

 IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
 
 wxPenRefData::wxPenRefData()
 IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
 
 wxPenRefData::wxPenRefData()


@@ -56,7 +59,7 @@ wxPen::~wxPen()
 wxPen::wxPen(const wxColour& col, int Width, int Style)
 {
     m_refData = new wxPenRefData;
 wxPen::wxPen(const wxColour& col, int Width, int Style)
 {
     m_refData = new wxPenRefData;

-    
+

     M_PENDATA->m_colour = col;
     M_PENDATA->m_width = Width;
     M_PENDATA->m_style = Style;
     M_PENDATA->m_colour = col;
     M_PENDATA->m_width = Width;
     M_PENDATA->m_style = Style;


@@ -64,14 +67,14 @@ wxPen::wxPen(const wxColour& col, int Width, int Style)
     M_PENDATA->m_cap = wxCAP_ROUND ;
     M_PENDATA->m_nbDash = 0 ;
     M_PENDATA->m_dash = 0 ;
     M_PENDATA->m_cap = wxCAP_ROUND ;
     M_PENDATA->m_nbDash = 0 ;
     M_PENDATA->m_dash = 0 ;

-    
+

     RealizeResource();
 }
 
 wxPen::wxPen(const wxBitmap& stipple, int Width)
 {
     m_refData = new wxPenRefData;
     RealizeResource();
 }
 
 wxPen::wxPen(const wxBitmap& stipple, int Width)
 {
     m_refData = new wxPenRefData;

-    
+

     M_PENDATA->m_stipple = stipple;
     M_PENDATA->m_width = Width;
     M_PENDATA->m_style = wxSTIPPLE;
     M_PENDATA->m_stipple = stipple;
     M_PENDATA->m_width = Width;
     M_PENDATA->m_style = wxSTIPPLE;


@@ -79,7 +82,7 @@ wxPen::wxPen(const wxBitmap& stipple, int Width)
     M_PENDATA->m_cap = wxCAP_ROUND ;
     M_PENDATA->m_nbDash = 0 ;
     M_PENDATA->m_dash = 0 ;
     M_PENDATA->m_cap = wxCAP_ROUND ;
     M_PENDATA->m_nbDash = 0 ;
     M_PENDATA->m_dash = 0 ;

-    
+

     RealizeResource();
 }
 
     RealizeResource();
 }
 


@@ -101,81 +104,79 @@ void wxPen::Unshare()
 void wxPen::SetColour(const wxColour& col)
 {
     Unshare();
 void wxPen::SetColour(const wxColour& col)
 {
     Unshare();

-    
+

     M_PENDATA->m_colour = col;
     M_PENDATA->m_colour = col;

-    
+

     RealizeResource();
 }
 
 void wxPen::SetColour(unsigned char r, unsigned char g, unsigned char b)
 {
     Unshare();
     RealizeResource();
 }
 
 void wxPen::SetColour(unsigned char r, unsigned char g, unsigned char b)
 {
     Unshare();

-    
+

     M_PENDATA->m_colour.Set(r, g, b);
     M_PENDATA->m_colour.Set(r, g, b);

-    
+

     RealizeResource();
 }
 
 void wxPen::SetWidth(int Width)
 {
     Unshare();
     RealizeResource();
 }
 
 void wxPen::SetWidth(int Width)
 {
     Unshare();

-    
+

     M_PENDATA->m_width = Width;
     M_PENDATA->m_width = Width;

-    
+

     RealizeResource();
 }
 
 void wxPen::SetStyle(int Style)
 {
     Unshare();
     RealizeResource();
 }
 
 void wxPen::SetStyle(int Style)
 {
     Unshare();

-    
+

     M_PENDATA->m_style = Style;
     M_PENDATA->m_style = Style;

-    
+

     RealizeResource();
 }
 
 void wxPen::SetStipple(const wxBitmap& Stipple)
 {
     Unshare();
     RealizeResource();
 }
 
 void wxPen::SetStipple(const wxBitmap& Stipple)
 {
     Unshare();

-    
+

     M_PENDATA->m_stipple = Stipple;
     M_PENDATA->m_style = wxSTIPPLE;
     M_PENDATA->m_stipple = Stipple;
     M_PENDATA->m_style = wxSTIPPLE;

-    
+

     RealizeResource();
 }
 
 void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
 {
     Unshare();
     RealizeResource();
 }
 
 void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
 {
     Unshare();

-    
+

     M_PENDATA->m_nbDash = nb_dashes;
     M_PENDATA->m_dash = (wxDash *)Dash;
     M_PENDATA->m_nbDash = nb_dashes;
     M_PENDATA->m_dash = (wxDash *)Dash;

-    
+

     RealizeResource();
 }
 
 void wxPen::SetJoin(int Join)
 {
     Unshare();
     RealizeResource();
 }
 
 void wxPen::SetJoin(int Join)
 {
     Unshare();

-    
+

     M_PENDATA->m_join = Join;
     M_PENDATA->m_join = Join;

-    
+

     RealizeResource();
 }
 
 void wxPen::SetCap(int Cap)
 {
     Unshare();
     RealizeResource();
 }
 
 void wxPen::SetCap(int Cap)
 {
     Unshare();

-    
+

     M_PENDATA->m_cap = Cap;
     M_PENDATA->m_cap = Cap;

-    
+

     RealizeResource();
 }
 
 bool wxPen::RealizeResource()
 {
     // nothing to do here for mac
     RealizeResource();
 }
 
 bool wxPen::RealizeResource()
 {
     // nothing to do here for mac

-    return TRUE;
+    return true;

 }
 }

-
-