Rebake from clean wx tree.

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

diff --git a/include/wx/os2/brush.h b/include/wx/os2/brush.h
index 14169df062d8919c4939b6e3a4437f65cc3db8de..c13dcf00fb70e70103b615790a0ad3bf4fbfd16f 100644 (file)
--- a/include/wx/os2/brush.h
+++ b/include/wx/os2/brush.h
@@ -15,7 +15,7 @@
 #include "wx/bitmap.h"
 
 // Brush
 #include "wx/bitmap.h"
 
 // Brush

-class WXDLLEXPORT wxBrush: public wxBrushBase
+class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase

 {
 public:
     wxBrush();
 {
 public:
     wxBrush();


@@ -36,10 +36,15 @@ public:
     virtual void SetStipple(const wxBitmap& rStipple);
 
     wxColour GetColour(void) const;
     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;
 
     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
     //
     //
     // Implementation
     //