Fix for unsafe use of a global pointer for focus window: now checks at destruct

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

diff --git a/src/gtk1/pen.cpp b/src/gtk1/pen.cpp
index 7ed7be02a79222aa1c31a183a55fcae44a877beb..8ac1097aa8112efe3133ba7d886293f80ad2f277 100644 (file)
--- a/src/gtk1/pen.cpp
+++ b/src/gtk1/pen.cpp
@@ -2,10 +2,9 @@
 // Name:        pen.cpp
 // Purpose:
 // Author:      Robert Roebling
 // 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

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -15,30 +14,52 @@
 
 #include "wx/pen.h"
 
 
 #include "wx/pen.h"
 

+#include <gdk/gdk.h>
+

 //-----------------------------------------------------------------------------
 // wxPen
 //-----------------------------------------------------------------------------
 
 class wxPenRefData: public wxObjectRefData
 {
 //-----------------------------------------------------------------------------
 // wxPen
 //-----------------------------------------------------------------------------
 
 class wxPenRefData: public wxObjectRefData
 {

-  public:
-  
-    wxPenRefData(void);
-  
-    int        m_width;
-    int        m_style;
-    int        m_joinStyle;
-    int        m_capStyle;
-    wxColour   m_colour;
-};
-
-wxPenRefData::wxPenRefData(void)
-{
-  m_width = 1;
-  m_style = wxSOLID;
-  m_joinStyle = wxJOIN_ROUND;
-  m_capStyle = wxCAP_ROUND;
-};
+public:
+
+  wxPenRefData();
+  wxPenRefData( const wxPenRefData& data );
+
+  int        m_width;
+  int        m_style;
+  int        m_joinStyle;
+  int        m_capStyle;
+  wxColour   m_colour;
+  int        m_countDashes;
+  wxGTKDash *m_dash;
+};
+
+wxPenRefData::wxPenRefData()
+{
+    m_width = 1;
+    m_style = wxSOLID;
+    m_joinStyle = wxJOIN_ROUND;
+    m_capStyle = wxCAP_ROUND;
+    m_dash = (wxGTKDash*) 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;
+/*
+    if (data.m_dash)  TODO
+      m_dash = new 
+*/
+    m_dash = data.m_dash;
+}

 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 


@@ -46,159 +67,159 @@ wxPenRefData::wxPenRefData(void)
 
 IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject)
 

-wxPen::wxPen(void)
+wxPen::wxPen()

 {
 {

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

 
 wxPen::wxPen( const wxColour &colour, int width, int style )
 {
 
 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 );
-};
+    m_refData = new wxPenRefData();
+    M_PENDATA->m_width = width;
+    M_PENDATA->m_style = style;
+    M_PENDATA->m_colour = colour;

 
 

-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 );
-};
+    if (wxThePenList) wxThePenList->AddPen( this );
+}

 
 wxPen::wxPen( const wxPen& pen )
 {
 
 wxPen::wxPen( const wxPen& pen )
 {

-  Ref( pen );
-  if (wxThePenList) wxThePenList->AddPen( this );
-};
+    Ref( pen );
+    if (wxThePenList) wxThePenList->AddPen( this );
+}

 
 

-wxPen::wxPen( const wxPen* pen )
+wxPen::~wxPen()

 {
 {

-  UnRef();
-  if (pen) Ref( *pen ); 
-  if (wxThePenList) wxThePenList->AddPen( this );
-};
-
-wxPen::~wxPen(void)
-{
-  if (wxThePenList) wxThePenList->RemovePen( this );
-};
+    if (wxThePenList) wxThePenList->RemovePen( this );
+}

 
 wxPen& wxPen::operator = ( const wxPen& pen )
 {
 
 wxPen& wxPen::operator = ( const wxPen& pen )
 {

-  if (*this == pen) return (*this); 
-  Ref( pen ); 
-  return *this; 
-};
+    if (*this == pen) return (*this);
+    Ref( pen );
+    return *this;
+}

 
 

