Rebake from clean wx tree.

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

diff --git a/include/wx/brush.h b/include/wx/brush.h
index fa0103cf4d6322be21682843d0bd61e5db5ede3c..9eb0a4c7e1d1a2236ae49fe3e1a790dad9839e03 100644 (file)
--- a/include/wx/brush.h
+++ b/include/wx/brush.h
@@ -55,11 +55,6 @@ public:
 
     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__)


@@ -113,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)