Dialog unit mods; wxProp tidying

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

diff --git a/src/gtk/pen.cpp b/src/gtk/pen.cpp
index b01208d5e71f8a8634b998f46531bc3e28c5a4b8..a0fd6d563bdcd9a555531816b81531fb0a551e49 100644 (file)
--- a/src/gtk/pen.cpp
+++ b/src/gtk/pen.cpp
@@ -24,6 +24,7 @@ class wxPenRefData: public wxObjectRefData
   public:
   
     wxPenRefData(void);
   public:
   
     wxPenRefData(void);

+    wxPenRefData(const wxPenRefData& data);

   
     int        m_width;
     int        m_style;
   
     int        m_width;
     int        m_style;


@@ -40,6 +41,15 @@ wxPenRefData::wxPenRefData(void)
   m_capStyle = wxCAP_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;
+}
+

 //-----------------------------------------------------------------------------
 
 #define M_PENDATA ((wxPenRefData *)m_refData)
 //-----------------------------------------------------------------------------
 
 #define M_PENDATA ((wxPenRefData *)m_refData)


@@ -57,6 +67,7 @@ wxPen::wxPen( const wxColour &colour, int width, int style )
   M_PENDATA->m_width = width;
   M_PENDATA->m_style = style;
   M_PENDATA->m_colour = colour;
   M_PENDATA->m_width = width;
   M_PENDATA->m_style = style;
   M_PENDATA->m_colour = colour;

+  

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


@@ -66,6 +77,7 @@ wxPen::wxPen( const wxString &colourName, int width, int style )
   M_PENDATA->m_width = width;
   M_PENDATA->m_style = style;
   M_PENDATA->m_colour = colourName;
   M_PENDATA->m_width = width;
   M_PENDATA->m_style = style;
   M_PENDATA->m_colour = colourName;

+  

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


@@ -79,6 +91,7 @@ wxPen::wxPen( const wxPen* pen )
 {
   UnRef();
   if (pen) Ref( *pen ); 
 {
   UnRef();
   if (pen) Ref( *pen ); 

+  

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


@@ -106,99 +119,117 @@ bool wxPen::operator != ( const wxPen& pen )
 
 void wxPen::SetColour( const wxColour &colour )
 {
 
 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 )
 {
   M_PENDATA->m_colour = colour;
 }
 
 void wxPen::SetColour( const wxString &colourName )
 {

-  if (!m_refData)
-    m_refData = new wxPenRefData();
-
+  Unshare();

   M_PENDATA->m_colour = colourName;
 }
 
 void wxPen::SetColour( int red, int green, int blue )
 {
   M_PENDATA->m_colour = colourName;
 }
 
 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 )
 {
   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 )
 {
   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 )
 {
   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 )
 {
   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
 {
   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 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)
 }
 
 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)
 }
 
 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)
 }
 
 wxColour &wxPen::GetColour(void) const
 {
   if (!m_refData)

+  {
+    wxFAIL_MSG( "invalid pen" );

     return wxNullColour;
     return wxNullColour;

-  else
-    return M_PENDATA->m_colour;
+  }
+  
+  return M_PENDATA->m_colour;

 }
 
 bool wxPen::Ok(void) const
 {
 }
 
 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;
+  }

 }
 
 }