-bool wxPen::operator == ( const wxPen& pen )
+bool wxPen::operator == ( const wxPen& pen ) const

 {
 {

-  return m_refData == pen.m_refData; 
-};
+    return m_refData == pen.m_refData;
+}

 
 

-bool wxPen::operator != ( const wxPen& pen )
+bool wxPen::operator != ( const wxPen& pen ) const

 {
 {

-  return m_refData != pen.m_refData; 
-};
+    return m_refData != pen.m_refData;
+}

 
 void wxPen::SetColour( const wxColour &colour )
 {
 
 void wxPen::SetColour( const wxColour &colour )
 {

-  if (!m_refData)
-    m_refData = new wxPenRefData();
-
-  M_PENDATA->m_colour = colour;
-};
+    Unshare();
+    M_PENDATA->m_colour = colour;
+}

 
 

-void wxPen::SetColour( const wxString &colourName )
+void wxPen::SetDashes( int number_of_dashes, const wxDash *dash )

 {
 {

-  if (!m_refData)
-    m_refData = new wxPenRefData();
-
-  M_PENDATA->m_colour = colourName;
-};
+    Unshare();
+    M_PENDATA->m_countDashes = number_of_dashes;
+    M_PENDATA->m_dash = (wxGTKDash *)dash; /* TODO */
+}

 
 void wxPen::SetColour( int red, int green, int blue )
 {
 
 void wxPen::SetColour( int red, int green, int blue )
 {

-  if (!m_refData)
-    m_refData = new wxPenRefData();
-
-  M_PENDATA->m_colour.Set( red, green, blue );
-};
+    Unshare();
+    M_PENDATA->m_colour.Set( red, green, blue );
+}

 
 void wxPen::SetCap( int capStyle )
 {
 
 void wxPen::SetCap( int capStyle )
 {

-  if (!m_refData)
-    m_refData = new wxPenRefData();
-
-  M_PENDATA->m_capStyle = capStyle;
-};
+    Unshare();
+    M_PENDATA->m_capStyle = capStyle;
+}

 
 void wxPen::SetJoin( int joinStyle )
 {
 
 void wxPen::SetJoin( int joinStyle )
 {

-  if (!m_refData)
-    m_refData = new wxPenRefData();
-
-  M_PENDATA->m_joinStyle = joinStyle;
-};
+    Unshare();
+    M_PENDATA->m_joinStyle = joinStyle;
+}

 
 void wxPen::SetStyle( int style )
 {
 
 void wxPen::SetStyle( int style )
 {

-  if (!m_refData)
-    m_refData = new wxPenRefData();
-
-  M_PENDATA->m_style = style;
-};
+    Unshare();
+    M_PENDATA->m_style = style;
+}

 
 void wxPen::SetWidth( int width )
 {
 
 void wxPen::SetWidth( int width )
 {

-  if (!m_refData)
-    m_refData = new wxPenRefData();
+    Unshare();
+    M_PENDATA->m_width = width;
+}

 
 

-  M_PENDATA->m_width = width;
-};
+int wxPen::GetDashes( wxDash **ptr ) const 
+{
+     *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); 
+}
+
+wxDash* wxPen::GetDash() const 
+{ 
+    return (wxDash*)M_PENDATA->m_dash; 
+}

 
 

-int wxPen::GetCap(void) const
+int wxPen::GetCap() const

 {
 {

-  return M_PENDATA->m_capStyle;
-};
+    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+
+    return M_PENDATA->m_capStyle;
+}

 
 

-int wxPen::GetJoin(void) const
+int wxPen::GetJoin() const

 {
 {

-  if (!m_refData)
-    return 0;
-  else
+    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+

     return M_PENDATA->m_joinStyle;
     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;
     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;
     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;
+}
+
+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;
+    }
+}