docstring patch has been submitted to SF

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

diff --git a/src/mac/pen.cpp b/src/mac/pen.cpp
index 2502b392fb674055cd560cb4061ea3757a91bb11..fea55ab34eb7394f3f30661355ad70238b4056af 100644 (file)
--- a/src/mac/pen.cpp
+++ b/src/mac/pen.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        pen.cpp
 // Purpose:     wxPen
 /////////////////////////////////////////////////////////////////////////////
 // Name:        pen.cpp
 // Purpose:     wxPen

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -17,7 +17,9 @@
 #include "wx/utils.h"
 #include "wx/pen.h"
 
 #include "wx/utils.h"
 #include "wx/pen.h"
 

+#if !USE_SHARED_LIBRARIES

 IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)

+#endif

 
 wxPenRefData::wxPenRefData()
 {
 
 wxPenRefData::wxPenRefData()
 {


@@ -27,12 +29,10 @@ wxPenRefData::wxPenRefData()
     m_cap = wxCAP_ROUND ;
     m_nbDash = 0 ;
     m_dash = 0 ;
     m_cap = wxCAP_ROUND ;
     m_nbDash = 0 ;
     m_dash = 0 ;

-/* TODO: null data
-    m_hPen = 0;
-*/

 }
 
 wxPenRefData::wxPenRefData(const wxPenRefData& data)
 }
 
 wxPenRefData::wxPenRefData(const wxPenRefData& data)

+: wxGDIRefData()

 {
     m_style = data.m_style;
     m_width = data.m_width;
 {
     m_style = data.m_style;
     m_width = data.m_width;


@@ -41,35 +41,27 @@ wxPenRefData::wxPenRefData(const wxPenRefData& data)
     m_nbDash = data.m_nbDash;
     m_dash = data.m_dash;
     m_colour = data.m_colour;
     m_nbDash = data.m_nbDash;
     m_dash = data.m_dash;
     m_colour = data.m_colour;

-/* TODO: null data
-    m_hPen = 0;
-*/

 }
 
 wxPenRefData::~wxPenRefData()
 {
 }
 
 wxPenRefData::~wxPenRefData()
 {

-    // TODO: delete data

 }
 
 // Pens
 
 wxPen::wxPen()
 {
 }
 
 // Pens
 
 wxPen::wxPen()
 {

-    if ( wxThePenList )
-        wxThePenList->AddPen(this);

 }
 
 wxPen::~wxPen()
 {
 }
 
 wxPen::~wxPen()
 {

-    if (wxThePenList)
-        wxThePenList->RemovePen(this);

 }
 
 // Should implement Create
 wxPen::wxPen(const wxColour& col, int Width, int Style)
 {
     m_refData = new wxPenRefData;
 }
 
 // Should implement Create
 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;


@@ -77,17 +69,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();
     RealizeResource();

-
-    if ( wxThePenList )
-        wxThePenList->AddPen(this);

 }
 
 wxPen::wxPen(const wxBitmap& stipple, int Width)
 {
     m_refData = new wxPenRefData;
 }
 
 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;


@@ -95,106 +84,103 @@ 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();

-
-    if ( wxThePenList )
-        wxThePenList->AddPen(this);

 }
 
 void wxPen::Unshare()
 {
 }
 
 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
     {
     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)
 {
     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()
 {
     RealizeResource();
 }
 
 bool wxPen::RealizeResource()
 {

-    // TODO: create actual pen
-    return FALSE;
+    // nothing to do here for mac
+    return TRUE;

 }
 
 
 }