moving tlw list up, cleanup

[wxWidgets.git] / src / mac / carbon / brush.cpp

diff --git a/src/mac/carbon/brush.cpp b/src/mac/carbon/brush.cpp
index f9e14bad6b716bc48335581a6b3c7ed808b108fb..46132211bec5cb8650b2e4473ba36c0361600ebe 100644 (file)
--- a/src/mac/carbon/brush.cpp
+++ b/src/mac/carbon/brush.cpp
@@ -1,43 +1,92 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        brush.cpp
+// Name:        src/mac/carbon/brush.cpp

 // Purpose:     wxBrush
 // Purpose:     wxBrush

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // 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"
 
 #include "wx/brush.h"
 

-#if !USE_SHARED_LIBRARIES
-IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"

 #endif
 
 #endif
 

-wxBrushRefData::wxBrushRefData()
+#include "wx/mac/private.h"
+
+IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
+
+class WXDLLEXPORT wxBrushRefData: public wxGDIRefData

 {
 {

-    m_style = wxSOLID;
+public:
+    wxBrushRefData(const wxColour& colour = wxNullColour, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
+    wxBrushRefData(const wxBitmap& stipple);
+    wxBrushRefData(const wxBrushRefData& data);
+    virtual ~wxBrushRefData();
+
+    bool operator==(const wxBrushRefData& data) const;
+
+    const wxColour& GetColour() const { return m_colour; }
+    wxBrushStyle GetStyle() const { return m_style; }
+    wxBitmap *GetStipple() { return &m_stipple; }
+
+    void SetColour(const wxColour& colour) { m_colour = colour; }
+    void SetStyle(wxBrushStyle style) { m_style = style; }
+    void SetStipple(const wxBitmap& stipple) { DoSetStipple(stipple); }
+
+protected:
+    void DoSetStipple(const wxBitmap& stipple);
+
+    wxBitmap      m_stipple;
+    wxColour      m_colour;
+    wxBrushStyle  m_style;
+};
+
+#define M_BRUSHDATA ((wxBrushRefData *)m_refData)
+
+wxBrushRefData::wxBrushRefData(const wxColour& colour, wxBrushStyle style)
+    : m_colour(colour), m_style( style )
+{
+}
+
+wxBrushRefData::wxBrushRefData(const wxBitmap& stipple)
+{
+    DoSetStipple( stipple );

 }
 
 wxBrushRefData::wxBrushRefData(const wxBrushRefData& data)
 }
 
 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;

 }
 
 wxBrushRefData::~wxBrushRefData()
 {
 }
 
 }
 
 wxBrushRefData::~wxBrushRefData()
 {
 }
 

-// Brushes
+bool wxBrushRefData::operator==(const wxBrushRefData& data) const
+{
+    return m_style == data.m_style &&
+        m_colour == data.m_colour &&
+        m_stipple.IsSameAs(data.m_stipple);
+}
+
+void wxBrushRefData::DoSetStipple(const wxBitmap& stipple)
+{
+    m_stipple = stipple;
+    m_style = stipple.GetMask() ? wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE : wxBRUSHSTYLE_STIPPLE;
+}
+//
+//
+//
+

 wxBrush::wxBrush()
 {
 }
 wxBrush::wxBrush()
 {
 }


@@ -46,79 +95,98 @@ wxBrush::~wxBrush()
 {
 }
 
 {
 }
 

-wxBrush::wxBrush(const wxColour& col, int Style)
+wxBrush::wxBrush(const wxColour& col, wxBrushStyle style)

 {
 {

-    m_refData = new wxBrushRefData;
-
-    M_BRUSHDATA->m_colour = col;
-    M_BRUSHDATA->m_style = Style;
+    m_refData = new wxBrushRefData( col, style );
+}

 
 

-    RealizeResource();
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+wxBrush::wxBrush(const wxColour& col, int style)
+{
+    m_refData = new wxBrushRefData(col, (wxBrushStyle)style);

 }
 }

+#endif

 
 wxBrush::wxBrush(const wxBitmap& stipple)
 {
 
 wxBrush::wxBrush(const wxBitmap& stipple)
 {

-    m_refData = new wxBrushRefData;
+    m_refData = new wxBrushRefData( stipple );
+}
+
+// ----------------------------------------------------------------------------
+// wxBrush house keeping stuff
+// ----------------------------------------------------------------------------

 
 

-    M_BRUSHDATA->m_style = wxSTIPPLE;
-    M_BRUSHDATA->m_stipple = stipple;
+bool wxBrush::operator==(const wxBrush& brush) const
+{
+    const wxBrushRefData *brushData = (wxBrushRefData *)brush.m_refData;

 
 

-    RealizeResource();
+    // an invalid brush is considered to be only equal to another invalid brush
+    return m_refData ? (brushData && *M_BRUSHDATA == *brushData) : !brushData;

 }
 
 }
 

-void wxBrush::Unshare()
+wxGDIRefData *wxBrush::CreateGDIRefData() 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;
-       }
+    return new wxBrushRefData;

 }
 
 }
 

-void wxBrush::SetColour(const wxColour& col)
+wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const

 {
 {

-    Unshare();
+    return new wxBrushRefData(*(const wxBrushRefData *)data);
+}
+
+// ----------------------------------------------------------------------------
+// wxBrush accessors
+// ----------------------------------------------------------------------------

 
 

-    M_BRUSHDATA->m_colour = col;
+const wxColour& wxBrush::GetColour() const
+{
+    wxCHECK_MSG( Ok(), wxNullColour, _T("invalid brush") );

 
 

-    RealizeResource();
+    return M_BRUSHDATA->GetColour();

 }
 
 }
 

-void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b)
+wxBrushStyle wxBrush::GetStyle() const

 {
 {

-    Unshare();
-
-    M_BRUSHDATA->m_colour.Set(r, g, b);
+    wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, _T("invalid brush") );

 
 

-    RealizeResource();
+    return M_BRUSHDATA->GetStyle();

 }
 
 }
 

-void wxBrush::SetStyle(int Style)
+wxBitmap *wxBrush::GetStipple() const

 {
 {

-    Unshare();
+    wxCHECK_MSG( Ok(), NULL, _T("invalid brush") );

 
 

-    M_BRUSHDATA->m_style = Style;
-
-    RealizeResource();
+    return M_BRUSHDATA->GetStipple();

 }
 
 }
 

-void wxBrush::SetStipple(const wxBitmap& Stipple)
+// ----------------------------------------------------------------------------
+// wxBrush setters
+// ----------------------------------------------------------------------------
+
+void wxBrush::SetColour(const wxColour& col)

 {
 {

-    Unshare();
+    AllocExclusive();

 
 

-    M_BRUSHDATA->m_stipple = Stipple;
+    M_BRUSHDATA->SetColour(col);
+}

 
 

-    RealizeResource();
+void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b)
+{
+    AllocExclusive();
+
+    M_BRUSHDATA->SetColour(wxColour(r, g, b));

 }
 
 }
 

-bool wxBrush::RealizeResource()
+void wxBrush::SetStyle(wxBrushStyle style)

 {
 {

-    return TRUE;
+    AllocExclusive();
+
+    M_BRUSHDATA->SetStyle(style);

 }
 
 }
 

+void wxBrush::SetStipple(const wxBitmap& stipple)
+{
+    AllocExclusive();
+
+    M_BRUSHDATA->SetStipple(stipple);
+}