Skeleton for generic Drag code

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

diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h
index 646372e9c04f76b2d099e153b11fe49b32290fe8..d4ddc8d813ee591276331d3683c7139e2ea2e3d6 100644 (file)
--- a/include/wx/msw/brush.h
+++ b/include/wx/msw/brush.h
@@ -20,7 +20,7 @@ class WXDLLIMPEXP_FWD_CORE wxBitmap;
 // wxBrush
 // ----------------------------------------------------------------------------
 
 // wxBrush
 // ----------------------------------------------------------------------------
 

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

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


@@ -40,9 +40,14 @@ public:
     bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
 
     wxColour GetColour() const;
     bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
 
     wxColour GetColour() const;

-    virtual wxBrushStyle GetStyle() const;
+    wxBrushStyle GetStyle() const;

     wxBitmap *GetStipple() const;
 
     wxBitmap *GetStipple() const;
 

+#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;
 
     // return the HBRUSH for this brush
     virtual WXHANDLE GetResourceHandle() const;