removed extra wxCalendarCtrl:: which is ignored by MSVC for some reason but breaks...

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

diff --git a/include/wx/mac/carbon/brush.h b/include/wx/mac/carbon/brush.h
index 6f6bbb4ba6256527b197e35814cb10c9bd2062a9..0d4d1c558630d50ee4101c96e070274b0c81818e 100644 (file)
--- a/include/wx/mac/carbon/brush.h
+++ b/include/wx/mac/carbon/brush.h
@@ -18,55 +18,36 @@
 
 class WXDLLIMPEXP_FWD_CORE wxBrush;
 
-typedef enum
-{
-    kwxMacBrushColour ,
-    kwxMacBrushTheme ,
-    kwxMacBrushThemeBackground
-} wxMacBrushKind ;
-
 // Brush
-class WXDLLEXPORT wxBrush: public wxBrushBase
+class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase
 {
-    DECLARE_DYNAMIC_CLASS(wxBrush)
-
 public:
     wxBrush();
-    wxBrush(short macThemeBrush ) ;
-    wxBrush(const wxColour& col, int style = wxSOLID);
+    wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) );
+#endif
     wxBrush(const wxBitmap& stipple);
     virtual ~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 SetStyle(wxBrushStyle style)  ;
     virtual void SetStipple(const wxBitmap& stipple)  ;
-    virtual void MacSetTheme(short macThemeBrush) ;
-// TODO REMOVE    virtual void MacSetThemeBackground(unsigned long macThemeBackground ,  WXRECTPTR extent) ;
 
-    bool operator == (const wxBrush& brush) const;
-    bool operator != (const wxBrush& brush) const
-        { return !(*this == brush); }
+    bool operator==(const wxBrush& brush) const;
+    bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
 
-    wxMacBrushKind MacGetBrushKind()  const ;
-
-// TODO REMOVE    unsigned long MacGetThemeBackground(WXRECTPTR extent)  const ;
-    short MacGetTheme()  const ;
-    wxColour& GetColour() const ;
-    virtual int GetStyle() const ;
+    wxColour GetColour() const;
+    wxBrushStyle GetStyle() const ;
     wxBitmap *GetStipple() const ;
 
-    virtual bool Ok() const { return IsOk(); }
-    virtual bool IsOk() const { return (m_refData != NULL) ; }
-
-// Implementation
-
-    // Useful helper: create the brush resource
-    bool RealizeResource();
+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
 private:
-    void Unshare();
+    DECLARE_DYNAMIC_CLASS(wxBrush)
 };
 
-#endif
-    // _WX_BRUSH_H_
+#endif // _WX_BRUSH_H_