X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff7b1510ea7f7855091df83d75a44415dc1cba18..598fe99d56158319f6b5f817c4670748f98bc70a:/src/gtk1/brush.cpp

diff --git a/src/gtk1/brush.cpp b/src/gtk1/brush.cpp
index 1229a9516e..175e861c48 100644
--- a/src/gtk1/brush.cpp
+++ b/src/gtk1/brush.cpp
@@ -1,132 +1,163 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        brush.cpp
+// Name:        src/gtk1/brush.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
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "brush.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #include "wx/brush.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/colour.h"
+#endif
+
+#include <gdk/gdk.h>
+
 //-----------------------------------------------------------------------------
 // wxBrush
 //-----------------------------------------------------------------------------
 
-class wxBrushRefData: public wxObjectRefData
-{
-  public:
-  
-    wxBrushRefData(void);
-  
-    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(void)
-{
-  m_style = 0;
-}
-
 //-----------------------------------------------------------------------------
 
 #define M_BRUSHDATA ((wxBrushRefData *)m_refData)
 
 IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
 
-wxBrush::wxBrush(void)
-{
-  if (wxTheBrushList) wxTheBrushList->AddBrush( this );
-}
-
-wxBrush::wxBrush( const wxColour &colour, int style )
+wxBrush::wxBrush( const wxColour &colour, wxBrushStyle 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 = style;
+    M_BRUSHDATA->m_colour = colour;
 }
 
-wxBrush::wxBrush( const wxString &colourName, 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 = colourName;
-  
-  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;
+
+    M_BRUSHDATA->m_stipple = stippleBitmap;
+
+    if (M_BRUSHDATA->m_stipple.GetMask())
+        M_BRUSHDATA->m_style = wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE;
+    else
+        M_BRUSHDATA->m_style = wxBRUSHSTYLE_STIPPLE_MASK;
 }
 
-wxBrush::wxBrush( const wxBrush &brush )
+wxBrush::~wxBrush()
 {
-  Ref( brush );
-  
-  if (wxTheBrushList) wxTheBrushList->AddBrush( this );
+    // m_refData unrefed in ~wxObject
 }
 
-wxBrush::wxBrush( const wxBrush *brush )
+wxGDIRefData *wxBrush::CreateGDIRefData() const
 {
-  if (brush) Ref( *brush );
-  
-  if (wxTheBrushList) wxTheBrushList->Append( this );
+    return new wxBrushRefData;
 }
 
-wxBrush::~wxBrush(void)
+wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const
 {
-  if (wxTheBrushList) wxTheBrushList->RemoveBrush( this );
+    return new wxBrushRefData(*(wxBrushRefData *)data);
 }
 
-wxBrush& wxBrush::operator = ( const wxBrush& brush )
+bool wxBrush::operator == ( const wxBrush& brush ) const
 {
-  if (*this == brush) return (*this); 
-  Ref( brush ); 
-  return *this; 
+    if (m_refData == brush.m_refData) return true;
+
+    if (!m_refData || !brush.m_refData) return false;
+
+    return ( *(wxBrushRefData*)m_refData == *(wxBrushRefData*)brush.m_refData );
 }
-  
-bool wxBrush::operator == ( const wxBrush& brush )
+
+wxBrushStyle wxBrush::GetStyle() const
 {
-  return m_refData == brush.m_refData; 
+    wxCHECK_MSG( IsOk(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") );
+
+    return M_BRUSHDATA->m_style;
 }
 
-bool wxBrush::operator != ( const wxBrush& brush )
+wxColour wxBrush::GetColour() const
 {
-  return m_refData != brush.m_refData; 
+    wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid brush") );
+
+    return M_BRUSHDATA->m_colour;
 }
 
-bool wxBrush::Ok(void) const
+wxBitmap *wxBrush::GetStipple() const
 {
-  return ((m_refData) && M_BRUSHDATA->m_colour.Ok());
+    wxCHECK_MSG( IsOk(), NULL, wxT("invalid brush") );
+
+    return &M_BRUSHDATA->m_stipple;
 }
 
-int wxBrush::GetStyle(void) const
+void wxBrush::SetColour( const wxColour& col )
 {
-  return M_BRUSHDATA->m_style;
+    AllocExclusive();
+
+    M_BRUSHDATA->m_colour = col;
 }
 
-wxColour &wxBrush::GetColour(void) const
+void wxBrush::SetColour( unsigned char r, unsigned char g, unsigned char b )
 {
-  return M_BRUSHDATA->m_colour;
+    AllocExclusive();
+
+    M_BRUSHDATA->m_colour.Set( r, g, b );
 }
 
-wxBitmap *wxBrush::GetStipple(void) const
+void wxBrush::SetStyle( wxBrushStyle style )
 {
-  return &M_BRUSHDATA->m_stipple;
+    AllocExclusive();
+
+    M_BRUSHDATA->m_style = style;
 }
 
+void wxBrush::SetStipple( const wxBitmap& stipple )
+{
+    AllocExclusive();
 
+    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;
+}