X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..2028c33ab5a39a12bd410ac953731a56ad6377ba:/src/gtk1/brush.cpp?ds=inline

diff --git a/src/gtk1/brush.cpp b/src/gtk1/brush.cpp
index a324ecea66..d38da098ab 100644
--- a/src/gtk1/brush.cpp
+++ b/src/gtk1/brush.cpp
@@ -1,180 +1,163 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        brush.cpp
+// Name:        src/gtk1/brush.cpp
 // 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 "gdk/gdk.h"
+#ifndef WX_PRECOMP
+    #include "wx/colour.h"
+#endif
+
+#include <gdk/gdk.h>
 
 //-----------------------------------------------------------------------------
 // wxBrush
 //-----------------------------------------------------------------------------
 
-class wxBrushRefData: public wxObjectRefData
-{
-  public:
-
-    wxBrushRefData();
-    wxBrushRefData( const wxBrushRefData& data );
-
-    int        m_style;
-    wxBitmap   m_stipple;
-    wxColour   m_colour;
+class wxBrushRefData: public wxGDIRefData
+{
+public:
+    wxBrushRefData()
+    {
+        m_style = wxBRUSHSTYLE_INVALID;
+    }
+
+    wxBrushRefData( const wxBrushRefData& data )
+        : wxGDIRefData()
+    {
+        m_style = data.m_style;
+        m_stipple = data.m_stipple;
+        m_colour = data.m_colour;
+    }
+
+    bool operator == (const wxBrushRefData& data) const
+    {
+        return (m_style == data.m_style &&
+                m_stipple.IsSameAs(data.m_stipple) &&
+                m_colour == data.m_colour);
+    }
+
+    wxBrushStyle m_style;
+    wxColour     m_colour;
+    wxBitmap     m_stipple;
 };
 
-wxBrushRefData::wxBrushRefData()
-{
-  m_style = 0;
-}
-
-wxBrushRefData::wxBrushRefData( const wxBrushRefData& data )
-{
-  m_style = data.m_style;
-  m_stipple = data.m_stipple;
-  m_colour = data.m_colour;
-}
-
 //-----------------------------------------------------------------------------
 
 #define M_BRUSHDATA ((wxBrushRefData *)m_refData)
 
 IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
 
-wxBrush::wxBrush()
+wxBrush::wxBrush( const wxColour &colour, wxBrushStyle style )
 {
-  if (wxTheBrushList) wxTheBrushList->AddBrush( this );
+    m_refData = new wxBrushRefData();
+    M_BRUSHDATA->m_style = style;
+    M_BRUSHDATA->m_colour = colour;
 }
 
-wxBrush::wxBrush( const wxColour &colour, int style )
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+wxBrush::wxBrush(const wxColour& col, int style)
 {
-  m_refData = new wxBrushRefData();
-  M_BRUSHDATA->m_style = style;
-  M_BRUSHDATA->m_colour = colour;
-
-  if (wxTheBrushList) wxTheBrushList->AddBrush( this );
+    m_refData = new wxBrushRefData;
+    M_BRUSHDATA->m_style = (wxBrushStyle)style;
+    M_BRUSHDATA->m_colour = col;
 }
+#endif
 
 wxBrush::wxBrush( const wxBitmap &stippleBitmap )
 {
-  m_refData = new wxBrushRefData();
-  M_BRUSHDATA->m_style = wxSTIPPLE;
-  M_BRUSHDATA->m_colour = *wxBLACK;
-  M_BRUSHDATA->m_stipple = stippleBitmap;
-
-  if (wxTheBrushList) wxTheBrushList->AddBrush( this );
-}
+    m_refData = new wxBrushRefData();
+    M_BRUSHDATA->m_colour = *wxBLACK;
 
-wxBrush::wxBrush( const wxBrush &brush )
-{
-  Ref( brush );
+    M_BRUSHDATA->m_stipple = stippleBitmap;
 
-  if (wxTheBrushList) wxTheBrushList->AddBrush( this );
+    if (M_BRUSHDATA->m_stipple.GetMask())
+        M_BRUSHDATA->m_style = wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE;
+    else
+        M_BRUSHDATA->m_style = wxBRUSHSTYLE_STIPPLE_MASK;
 }
 
 wxBrush::~wxBrush()
 {
-  if (wxTheBrushList) wxTheBrushList->RemoveBrush( this );
+    // m_refData unrefed in ~wxObject
 }
 
-wxBrush& wxBrush::operator = ( const wxBrush& brush )
+wxGDIRefData *wxBrush::CreateGDIRefData() const
 {
-  if (*this == brush) return (*this);
-  Ref( brush );
-  return *this;
+    return new wxBrushRefData;
 }
 
-bool wxBrush::operator == ( const wxBrush& brush )
+wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const
 {
-  return m_refData == brush.m_refData;
+    return new wxBrushRefData(*(wxBrushRefData *)data);
 }
 
-bool wxBrush::operator != ( const wxBrush& brush )
+bool wxBrush::operator == ( const wxBrush& brush ) const
 {
-  return m_refData != brush.m_refData;
-}
+    if (m_refData == brush.m_refData) return true;
 
-bool wxBrush::Ok() const
-{
-  return ((m_refData) && M_BRUSHDATA->m_colour.Ok());
+    if (!m_refData || !brush.m_refData) return false;
+
+    return ( *(wxBrushRefData*)m_refData == *(wxBrushRefData*)brush.m_refData );
 }
 
-int wxBrush::GetStyle() const
+wxBrushStyle wxBrush::GetStyle() const
 {
-  if (m_refData == NULL)
-  {
-    wxFAIL_MSG( T("invalid brush") );
-    return 0;
-  }
+    wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") );
 
-  return M_BRUSHDATA->m_style;
+    return M_BRUSHDATA->m_style;
 }
 
-wxColour &wxBrush::GetColour() const
+wxColour wxBrush::GetColour() const
 {
-  if (m_refData == NULL)
-  {
-    wxFAIL_MSG( T("invalid brush") );
-    return wxNullColour;
-  }
+    wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid brush") );
 
-  return M_BRUSHDATA->m_colour;
+    return M_BRUSHDATA->m_colour;
 }
 
 wxBitmap *wxBrush::GetStipple() const
 {
-  if (m_refData == NULL)
-  {
-    wxFAIL_MSG( T("invalid brush") );
-    return &wxNullBitmap;
-  }
+    wxCHECK_MSG( Ok(), NULL, wxT("invalid brush") );
 
-  return &M_BRUSHDATA->m_stipple;
+    return &M_BRUSHDATA->m_stipple;
 }
 
 void wxBrush::SetColour( const wxColour& col )
 {
-  Unshare();
-  M_BRUSHDATA->m_colour = col;
+    AllocExclusive();
+
+    M_BRUSHDATA->m_colour = col;
 }
 
 void wxBrush::SetColour( unsigned char r, unsigned char g, unsigned char b )
 {
-  Unshare();
-  M_BRUSHDATA->m_colour.Set( r, g, b );
+    AllocExclusive();
+
+    M_BRUSHDATA->m_colour.Set( r, g, b );
 }
 
-void wxBrush::SetStyle( int style )
+void wxBrush::SetStyle( wxBrushStyle style )
 {
-  Unshare();
-  M_BRUSHDATA->m_style = style;
+    AllocExclusive();
+
+    M_BRUSHDATA->m_style = style;
 }
 
 void wxBrush::SetStipple( const wxBitmap& stipple )
 {
-  Unshare();
-  M_BRUSHDATA->m_stipple = stipple;
-}
+    AllocExclusive();
 
-void wxBrush::Unshare()
-{
-  if (!m_refData)
-  {
-    m_refData = new wxBrushRefData();
-  }
-  else
-  {
-    wxBrushRefData* ref = new wxBrushRefData( *(wxBrushRefData*)m_refData );
-    UnRef();
-    m_refData = ref;
-  }
+    M_BRUSHDATA->m_stipple = stipple;
+    if (M_BRUSHDATA->m_stipple.GetMask())
+        M_BRUSHDATA->m_style = wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE;
+    else
+        M_BRUSHDATA->m_style = wxBRUSHSTYLE_STIPPLE_MASK;
 }
-