simplify/cleanup wxTheXXXList and wxGDIObject code (patch 1452023 from Paul Cornett)

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

diff --git a/src/gtk1/brush.cpp b/src/gtk1/brush.cpp
index 70a2790e4ae08880ff39c36cd20cefa4b2dc3d3f..d07c3ed0f7dcf08c1c6668e1892cee2e14b2ed9c 100644 (file)
--- a/src/gtk1/brush.cpp
+++ b/src/gtk1/brush.cpp
@@ -1,17 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        brush.cpp
+// Name:        src/gtk1/brush.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

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

-#ifdef __GNUG__
-#pragma implementation "brush.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #include "wx/brush.h"
 
 #include "wx/brush.h"

+#include "wx/colour.h"

 
 #include <gdk/gdk.h>
 
 
 #include <gdk/gdk.h>
 


@@ -22,25 +22,30 @@
 class wxBrushRefData: public wxObjectRefData
 {
 public:
 class wxBrushRefData: public wxObjectRefData
 {
 public:

-    wxBrushRefData();
-    wxBrushRefData( const wxBrushRefData& data );
+    wxBrushRefData()
+    {
+        m_style = 0;
+    }

 
 

-    int        m_style;
-    wxBitmap   m_stipple;
-    wxColour   m_colour;
-};
+    wxBrushRefData( const wxBrushRefData& data )
+        : wxObjectRefData()
+    {
+        m_style = data.m_style;
+        m_stipple = data.m_stipple;
+        m_colour = data.m_colour;
+    }

 
 

-wxBrushRefData::wxBrushRefData()
-{
-    m_style = 0;
-}
+    bool operator == (const wxBrushRefData& data) const
+    {
+        return (m_style == data.m_style &&
+                m_stipple == data.m_stipple &&
+                m_colour == data.m_colour);
+    }

 
 

-wxBrushRefData::wxBrushRefData( const wxBrushRefData& data )
-{
-    m_style = data.m_style;
-    m_stipple = data.m_stipple;
-    m_colour = data.m_colour;
-}
+    int       m_style;
+    wxColour  m_colour;
+    wxBitmap  m_stipple;
+};

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


@@ -48,67 +53,48 @@ wxBrushRefData::wxBrushRefData( const wxBrushRefData& data )
 
 IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
 

-wxBrush::wxBrush()
-{
-    if (wxTheBrushList) wxTheBrushList->AddBrush( this );
-}
-

 wxBrush::wxBrush( const wxColour &colour, int style )
 {
     m_refData = new wxBrushRefData();
     M_BRUSHDATA->m_style = style;
     M_BRUSHDATA->m_colour = colour;
 wxBrush::wxBrush( const wxColour &colour, int style )
 {
     m_refData = new wxBrushRefData();
     M_BRUSHDATA->m_style = style;
     M_BRUSHDATA->m_colour = colour;

-
-    if (wxTheBrushList) wxTheBrushList->AddBrush( this );

 }
 
 wxBrush::wxBrush( const wxBitmap &stippleBitmap )
 {
     m_refData = new wxBrushRefData();
     M_BRUSHDATA->m_colour = *wxBLACK;
 }
 
 wxBrush::wxBrush( const wxBitmap &stippleBitmap )
 {
     m_refData = new wxBrushRefData();
     M_BRUSHDATA->m_colour = *wxBLACK;

-    
+

     M_BRUSHDATA->m_stipple = stippleBitmap;
 
     if (M_BRUSHDATA->m_stipple.GetMask())
     M_BRUSHDATA->m_stipple = stippleBitmap;
 
     if (M_BRUSHDATA->m_stipple.GetMask())

-               M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
-       else
-               M_BRUSHDATA->m_style = wxSTIPPLE;
-
-    if (wxTheBrushList) wxTheBrushList->AddBrush( this );
+        M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
+    else
+        M_BRUSHDATA->m_style = wxSTIPPLE;

 }
 
 }
 

