Remove my binary compatibility stuff from HEAD. Patch #1367014 used for reference.

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

diff --git a/src/mac/carbon/pen.cpp b/src/mac/carbon/pen.cpp
index 56130732a93b683ce08d6582a883b23bfb1ec8dd..2fb238858ad1a9e74d835a2640dbc2c24b9ecb86 100644 (file)
--- a/src/mac/carbon/pen.cpp
+++ b/src/mac/carbon/pen.cpp
@@ -1,26 +1,20 @@
 /////////////////////////////////////////////////////////////////////////////
-// 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
-// Licence:       wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "pen.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #include "wx/utils.h"
 #include "wx/pen.h"
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
-#endif
 
 wxPenRefData::wxPenRefData()
 {
@@ -62,7 +56,7 @@ wxPen::~wxPen()
 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;
@@ -70,14 +64,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 ;
-    
+
     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;
@@ -85,7 +79,7 @@ wxPen::wxPen(const wxBitmap& stipple, int Width)
     M_PENDATA->m_cap = wxCAP_ROUND ;
     M_PENDATA->m_nbDash = 0 ;
     M_PENDATA->m_dash = 0 ;
-    
+
     RealizeResource();
 }
 
@@ -107,81 +101,79 @@ void wxPen::Unshare()
 void wxPen::SetColour(const wxColour& col)
 {
     Unshare();
-    
+
     M_PENDATA->m_colour = col;
-    
+
     RealizeResource();
 }
 
 void wxPen::SetColour(unsigned char r, unsigned char g, unsigned char b)
 {
     Unshare();
-    
+
     M_PENDATA->m_colour.Set(r, g, b);
-    
+
     RealizeResource();
 }
 
 void wxPen::SetWidth(int Width)
 {
     Unshare();
-    
+
     M_PENDATA->m_width = Width;
-    
+
     RealizeResource();
 }
 
 void wxPen::SetStyle(int Style)
 {
     Unshare();
-    
+
     M_PENDATA->m_style = Style;
-    
+
     RealizeResource();
 }
 
 void wxPen::SetStipple(const wxBitmap& Stipple)
 {
     Unshare();
-    
+
     M_PENDATA->m_stipple = Stipple;
     M_PENDATA->m_style = wxSTIPPLE;
-    
+
     RealizeResource();
 }
 
 void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
 {
     Unshare();
-    
+
     M_PENDATA->m_nbDash = nb_dashes;
     M_PENDATA->m_dash = (wxDash *)Dash;
-    
+
     RealizeResource();
 }
 
 void wxPen::SetJoin(int Join)
 {
     Unshare();
-    
+
     M_PENDATA->m_join = Join;
-    
+
     RealizeResource();
 }
 
 void wxPen::SetCap(int Cap)
 {
     Unshare();
-    
+
     M_PENDATA->m_cap = Cap;
-    
+
     RealizeResource();
 }
 
 bool wxPen::RealizeResource()
 {
     // nothing to do here for mac
-    return TRUE;
+    return true;
 }
-
-