X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1dcbbdcf92041ccf3efbc3bc2909d1dd0b7d0364..4813bb8d72d4e6821e031f2b19baaa338b714d39:/src/mac/carbon/brush.cpp

diff --git a/src/mac/carbon/brush.cpp b/src/mac/carbon/brush.cpp
index bb7008a32d..f571682680 100644
--- a/src/mac/carbon/brush.cpp
+++ b/src/mac/carbon/brush.cpp
@@ -1,164 +1,185 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        brush.cpp
+// Name:        src/mac/carbon/brush.cpp
 // Purpose:     wxBrush
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "brush.h"
-#endif
+#include "wx/wxprec.h"
 
-#include "wx/setup.h"
-#include "wx/utils.h"
 #include "wx/brush.h"
 
-#if !USE_SHARED_LIBRARIES
-IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
 #endif
 
-wxBrushRefData::wxBrushRefData()
+#include "wx/mac/private.h"
+
+IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
+
+class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
+{
+public:
+    wxBrushRefData(const wxColour& colour = wxNullColour, int style = wxSOLID);
+    wxBrushRefData(const wxBitmap& stipple);
+    wxBrushRefData(const wxBrushRefData& data);
+    virtual ~wxBrushRefData();
+
+    bool operator==(const wxBrushRefData& data) const;
+
+    const wxColour& GetColour() const { return m_colour; }
+    int GetStyle() const { return m_style; }
+    wxBitmap *GetStipple() { return &m_stipple; }
+        
+    void SetColour(const wxColour& colour) { m_colour = colour; }
+    void SetStyle(int style) { m_style = style; }
+    void SetStipple(const wxBitmap& stipple) { DoSetStipple(stipple); }
+    
+protected:
+    void DoSetStipple(const wxBitmap& stipple);
+
+    wxBitmap      m_stipple ;
+    wxColour      m_colour;
+    int           m_style;
+};
+
+#define M_BRUSHDATA ((wxBrushRefData *)m_refData)
+
+wxBrushRefData::wxBrushRefData(const wxColour& colour, int style)
+    : m_colour(colour), m_style( style )
 {
-    m_style = wxSOLID;
-    m_isMacTheme = false ;
-    m_isMacThemeBackground = false ;
+}
+
+wxBrushRefData::wxBrushRefData(const wxBitmap& stipple)
+{
+    DoSetStipple( stipple );
 }
 
 wxBrushRefData::wxBrushRefData(const wxBrushRefData& data)
+    : wxGDIRefData() ,
+        m_stipple(data.m_stipple),
+        m_colour(data.m_colour),
+        m_style(data.m_style)
 {
-  m_style = data.m_style;
-  m_stipple = data.m_stipple;
-  m_colour = data.m_colour;
-  m_isMacTheme = data.m_isMacTheme ;
-  m_macThemeBrush = data.m_macThemeBrush ;
 }
 
 wxBrushRefData::~wxBrushRefData()
 {
 }
 
-// Brushes
-wxBrush::wxBrush()
+bool wxBrushRefData::operator==(const wxBrushRefData& data) const
 {
+    return m_style == data.m_style &&
+        m_colour == data.m_colour &&
+        m_stipple.IsSameAs(data.m_stipple);
 }
 
-wxBrush::~wxBrush()
+void wxBrushRefData::DoSetStipple(const wxBitmap& stipple)
 {
+    m_stipple = stipple;
+    m_style = stipple.GetMask() ? wxSTIPPLE_MASK_OPAQUE : wxSTIPPLE;
 }
+//
+//
+//
 
-wxBrush::wxBrush(const wxColour& col, int Style)
+wxBrush::wxBrush()
 {
-    m_refData = new wxBrushRefData;
-
-    M_BRUSHDATA->m_colour = col;
-    M_BRUSHDATA->m_style = Style;
-
-    RealizeResource();
 }
 
-wxBrush::wxBrush(const wxBitmap& stipple)
+wxBrush::~wxBrush()
 {
-    m_refData = new wxBrushRefData;
-
-    M_BRUSHDATA->m_style = wxSTIPPLE;
-    M_BRUSHDATA->m_stipple = stipple;
+}
 
-    RealizeResource();
+wxBrush::wxBrush(const wxColour& col, int style)
+{
+    m_refData = new wxBrushRefData( col, style );
 }
 
-wxBrush::wxBrush(ThemeBrush macThemeBrush ) 
+wxBrush::wxBrush(const wxBitmap& stipple)
 {
-    m_refData = new wxBrushRefData;
+    m_refData = new wxBrushRefData( stipple );
+}
 
