X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff7b1510ea7f7855091df83d75a44415dc1cba18..458425003481da3dde531a9677014b07070b7095:/src/gtk1/pen.cpp?ds=sidebyside

diff --git a/src/gtk1/pen.cpp b/src/gtk1/pen.cpp
index b01208d5e7..7fb6e0cd0d 100644
--- a/src/gtk1/pen.cpp
+++ b/src/gtk1/pen.cpp
@@ -2,10 +2,9 @@
 // Name:        pen.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:   	wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -14,6 +13,9 @@
 #endif
 
 #include "wx/pen.h"
+#include "wx/colour.h"
+
+#include <gdk/gdk.h>
 
 //-----------------------------------------------------------------------------
 // wxPen
@@ -21,184 +23,200 @@
 
 class wxPenRefData: public wxObjectRefData
 {
-  public:
-  
-    wxPenRefData(void);
-  
+public:
+    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;
+        m_dash = data.m_dash;
+    }
+
+    bool operator == (const wxPenRefData& data) const
+    {
+        if ( m_countDashes != data.m_countDashes )
+            return FALSE;
+
+        if ( m_dash )
+        {
+            if ( !data.m_dash ||
+                 memcmp(m_dash, data.m_dash, m_countDashes*sizeof(wxGTKDash)) )
+            {
+                return FALSE;
+            }
+        }
+        else if ( data.m_dash )
+        {
+            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;
 };
 
-wxPenRefData::wxPenRefData(void)
-{
-  m_width = 1;
-  m_style = wxSOLID;
-  m_joinStyle = wxJOIN_ROUND;
-  m_capStyle = wxCAP_ROUND;
-}
-
 //-----------------------------------------------------------------------------
 
 #define M_PENDATA ((wxPenRefData *)m_refData)
 
 IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject)
 
-wxPen::wxPen(void)
+wxPen::wxPen( const wxColour &colour, int width, int style )
 {
-  if (wxThePenList) wxThePenList->AddPen( this );
+    m_refData = new wxPenRefData();
+    M_PENDATA->m_width = width;
+    M_PENDATA->m_style = style;
+    M_PENDATA->m_colour = colour;
 }
 
-wxPen::wxPen( const wxColour &colour, int width, int style )
+wxPen::~wxPen()
 {
-  m_refData = new wxPenRefData();
-  M_PENDATA->m_width = width;
-  M_PENDATA->m_style = style;
-  M_PENDATA->m_colour = colour;
-  if (wxThePenList) wxThePenList->AddPen( this );
+    // m_refData unrefed in ~wxObject
 }
 
-wxPen::wxPen( const wxString &colourName, int width, int style )
+wxObjectRefData *wxPen::CreateRefData() const
 {
-  m_refData = new wxPenRefData();
-  M_PENDATA->m_width = width;
-  M_PENDATA->m_style = style;
-  M_PENDATA->m_colour = colourName;
-  if (wxThePenList) wxThePenList->AddPen( this );
+    return new wxPenRefData;
 }
 
-wxPen::wxPen( const wxPen& pen )
+wxObjectRefData *wxPen::CloneRefData(const wxObjectRefData *data) const
 {
-  Ref( pen );
-  if (wxThePenList) wxThePenList->AddPen( this );
+    return new wxPenRefData(*(wxPenRefData *)data);
 }
 
-wxPen::wxPen( const wxPen* pen )
+bool wxPen::operator == ( const wxPen& pen ) const
 {
-  UnRef();
-  if (pen) Ref( *pen ); 
-  if (wxThePenList) wxThePenList->AddPen( this );
+    if (m_refData == pen.m_refData) return TRUE;
+    
+    if (!m_refData || !pen.m_refData) return FALSE;
+    
+    return ( *(wxPenRefData*)m_refData == *(wxPenRefData*)pen.m_refData );
 }
 
-wxPen::~wxPen(void)
+void wxPen::SetColour( const wxColour &colour )
 {
-  if (wxThePenList) wxThePenList->RemovePen( this );
+    AllocExclusive();
+    
+    M_PENDATA->m_colour = colour;
 }
 
