use wxString, not wxChar*, in wxDataFormat ctor and SetId() method

[wxWidgets.git] / include / wx / mac / brush.h

diff --git a/include/wx/mac/brush.h b/include/wx/mac/brush.h
index 9be385ab7ab7808c5dabe83e596f581e090f88db..e910b1fac7d3cf09c708e7731ece0d60ad4a7c26 100644 (file)
--- a/include/wx/mac/brush.h
+++ b/include/wx/mac/brush.h
@@ -1,90 +1,5 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        brush.h
-// Purpose:     wxBrush class
-// Author:      AUTHOR
-// Modified by:
-// Created:     ??/??/98
-// RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_BRUSH_H_
-#define _WX_BRUSH_H_
-
-#ifdef __GNUG__
-#pragma interface "brush.h"
+#ifdef __WXMAC_CLASSIC__
+#include "wx/mac/classic/brush.h"
+#else
+#include "wx/mac/carbon/brush.h"

 #endif
 #endif

-
-#include "wx/gdicmn.h"
-#include "wx/gdiobj.h"
-#include "wx/bitmap.h"
-
-class WXDLLEXPORT wxBrush;
-
-class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
-{
-    friend class WXDLLEXPORT wxBrush;
-public:
-    wxBrushRefData();
-    wxBrushRefData(const wxBrushRefData& data);
-    ~wxBrushRefData();
-
-protected:
-    int           m_style;
-    wxBitmap      m_stipple ;
-    wxColour      m_colour;
-    bool          m_isMacTheme ;
-    ThemeBrush    m_macThemeBrush ;
-    bool          m_isMacThemeBackground ;
-    ThemeBackgroundKind m_macThemeBackground ;
-};
-
-#define M_BRUSHDATA ((wxBrushRefData *)m_refData)
-
-// Brush
-class WXDLLEXPORT wxBrush: public wxGDIObject
-{
-  DECLARE_DYNAMIC_CLASS(wxBrush)
-
-public:
-  wxBrush();
-  wxBrush(ThemeBrush macThemeBrush ) ;
-  wxBrush(const wxColour& col, int style);
-  wxBrush(const wxBitmap& stipple);
-  inline wxBrush(const wxBrush& brush) { Ref(brush); }
-  ~wxBrush();
-
-  virtual void SetColour(const wxColour& col)  ;
-  virtual void SetColour(unsigned char r, unsigned char g, unsigned char b)  ;
-  virtual void SetStyle(int style)  ;
-  virtual void SetStipple(const wxBitmap& stipple)  ;
-  virtual void SetMacTheme(ThemeBrush macThemeBrush) ;
-  virtual void SetMacThemeBackground(ThemeBackgroundKind macThemeBackground ) ;
-
-  inline wxBrush& operator = (const wxBrush& brush) { if (*this == brush) return (*this); Ref(brush); return *this; }
-  inline bool operator == (const wxBrush& brush) { return m_refData == brush.m_refData; }
-  inline bool operator != (const wxBrush& brush) { return m_refData != brush.m_refData; }
-
-  inline bool IsMacTheme()  const { return (M_BRUSHDATA ? M_BRUSHDATA->m_isMacTheme : false); };
-  inline bool IsMacThemeBackground()  const { return (M_BRUSHDATA ? M_BRUSHDATA->m_isMacThemeBackground : false); };
-  inline ThemeBackgroundKind GetMacThemeBackground()  const { return (M_BRUSHDATA ? ( M_BRUSHDATA->m_isMacThemeBackground ? M_BRUSHDATA->m_macThemeBackground : 0) : 0); };
-  inline ThemeBrush GetMacTheme()  const { return (M_BRUSHDATA ? ( M_BRUSHDATA->m_isMacTheme ? M_BRUSHDATA->m_macThemeBrush : kThemeBrushBlack) : kThemeBrushBlack); };
-  inline wxColour& GetColour() const { return (M_BRUSHDATA ? M_BRUSHDATA->m_colour : wxNullColour); };
-  inline int GetStyle() const { return (M_BRUSHDATA ? M_BRUSHDATA->m_style : 0); };
-  inline wxBitmap *GetStipple() const { return (M_BRUSHDATA ? & M_BRUSHDATA->m_stipple : 0); };
-
-  virtual bool Ok() const { return (m_refData != NULL) ; }
-
-// Implementation
-
-  // Useful helper: create the brush resource
-  bool RealizeResource();
-
-  // When setting properties, we must make sure we're not changing
-  // another object
-  void Unshare();
-};
-
-#endif
-    // _WX_BRUSH_H_