pen and brush are platform neutral on osx

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

diff --git a/src/osx/carbon/brush.cpp b/src/osx/carbon/brush.cpp
deleted file mode 100644 (file)
index d7ec6a3..0000000
--- a/src/osx/carbon/brush.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/mac/carbon/brush.cpp
-// Purpose:     wxBrush
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// RCS-ID:      $Id$
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#include "wx/brush.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/utils.h"
-#endif
-
-#include "wx/osx/private.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
-
-class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
-{
-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)
-    : wxGDIRefData() ,
-        m_stipple(data.m_stipple),
-        m_colour(data.m_colour),
-        m_style(data.m_style)
-{
-}
-
-wxBrushRefData::~wxBrushRefData()
-{
-}
-
-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()
-{
-}
-
-wxBrush::wxBrush(const wxColour& col, wxBrushStyle style)
-{
-    m_refData = new wxBrushRefData( col, style );
-}
-
-#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)
-{
-    m_refData = new wxBrushRefData( stipple );
-}
-
-// ----------------------------------------------------------------------------
-// wxBrush house keeping stuff
-// ----------------------------------------------------------------------------
-
-bool wxBrush::operator==(const wxBrush& brush) const
-{
-    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;
-}
-
-wxGDIRefData *wxBrush::CreateGDIRefData() const
-{
-    return new wxBrushRefData;
-}
-
-wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const
-{
-    return new wxBrushRefData(*(const wxBrushRefData *)data);
-}
-
-// ----------------------------------------------------------------------------
-// wxBrush accessors
-// ----------------------------------------------------------------------------
-
-wxColour wxBrush::GetColour() const
-{
-    wxCHECK_MSG( Ok(), wxNullColour, _T("invalid brush") );
-
-    return M_BRUSHDATA->GetColour();
-}
-
-wxBrushStyle wxBrush::GetStyle() const
-{
-    wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, _T("invalid brush") );
-
-    return M_BRUSHDATA->GetStyle();
-}
-
-wxBitmap *wxBrush::GetStipple() const
-{
-    wxCHECK_MSG( Ok(), NULL, _T("invalid brush") );
-
-    return M_BRUSHDATA->GetStipple();
-}
-
-// ----------------------------------------------------------------------------
-// wxBrush setters
-// ----------------------------------------------------------------------------
-
-void wxBrush::SetColour(const wxColour& col)
-{
-    AllocExclusive();
-
-    M_BRUSHDATA->SetColour(col);
-}
-
-void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b)
-{
-    AllocExclusive();
-
-    M_BRUSHDATA->SetColour(wxColour(r, g, b));
-}
-
-void wxBrush::SetStyle(wxBrushStyle style)
-{
-    AllocExclusive();
-
-    M_BRUSHDATA->SetStyle(style);
-}
-
-void wxBrush::SetStipple(const wxBitmap& stipple)
-{
-    AllocExclusive();
-
-    M_BRUSHDATA->SetStipple(stipple);
-}