X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f1ae4143271ae63a17e052a1a471d16e9cd8c44..1c62bcbeeb1f0f7fafc72544acc7d9caf1d0df1d:/src/mac/carbon/pen.cpp?ds=sidebyside

diff --git a/src/mac/carbon/pen.cpp b/src/mac/carbon/pen.cpp
index 1e3ced2a3a..7f0acfebe5 100644
--- a/src/mac/carbon/pen.cpp
+++ b/src/mac/carbon/pen.cpp
@@ -1,26 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        pen.cpp
+// Name:        src/mac/carbon/pen.cpp
 // Purpose:     wxPen
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "pen.h"
-#endif
+#include "wx/wxprec.h"
 
-#include "wx/setup.h"
-#include "wx/utils.h"
 #include "wx/pen.h"
 
-#if !USE_SHARED_LIBRARIES
-IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
 #endif
 
+IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
+
 wxPenRefData::wxPenRefData()
 {
     m_style = wxSOLID;
@@ -29,12 +27,10 @@ wxPenRefData::wxPenRefData()
     m_cap = wxCAP_ROUND ;
     m_nbDash = 0 ;
     m_dash = 0 ;
-/* TODO: null data
-    m_hPen = 0;
-*/
 }
 
 wxPenRefData::wxPenRefData(const wxPenRefData& data)
+: wxGDIRefData()
 {
     m_style = data.m_style;
     m_width = data.m_width;
@@ -43,28 +39,20 @@ wxPenRefData::wxPenRefData(const wxPenRefData& data)
     m_nbDash = data.m_nbDash;
     m_dash = data.m_dash;
     m_colour = data.m_colour;
-/* TODO: null data
-    m_hPen = 0;
-*/
 }
 
 wxPenRefData::~wxPenRefData()
 {
-    // TODO: delete data
 }
 
 // Pens
 
 wxPen::wxPen()
 {
-    if ( wxThePenList )
-        wxThePenList->AddPen(this);
 }
 
 wxPen::~wxPen()
 {
-    if (wxThePenList)
-        wxThePenList->RemovePen(this);
 }
 
 // Should implement Create
@@ -81,9 +69,6 @@ wxPen::wxPen(const wxColour& col, int Width, int Style)
     M_PENDATA->m_dash = 0 ;
 
     RealizeResource();
-
-    if ( wxThePenList )
-        wxThePenList->AddPen(this);
 }
 
 wxPen::wxPen(const wxBitmap& stipple, int Width)
@@ -99,24 +84,21 @@ wxPen::wxPen(const wxBitmap& stipple, int Width)
     M_PENDATA->m_dash = 0 ;
 
     RealizeResource();
-
-    if ( wxThePenList )
-        wxThePenList->AddPen(this);
 }
 
 void wxPen::Unshare()
 {
-	// Don't change shared data
-	if (!m_refData)
+    // Don't change shared data
+    if (!m_refData)
     {
-		m_refData = new wxPenRefData();
-	}
+        m_refData = new wxPenRefData();
+    }
     else
     {
-		wxPenRefData* ref = new wxPenRefData(*(wxPenRefData*)m_refData);
-		UnRef();
-		m_refData = ref;
-	}
+        wxPenRefData* ref = new wxPenRefData(*(wxPenRefData*)m_refData);
+        UnRef();
+        m_refData = ref;
+    }
 }
 
 void wxPen::SetColour(const wxColour& col)
@@ -124,7 +106,7 @@ void wxPen::SetColour(const wxColour& col)
     Unshare();
 
     M_PENDATA->m_colour = col;
-  
+
     RealizeResource();
 }
 
@@ -133,7 +115,7 @@ void wxPen::SetColour(unsigned char r, unsigned char g, unsigned char b)
     Unshare();
 
     M_PENDATA->m_colour.Set(r, g, b);
-  
+
     RealizeResource();
 }
 
@@ -161,7 +143,7 @@ void wxPen::SetStipple(const wxBitmap& Stipple)
 
     M_PENDATA->m_stipple = Stipple;
     M_PENDATA->m_style = wxSTIPPLE;
-  
+
     RealizeResource();
 }
 
@@ -171,7 +153,7 @@ void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
 
     M_PENDATA->m_nbDash = nb_dashes;
     M_PENDATA->m_dash = (wxDash *)Dash;
-  
+
     RealizeResource();
 }
 
@@ -195,8 +177,6 @@ void wxPen::SetCap(int Cap)
 
 bool wxPen::RealizeResource()
 {
-    // TODO: create actual pen
-    return FALSE;
+    // nothing to do here for mac
+    return true;
 }
-
-