-wxPen& wxPen::operator = ( const wxPen& pen )
+void wxPen::SetDashes( int number_of_dashes, const wxDash *dash )
 {
-  if (*this == pen) return (*this); 
-  Ref( pen ); 
-  return *this; 
+    AllocExclusive();
+    
+    M_PENDATA->m_countDashes = number_of_dashes;
+    M_PENDATA->m_dash = (wxGTKDash *)dash;
 }
 
-bool wxPen::operator == ( const wxPen& pen )
+void wxPen::SetColour( int red, int green, int blue )
 {
-  return m_refData == pen.m_refData; 
+    AllocExclusive();
+    
+    M_PENDATA->m_colour.Set( red, green, blue );
 }
 
-bool wxPen::operator != ( const wxPen& pen )
+void wxPen::SetCap( int capStyle )
 {
-  return m_refData != pen.m_refData; 
+    AllocExclusive();
+    
+    M_PENDATA->m_capStyle = capStyle;
 }
 
-void wxPen::SetColour( const wxColour &colour )
+void wxPen::SetJoin( int joinStyle )
 {
-  if (!m_refData)
-    m_refData = new wxPenRefData();
-
-  M_PENDATA->m_colour = colour;
+    AllocExclusive();
+    
+    M_PENDATA->m_joinStyle = joinStyle;
 }
 
-void wxPen::SetColour( const wxString &colourName )
+void wxPen::SetStyle( int style )
 {
-  if (!m_refData)
-    m_refData = new wxPenRefData();
-
-  M_PENDATA->m_colour = colourName;
+    AllocExclusive();
+    
+    M_PENDATA->m_style = style;
 }
 
-void wxPen::SetColour( int red, int green, int blue )
+void wxPen::SetWidth( int width )
 {
-  if (!m_refData)
-    m_refData = new wxPenRefData();
-
-  M_PENDATA->m_colour.Set( red, green, blue );
+    AllocExclusive();
+    
+    M_PENDATA->m_width = width;
 }
 
-void wxPen::SetCap( int capStyle )
+int wxPen::GetDashes( wxDash **ptr ) const
 {
-  if (!m_refData)
-    m_refData = new wxPenRefData();
-
-  M_PENDATA->m_capStyle = capStyle;
+     *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL);
+     return (M_PENDATA ? M_PENDATA->m_countDashes : 0);
 }
 
-void wxPen::SetJoin( int joinStyle )
+int wxPen::GetDashCount() const
 {
-  if (!m_refData)
-    m_refData = new wxPenRefData();
-
-  M_PENDATA->m_joinStyle = joinStyle;
+    return (M_PENDATA->m_countDashes);
 }
 
-void wxPen::SetStyle( int style )
+wxDash* wxPen::GetDash() const
 {
-  if (!m_refData)
-    m_refData = new wxPenRefData();
-
-  M_PENDATA->m_style = style;
+    return (wxDash*)M_PENDATA->m_dash;
 }
 
-void wxPen::SetWidth( int width )
+int wxPen::GetCap() const
 {
-  if (!m_refData)
-    m_refData = new wxPenRefData();
+    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
 
-  M_PENDATA->m_width = width;
+    return M_PENDATA->m_capStyle;
 }
 
-int wxPen::GetCap(void) const
+int wxPen::GetJoin() const
 {
-  return M_PENDATA->m_capStyle;
-}
+    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
 
-int wxPen::GetJoin(void) const
-{
-  if (!m_refData)
-    return 0;
-  else
     return M_PENDATA->m_joinStyle;
 }
 
-int wxPen::GetStyle(void) const
+int wxPen::GetStyle() const
 {
-  if (!m_refData)
-    return 0;
-  else
+    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+
     return M_PENDATA->m_style;
 }
 
-int wxPen::GetWidth(void) const
+int wxPen::GetWidth() const
 {
-  if (!m_refData)
-    return 0;
-  else
+    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+
     return M_PENDATA->m_width;
 }
 
-wxColour &wxPen::GetColour(void) const
+wxColour &wxPen::GetColour() const
 {
-  if (!m_refData)
-    return wxNullColour;
-  else
-    return M_PENDATA->m_colour;
-}
+    wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );
 
-bool wxPen::Ok(void) const
-{
-  return (m_refData);
+    return M_PENDATA->m_colour;
 }