-wxBrush::wxBrush( const wxBrush &brush )
+wxBrush::~wxBrush()

 {
 {

-    Ref( brush );
-
-    if (wxTheBrushList) wxTheBrushList->AddBrush( this );
+    // m_refData unrefed in ~wxObject

 }
 
 }
 

-wxBrush::~wxBrush()
+wxObjectRefData *wxBrush::CreateRefData() const

 {
 {

-    if (wxTheBrushList) wxTheBrushList->RemoveBrush( this );
+    return new wxBrushRefData;

 }
 
 }
 

-wxBrush& wxBrush::operator = ( const wxBrush& brush )
+wxObjectRefData *wxBrush::CloneRefData(const wxObjectRefData *data) const

 {
 {

-    if (*this == brush) return (*this);
-    Ref( brush );
-    return *this;
+    return new wxBrushRefData(*(wxBrushRefData *)data);

 }
 
 bool wxBrush::operator == ( const wxBrush& brush ) const
 {
 }
 
 bool wxBrush::operator == ( const wxBrush& brush ) const
 {

-    return m_refData == brush.m_refData;
-}
+    if (m_refData == brush.m_refData) return true;

 
 

-bool wxBrush::operator != ( const wxBrush& brush ) const
-{
-    return m_refData != brush.m_refData;
-}
+    if (!m_refData || !brush.m_refData) return false;

 
 

-bool wxBrush::Ok() const
-{
-    return ((m_refData) && M_BRUSHDATA->m_colour.Ok());
+    return ( *(wxBrushRefData*)m_refData == *(wxBrushRefData*)brush.m_refData );

 }
 
 int wxBrush::GetStyle() const
 }
 
 int wxBrush::GetStyle() const


@@ -146,47 +132,36 @@ wxBitmap *wxBrush::GetStipple() const
 
 void wxBrush::SetColour( const wxColour& col )
 {
 
 void wxBrush::SetColour( const wxColour& col )
 {

-    Unshare();
+    AllocExclusive();
+

     M_BRUSHDATA->m_colour = col;
 }
 
 void wxBrush::SetColour( unsigned char r, unsigned char g, unsigned char b )
 {
     M_BRUSHDATA->m_colour = col;
 }
 
 void wxBrush::SetColour( unsigned char r, unsigned char g, unsigned char b )
 {

-    Unshare();
+    AllocExclusive();
+

     M_BRUSHDATA->m_colour.Set( r, g, b );
 }
 
 void wxBrush::SetStyle( int style )
 {
     M_BRUSHDATA->m_colour.Set( r, g, b );
 }
 
 void wxBrush::SetStyle( int style )
 {

-    Unshare();
+    AllocExclusive();
+

     M_BRUSHDATA->m_style = style;
 }
 
 void wxBrush::SetStipple( const wxBitmap& stipple )
 {
     M_BRUSHDATA->m_style = style;
 }
 
 void wxBrush::SetStipple( const wxBitmap& stipple )
 {

-    Unshare();
+    AllocExclusive();
+

     M_BRUSHDATA->m_stipple = stipple;
     if (M_BRUSHDATA->m_stipple.GetMask())
     {
     M_BRUSHDATA->m_stipple = stipple;
     if (M_BRUSHDATA->m_stipple.GetMask())
     {

-                  M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
-        }
-        else
-        {              
-                  M_BRUSHDATA->m_style = wxSTIPPLE;
-        }              
-}
-
-void wxBrush::Unshare()
-{
-    if (!m_refData)
-    {
-        m_refData = new wxBrushRefData();
+        M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;

     }
     else
     {
     }
     else
     {

-        wxBrushRefData* ref = new wxBrushRefData( *(wxBrushRefData*)m_refData );
-        UnRef();
-        m_refData = ref;
+        M_BRUSHDATA->m_style = wxSTIPPLE;

     }
 }
     }
 }

-