-    M_BRUSHDATA->m_isMacTheme = true;
-    M_BRUSHDATA->m_macThemeBrush = macThemeBrush;
+// ----------------------------------------------------------------------------
+// wxBrush house keeping stuff
+// ----------------------------------------------------------------------------
 
-    RealizeResource();
-}
-void wxBrush::Unshare()
+bool wxBrush::operator==(const wxBrush& brush) const
 {
-	// Don't change shared data
-	if (!m_refData)
-    {
-		m_refData = new wxBrushRefData();
-	}
-    else
-    {
-		wxBrushRefData* ref = new wxBrushRefData(*(wxBrushRefData*)m_refData);
-		UnRef();
-		m_refData = ref;
-	}
+    const wxBrushRefData *brushData = (wxBrushRefData *)brush.m_refData;
+    
+    // an invalid brush is considered to be only equal to another invalid brush
+    return m_refData ? (brushData && *M_BRUSHDATA == *brushData) : !brushData;
 }
 
-void wxBrush::SetColour(const wxColour& col)
+wxGDIRefData *wxBrush::CreateGDIRefData() const
 {
-    Unshare();
-    M_BRUSHDATA->m_isMacTheme = false;
-    M_BRUSHDATA->m_isMacThemeBackground = false ;
-    M_BRUSHDATA->m_colour = col;
-
-    RealizeResource();
+    return new wxBrushRefData;
 }
 
-void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b)
+wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const
 {
-    Unshare();
+    return new wxBrushRefData(*(const wxBrushRefData *)data);
+}
 
-    M_BRUSHDATA->m_isMacTheme = false;
-    M_BRUSHDATA->m_isMacThemeBackground = false ;
-    M_BRUSHDATA->m_colour.Set(r, g, b);
+// ----------------------------------------------------------------------------
+// wxBrush accessors
+// ----------------------------------------------------------------------------
 
-    RealizeResource();
+const wxColour& wxBrush::GetColour() const
+{
+    wxCHECK_MSG( Ok(), wxNullColour, _T("invalid brush") );
+    
+    return M_BRUSHDATA->GetColour();
 }
 
-void wxBrush::SetStyle(int Style)
+int wxBrush::GetStyle() const
 {
-    Unshare();
-
-    M_BRUSHDATA->m_isMacTheme = false;
-    M_BRUSHDATA->m_isMacThemeBackground = false ;
-    M_BRUSHDATA->m_style = Style;
-
-    RealizeResource();
+    wxCHECK_MSG( Ok(), 0, _T("invalid brush") );
+    
+    return M_BRUSHDATA->GetStyle();
 }
 
-void wxBrush::SetStipple(const wxBitmap& Stipple)
+wxBitmap *wxBrush::GetStipple() const
 {
-    Unshare();
+    wxCHECK_MSG( Ok(), NULL, _T("invalid brush") );
+    
+    return M_BRUSHDATA->GetStipple();
+}
 
-    M_BRUSHDATA->m_stipple = Stipple;
+// ----------------------------------------------------------------------------
+// wxBrush setters
+// ----------------------------------------------------------------------------
 
-    RealizeResource();
+void wxBrush::SetColour(const wxColour& col)
+{
+    AllocExclusive();
+    
+    M_BRUSHDATA->SetColour(col);
 }
 
-void wxBrush::SetMacTheme(ThemeBrush macThemeBrush)
+void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b)
 {
-    Unshare();
-
-    M_BRUSHDATA->m_isMacTheme = true;
-    M_BRUSHDATA->m_isMacThemeBackground = false ;
-    M_BRUSHDATA->m_macThemeBrush = macThemeBrush;
-
-    RealizeResource();
+    AllocExclusive();
+    
+    M_BRUSHDATA->SetColour(wxColour(r, g, b));
 }
 
-void wxBrush::SetMacThemeBackground(ThemeBackgroundKind macThemeBackground)
+void wxBrush::SetStyle(int style)
 {
-    Unshare();
-
-    M_BRUSHDATA->m_isMacTheme = false;
-    M_BRUSHDATA->m_isMacThemeBackground = true ;
-    M_BRUSHDATA->m_macThemeBackground = macThemeBackground;
-
-    RealizeResource();
+    AllocExclusive();
+    
+    M_BRUSHDATA->SetStyle(style);
 }
 
-bool wxBrush::RealizeResource()
+void wxBrush::SetStipple(const wxBitmap& stipple)
 {
-    return TRUE;
+    AllocExclusive();
+    
+    M_BRUSHDATA->SetStipple(stipple);
 }
-