Rebake from clean wx tree.

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

diff --git a/include/wx/brush.h b/include/wx/brush.h
index 033ace1dd8599e4100e5136da040d7ad6acddc9e..9eb0a4c7e1d1a2236ae49fe3e1a790dad9839e03 100644 (file)
--- a/include/wx/brush.h
+++ b/include/wx/brush.h
@@ -44,15 +44,17 @@ class WXDLLIMPEXP_CORE wxBrushBase: public wxGDIObject
 public:
     virtual ~wxBrushBase() { }
 
 public:
     virtual ~wxBrushBase() { }
 

+    virtual void SetColour(const wxColour& col) = 0;
+    virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) = 0;
+    virtual void SetStyle(wxBrushStyle style) = 0;
+    virtual void SetStipple(const wxBitmap& stipple) = 0;
+
+    virtual wxColour GetColour() const = 0;

     virtual wxBrushStyle GetStyle() const = 0;
     virtual wxBrushStyle GetStyle() const = 0;

+    virtual wxBitmap *GetStipple() const = 0;

 
     virtual bool IsHatch() const
         { return (GetStyle()>=wxBRUSHSTYLE_FIRST_HATCH) && (GetStyle()<=wxBRUSHSTYLE_LAST_HATCH); }
 
     virtual bool IsHatch() const
         { return (GetStyle()>=wxBRUSHSTYLE_FIRST_HATCH) && (GetStyle()<=wxBRUSHSTYLE_LAST_HATCH); }

-
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
-        { SetStyle((wxBrushStyle)style); }
-#endif

 };
 
 #if defined(__WXPALMOS__)
 };
 
 #if defined(__WXPALMOS__)


@@ -70,7 +72,7 @@ public:
 #elif defined(__WXDFB__)
     #include "wx/dfb/brush.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXDFB__)
     #include "wx/dfb/brush.h"
 #elif defined(__WXMAC__)

-    #include "wx/mac/brush.h"
+    #include "wx/osx/brush.h"

 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/brush.h"
 #elif defined(__WXPM__)
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/brush.h"
 #elif defined(__WXPM__)


@@ -106,7 +108,7 @@ extern WXDLLIMPEXP_DATA_CORE(wxBrushList*)   wxTheBrushList;
 
 inline bool operator==(wxBrushStyle s, wxDeprecatedGUIConstants t)
 {
 
 inline bool operator==(wxBrushStyle s, wxDeprecatedGUIConstants t)
 {

-    return wx_static_cast(int, s) == wx_static_cast(int, t);
+    return static_cast<int>(s) == static_cast<int>(t);

 }
 
 inline bool operator!=(wxBrushStyle s, wxDeprecatedGUIConstants t)
 }
 
 inline bool operator!=(wxBrushStyle s, wxDeprecatedGUIConstants t)