X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..42c5812dbf723b1cd075fbc6d8cef1dd17df717b:/src/gtk1/pen.cpp

diff --git a/src/gtk1/pen.cpp b/src/gtk1/pen.cpp
index 663f7ad3db..f897cb2d95 100644
--- a/src/gtk1/pen.cpp
+++ b/src/gtk1/pen.cpp
@@ -24,6 +24,7 @@ class wxPenRefData: public wxObjectRefData
   public:
   
     wxPenRefData(void);
+    wxPenRefData(const wxPenRefData& data);
   
     int        m_width;
     int        m_style;
@@ -38,7 +39,16 @@ wxPenRefData::wxPenRefData(void)
   m_style = wxSOLID;
   m_joinStyle = wxJOIN_ROUND;
   m_capStyle = wxCAP_ROUND;
-};
+}
+
+wxPenRefData::wxPenRefData( const wxPenRefData& data )
+{
+  m_style = data.m_style;
+  m_width = data.m_width;
+  m_joinStyle = data.m_joinStyle;
+  m_capStyle = data.m_capStyle;
+  m_colour = data.m_colour;
+}
 
 //-----------------------------------------------------------------------------
 
@@ -49,7 +59,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject)
 wxPen::wxPen(void)
 {
   if (wxThePenList) wxThePenList->AddPen( this );
-};
+}
 
 wxPen::wxPen( const wxColour &colour, int width, int style )
 {
@@ -57,148 +67,153 @@ wxPen::wxPen( const wxColour &colour, int width, int style )
   M_PENDATA->m_width = width;
   M_PENDATA->m_style = style;
   M_PENDATA->m_colour = colour;
+  
   if (wxThePenList) wxThePenList->AddPen( this );
-};
-
-wxPen::wxPen( const wxString &colourName, int width, int style )
-{
-  m_refData = new wxPenRefData();
-  M_PENDATA->m_width = width;
-  M_PENDATA->m_style = style;
-  M_PENDATA->m_colour = colourName;
-  if (wxThePenList) wxThePenList->AddPen( this );
-};
+}
 
 wxPen::wxPen( const wxPen& pen )
 {
   Ref( pen );
   if (wxThePenList) wxThePenList->AddPen( this );
-};
+}
 
 wxPen::wxPen( const wxPen* pen )
 {
   UnRef();
   if (pen) Ref( *pen ); 
+  
   if (wxThePenList) wxThePenList->AddPen( this );
-};
+}
 
 wxPen::~wxPen(void)
 {
   if (wxThePenList) wxThePenList->RemovePen( this );
-};
+}
 
 wxPen& wxPen::operator = ( const wxPen& pen )
 {
   if (*this == pen) return (*this); 
   Ref( pen ); 
   return *this; 
-};
+}
 
 bool wxPen::operator == ( const wxPen& pen )
 {
   return m_refData == pen.m_refData; 
-};
+}
 
 bool wxPen::operator != ( const wxPen& pen )
 {
   return m_refData != pen.m_refData; 
-};
+}
 
 void wxPen::SetColour( const wxColour &colour )
 {
-  if (!m_refData)
-    m_refData = new wxPenRefData();
-
+  Unshare();
   M_PENDATA->m_colour = colour;
-};
-
-void wxPen::SetColour( const wxString &colourName )
-{
-  if (!m_refData)
-    m_refData = new wxPenRefData();
-
-  M_PENDATA->m_colour = colourName;
-};
+}
 
-void wxPen::SetColour( const int red, const int green, const int blue )
+void wxPen::SetColour( int red, int green, int blue )
 {
-  if (!m_refData)
-    m_refData = new wxPenRefData();
-
+  Unshare();
   M_PENDATA->m_colour.Set( red, green, blue );
-};
+}
 
 void wxPen::SetCap( int capStyle )
 {
-  if (!m_refData)
-    m_refData = new wxPenRefData();
-
+  Unshare();
   M_PENDATA->m_capStyle = capStyle;
-};
+}
 
 void wxPen::SetJoin( int joinStyle )
 {
-  if (!m_refData)
-    m_refData = new wxPenRefData();
-
+  Unshare();
   M_PENDATA->m_joinStyle = joinStyle;
-};
+}
 
 void wxPen::SetStyle( int style )
 {
-  if (!m_refData)
-    m_refData = new wxPenRefData();
-
+  Unshare();
   M_PENDATA->m_style = style;
-};
+}
 
 void wxPen::SetWidth( int width )
 {
-  if (!m_refData)
-    m_refData = new wxPenRefData();
-
+  Unshare();
   M_PENDATA->m_width = width;
-};
+}
 
 int wxPen::GetCap(void) const
 {
+  if (!m_refData)
+  {
+    wxFAIL_MSG( "invalid pen" );
+    return -1;
+  }
+  
   return M_PENDATA->m_capStyle;
-};
+}
 
 int wxPen::GetJoin(void) const
 {
   if (!m_refData)
-    return 0;
-  else
-    return M_PENDATA->m_joinStyle;
-};
+  {
+    wxFAIL_MSG( "invalid pen" );
+    return -1;
+  }
+  
+  return M_PENDATA->m_joinStyle;
+}
 
 int wxPen::GetStyle(void) const
 {
   if (!m_refData)
-    return 0;
-  else
-    return M_PENDATA->m_style;
-};
+  {
+    wxFAIL_MSG( "invalid pen" );
+    return -1;
+  }
+  
+  return M_PENDATA->m_style;
+}
 
 int wxPen::GetWidth(void) const
 {
   if (!m_refData)
-    return 0;
-  else
-    return M_PENDATA->m_width;
-};
+  {
+    wxFAIL_MSG( "invalid pen" );
+    return -1;
+  }
+  
+  return M_PENDATA->m_width;
+}
 
 wxColour &wxPen::GetColour(void) const
 {
   if (!m_refData)
+  {
+    wxFAIL_MSG( "invalid pen" );
     return wxNullColour;
-  else
-    return M_PENDATA->m_colour;
-};
+  }
+  
+  return M_PENDATA->m_colour;
+}
 
 bool wxPen::Ok(void) const
 {
-  return (m_refData);
-};
+  return (m_refData != NULL);
+}
+
+void wxPen::Unshare(void)
+{
+  if (!m_refData)
+  {
+    m_refData = new wxPenRefData();
+  }
+  else
+  {
+    wxPenRefData* ref = new wxPenRefData( *(wxPenRefData*)m_refData );
+    UnRef();
+    m_refData = ref;
+  }
+}