Use "_x64" instead of "amd64" for x64 MSW makefile builds.

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

diff --git a/include/wx/os2/brush.h b/include/wx/os2/brush.h
index 0f5760083634db156f745625923d7d446affa243..c13dcf00fb70e70103b615790a0ad3bf4fbfd16f 100644 (file)
--- a/include/wx/os2/brush.h
+++ b/include/wx/os2/brush.h
@@ -12,11 +12,10 @@
 #ifndef _WX_BRUSH_H_
 #define _WX_BRUSH_H_
 
-class WXDLLIMPEXP_FWD_CORE wxColour;
-class WXDLLIMPEXP_FWD_CORE wxBitmap;
+#include "wx/bitmap.h"
 
 // Brush
-class WXDLLEXPORT wxBrush: public wxBrushBase
+class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase
 {
 public:
     wxBrush();
@@ -37,10 +36,15 @@ public:
     virtual void SetStipple(const wxBitmap& rStipple);
 
     wxColour GetColour(void) const;
-    virtual wxBrushStyle GetStyle(void) const;
+    wxBrushStyle GetStyle(void) const;
     wxBitmap* GetStipple(void) const;
     int       GetPS(void) const;
 
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+        { SetStyle((wxBrushStyle)style); }
+#endif
+
     //
     // Implementation
     //