X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/223d09f6b523aac674ef9b72a883dfa8d37c5d4e..c91a2f7e67fae4278e2f931209aa386b5d67ae9d:/src/gtk/pen.cpp

diff --git a/src/gtk/pen.cpp b/src/gtk/pen.cpp
index f928f2fe54..176463b69d 100644
--- a/src/gtk/pen.cpp
+++ b/src/gtk/pen.cpp
@@ -13,8 +13,9 @@
 #endif
 
 #include "wx/pen.h"
+#include "wx/colour.h"
 
-#include "gdk/gdk.h"
+#include <gdk/gdk.h>
 
 //-----------------------------------------------------------------------------
 // wxPen
@@ -23,43 +24,54 @@
 class wxPenRefData: public wxObjectRefData
 {
 public:
-
-  wxPenRefData();
-  wxPenRefData( const wxPenRefData& data );
-
-  int        m_width;
-  int        m_style;
-  int        m_joinStyle;
-  int        m_capStyle;
-  wxColour   m_colour;
-  int        m_countDashes;
-  wxDash    *m_dash;
-};
-
-wxPenRefData::wxPenRefData()
-{
-    m_width = 1;
-    m_style = wxSOLID;
-    m_joinStyle = wxJOIN_ROUND;
-    m_capStyle = wxCAP_ROUND;
-    m_dash = (wxDash*) NULL;
-    m_countDashes = 0;
-}
-
-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;
-    m_countDashes = data.m_countDashes;
+    wxPenRefData()
+    {
+        m_width = 1;
+        m_style = wxSOLID;
+        m_joinStyle = wxJOIN_ROUND;
+        m_capStyle = wxCAP_ROUND;
+        m_dash = (wxGTKDash*) NULL;
+        m_countDashes = 0;
+    }
+    
+    wxPenRefData( const wxPenRefData& data )
+        : wxObjectRefData()
+    {
+        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;
+        m_countDashes = data.m_countDashes;
 /*
-    if (data.m_dash)  TODO
-      m_dash = new 
+        if (data.m_dash)  TODO
+            m_dash = new
 */
-    m_dash = data.m_dash;
-}
+        m_dash = data.m_dash;
+    }
+
+    bool operator == (const wxPenRefData& data) const
+    {
+        // It is impossible to tell if the dashes have changed
+        // so the only thing to do is assume they have
+        if (m_countDashes != 0 || data.m_countDashes != 0)
+            return false;
+
+        return (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);
+    }
+            
+    int        m_width;
+    int        m_style;
+    int        m_joinStyle;
+    int        m_capStyle;
+    wxColour   m_colour;
+    int        m_countDashes;
+    wxGTKDash *m_dash;
+};
 
 //-----------------------------------------------------------------------------
 
@@ -67,106 +79,102 @@ wxPenRefData::wxPenRefData( const wxPenRefData& data )
 
 IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject)
 
-wxPen::wxPen()
-{
-    if (wxThePenList) wxThePenList->AddPen( this );
-}
-
 wxPen::wxPen( const wxColour &colour, int width, int style )
 {
     m_refData = new wxPenRefData();
     M_PENDATA->m_width = width;
     M_PENDATA->m_style = style;
     M_PENDATA->m_colour = colour;
-
-    if (wxThePenList) wxThePenList->AddPen( this );
-}
-
-wxPen::wxPen( const wxPen& pen )
-{
-    Ref( pen );
-    if (wxThePenList) wxThePenList->AddPen( this );
 }
 
 wxPen::~wxPen()
 {
-    if (wxThePenList) wxThePenList->RemovePen( this );
+    // m_refData unrefed in ~wxObject
 }
 
-wxPen& wxPen::operator = ( const wxPen& pen )
+wxObjectRefData *wxPen::CreateRefData() const
 {
-    if (*this == pen) return (*this);
-    Ref( pen );
-    return *this;
+    return new wxPenRefData;
 }
 
-bool wxPen::operator == ( const wxPen& pen )
+wxObjectRefData *wxPen::CloneRefData(const wxObjectRefData *data) const
 {
-    return m_refData == pen.m_refData;
+    return new wxPenRefData(*(wxPenRefData *)data);
 }
 
-bool wxPen::operator != ( const wxPen& pen )
+bool wxPen::operator == ( const wxPen& pen ) const
 {
-    return m_refData != pen.m_refData;
+    if (m_refData == pen.m_refData) return TRUE;
+    
+    if (!m_refData || !pen.m_refData) return FALSE;
+    
+    return ( *(wxPenRefData*)m_refData == *(wxPenRefData*)pen.m_refData );
 }
 
 void wxPen::SetColour( const wxColour &colour )
 {
-    Unshare();
+    AllocExclusive();
+    
     M_PENDATA->m_colour = colour;
 }
 
 void wxPen::SetDashes( int number_of_dashes, const wxDash *dash )
 {
-    Unshare();
+    AllocExclusive();
+    
     M_PENDATA->m_countDashes = number_of_dashes;
-    M_PENDATA->m_dash = (wxDash *)dash; /* TODO */
+    M_PENDATA->m_dash = (wxGTKDash *)dash; /* TODO */
 }
 
 void wxPen::SetColour( int red, int green, int blue )
 {
-    Unshare();
+    AllocExclusive();
+    
     M_PENDATA->m_colour.Set( red, green, blue );
 }
 
 void wxPen::SetCap( int capStyle )
 {
-    Unshare();
+    AllocExclusive();
+    
     M_PENDATA->m_capStyle = capStyle;
 }
 
 void wxPen::SetJoin( int joinStyle )
 {
-    Unshare();
+    AllocExclusive();
+    
     M_PENDATA->m_joinStyle = joinStyle;
 }
 
 void wxPen::SetStyle( int style )
 {
-    Unshare();
+    AllocExclusive();
+    
     M_PENDATA->m_style = style;
 }
 
 void wxPen::SetWidth( int width )
 {
-    Unshare();
+    AllocExclusive();
+    
     M_PENDATA->m_width = width;
 }
 
-int wxPen::GetDashes( wxDash **ptr ) const 
+int wxPen::GetDashes( wxDash **ptr ) const
 {
-     *ptr = (M_PENDATA ? M_PENDATA->m_dash : (wxDash*) NULL); 
+     *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL);
      return (M_PENDATA ? M_PENDATA->m_countDashes : 0);
 }
 
-int wxPen::GetDashCount() const 
-{ 
-    return (M_PENDATA->m_countDashes); 
+int wxPen::GetDashCount() const
+{
+    return (M_PENDATA->m_countDashes);
 }
 
-wxDash* wxPen::GetDash() const 
-{ 
-    return (M_PENDATA->m_dash); 
+wxDash* wxPen::GetDash() const
+{
+    return (wxDash*)M_PENDATA->m_dash;
 }
 
 int wxPen::GetCap() const
@@ -204,22 +212,3 @@ wxColour &wxPen::GetColour() const
     return M_PENDATA->m_colour;
 }
 
-bool wxPen::Ok() const
-{
-    return (m_refData != NULL);
-}
-
-void wxPen::Unshare()
-{
-    if (!m_refData)
-    {
-        m_refData = new wxPenRefData();
-    }
-    else
-    {
-        wxPenRefData* ref = new wxPenRefData( *(wxPenRefData*)m_refData );
-        UnRef();
-        m_refData = ref;
-    }
-}
-