use GetFont() instead of (possibly not initialized) m_font in GetCharWidth/Height()

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

diff --git a/src/mgl/pen.cpp b/src/mgl/pen.cpp
index eacb859d6cfa49a78defc39abb6802a1f49df4d1..686e6d46db37ea79d5856738230206cecb9943d6 100644 (file)
--- a/src/mgl/pen.cpp
+++ b/src/mgl/pen.cpp
@@ -3,17 +3,25 @@
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "pen.h"
 #endif
 
 #pragma implementation "pen.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+

 #include "wx/pen.h"
 #include "wx/bitmap.h"
 #include "wx/pen.h"
 #include "wx/bitmap.h"

+#include "wx/colour.h"

 #include "wx/mgl/private.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/mgl/private.h"
 
 //-----------------------------------------------------------------------------


@@ -79,21 +87,12 @@ wxPenRefData::wxPenRefData(const wxPenRefData& data)
 
 IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject)
 
 
 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;
 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 wxBitmap& stipple, int width)
 }
 
 wxPen::wxPen(const wxBitmap& stipple, int width)


@@ -107,22 +106,11 @@ wxPen::wxPen(const wxBitmap& stipple, int width)
     M_PENDATA->m_style = wxSTIPPLE;
     M_PENDATA->m_stipple = stipple;
     wxBitmapToPixPattern(stipple, &(M_PENDATA->m_pixPattern), NULL);
     M_PENDATA->m_style = wxSTIPPLE;
     M_PENDATA->m_stipple = stipple;
     wxBitmapToPixPattern(stipple, &(M_PENDATA->m_pixPattern), NULL);

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

 }
 
 wxPen::wxPen(const wxPen& pen)
 {
     Ref(pen);
 }
 
 wxPen::wxPen(const wxPen& pen)
 {
     Ref(pen);

-    if ( wxThePenList )
-        wxThePenList->AddPen(this);
-}
-
-wxPen::~wxPen()
-{
-    if ( wxThePenList )
-        wxThePenList->RemovePen(this);

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


@@ -144,38 +132,38 @@ bool wxPen::operator != (const wxPen& pen) const
 
 void wxPen::SetColour(const wxColour &colour)
 {
 
 void wxPen::SetColour(const wxColour &colour)
 {

-    Unshare();
+    AllocExclusive();

     M_PENDATA->m_colour = colour;
 }
 
 void wxPen::SetDashes(int number_of_dashes, const wxDash *dash)
 {
     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)
 {
     M_PENDATA->m_countDashes = number_of_dashes;
     M_PENDATA->m_dash = (wxDash *)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)
 {
     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)
 {
     M_PENDATA->m_capStyle = capStyle;
 }
 
 void wxPen::SetJoin(int joinStyle)
 {

-    Unshare();
+    AllocExclusive();

     M_PENDATA->m_joinStyle = joinStyle;
 }
 
 void wxPen::SetStyle(int style)
 {
     M_PENDATA->m_joinStyle = joinStyle;
 }
 
 void wxPen::SetStyle(int style)
 {

-    Unshare();
+    AllocExclusive();

     M_PENDATA->m_style = style;
 }
 
     M_PENDATA->m_style = style;
 }
 


@@ -185,14 +173,14 @@ void wxPen::SetStipple(const wxBitmap& stipple)
     wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8, 
                   _T("stipple bitmap must be 8x8") );
 
     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)
 {
     M_PENDATA->m_stipple = stipple;
     wxBitmapToPixPattern(stipple, &(M_PENDATA->m_pixPattern), NULL);
 }
 
 void wxPen::SetWidth(int width)
 {

-    Unshare();
+    AllocExclusive();

     M_PENDATA->m_width = width;
 }
 
     M_PENDATA->m_width = width;
 }
 


@@ -267,17 +255,13 @@ bool wxPen::Ok() const
     return (m_refData != NULL);
 }
 
     return (m_refData != NULL);
 }
 

-void wxPen::Unshare()
+wxObjectRefData *wxPen::CreateRefData() const
+{
+    return new wxPenRefData;
+}
+
+wxObjectRefData *wxPen::CloneRefData(const wxObjectRefData *data) const

 {
 {

-    if (!m_refData)
-    {
-        m_refData = new wxPenRefData();
-    }
-    else
-    {
-        wxPenRefData* ref = new wxPenRefData( *(wxPenRefData*)m_refData );
-        UnRef();
-        m_refData = ref;
-    }
+    return new wxPenRefData(*(wxPenRefData *)data);

 }
 
 }