Make SetLocal actually work instead of crashing immediately; due to required longevit...

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

diff --git a/src/mgl/pen.cpp b/src/mgl/pen.cpp
index e46418d07067f6967f53c9c68366b28029cfd2d8..a98e011a9e26aecc5e738147944a09cbcbaa37c4 100644 (file)
--- a/src/mgl/pen.cpp
+++ b/src/mgl/pen.cpp
@@ -1,17 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        pen.cpp
+// Name:        src/mgl/pen.cpp
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
-#ifdef __GNUG__
-#pragma implementation "pen.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -21,6 +16,7 @@
 
 #include "wx/pen.h"
 #include "wx/bitmap.h"
+#include "wx/colour.h"
 #include "wx/mgl/private.h"
 
 //-----------------------------------------------------------------------------
@@ -97,7 +93,7 @@ wxPen::wxPen(const wxColour &colour, int width, int style)
 wxPen::wxPen(const wxBitmap& stipple, int width)
 {
     wxCHECK_RET( stipple.Ok(), _T("invalid bitmap") );
-    wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8, 
+    wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8,
                   _T("stipple bitmap must be 8x8") );
 
     m_refData = new wxPenRefData();
@@ -107,18 +103,6 @@ wxPen::wxPen(const wxBitmap& stipple, int width)
     wxBitmapToPixPattern(stipple, &(M_PENDATA->m_pixPattern), NULL);
 }
 
-wxPen::wxPen(const wxPen& pen)
-{
-    Ref(pen);
-}
-
-wxPen& wxPen::operator = (const wxPen& pen)
-{
-    if (*this == pen) return (*this);
-    Ref(pen);
-    return *this;
-}
-
 bool wxPen::operator == (const wxPen& pen) const
 {
     return m_refData == pen.m_refData;
@@ -131,72 +115,72 @@ bool wxPen::operator != (const wxPen& pen) const
 
 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 */
 }
 
-void wxPen::SetColour(int red, int green, int blue)
+void wxPen::SetColour(unsigned char red, unsigned char green, unsigned char 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::SetStipple(const wxBitmap& stipple)
 {
     wxCHECK_RET( stipple.Ok(), _T("invalid bitmap") );
-    wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8, 
+    wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8,
                   _T("stipple bitmap must be 8x8") );
 
-    Unshare();
+    AllocExclusive();
     M_PENDATA->m_stipple = stipple;
     wxBitmapToPixPattern(stipple, &(M_PENDATA->m_pixPattern), NULL);
 }
 
 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 ? (wxDash*)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 (wxDash*)M_PENDATA->m_dash; 
+wxDash* wxPen::GetDash() const
+{
+    return (wxDash*)M_PENDATA->m_dash;
 }
 
 int wxPen::GetCap() const
@@ -254,17 +238,12 @@ bool wxPen::Ok() const
     return (m_refData != NULL);
 }
 
-void wxPen::Unshare()
+wxObjectRefData *wxPen::CreateRefData() const
 {
-    if (!m_refData)
-    {
-        m_refData = new wxPenRefData();
-    }
-    else
-    {
-        wxPenRefData* ref = new wxPenRefData( *(wxPenRefData*)m_refData );
-        UnRef();
-        m_refData = ref;
-    }
+    return new wxPenRefData;
 }
 
+wxObjectRefData *wxPen::CloneRefData(const wxObjectRefData *data) const
+{
+    return new wxPenRefData(*(wxPenRefData *)data);
+}