X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..7bd30a12ade503fd135c686ecc98a6f6d5fecbeb:/include/wx/palmos/brush.h?ds=sidebyside

diff --git a/include/wx/palmos/brush.h b/include/wx/palmos/brush.h
index 6d45ab0298..3625ad9fd5 100644
--- a/include/wx/palmos/brush.h
+++ b/include/wx/palmos/brush.h
@@ -22,39 +22,43 @@ class WXDLLIMPEXP_FWD_CORE wxBrush;
 // wxBrush
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxBrush : public wxBrushBase
+class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase
 {
 public:
     wxBrush();
-    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);
 
     bool operator==(const wxBrush& brush) const;
     bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
 
     wxColour GetColour() const;
-    virtual int GetStyle() const;
+    wxBrushStyle GetStyle() const;
     wxBitmap *GetStipple() const;
 
-    bool Ok() const { return IsOk(); }
-    bool IsOk() const { return m_refData != NULL; }
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+        { SetStyle((wxBrushStyle)style); }
+#endif
 
     // return the HBRUSH for this brush
     virtual WXHANDLE GetResourceHandle() const;
 
 protected:
-    virtual wxObjectRefData *CreateRefData() const;
-    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxBrush)
 };
 
-#endif
-    // _WX_BRUSH_H_
+#endif // _WX_BRUSH_H_