Move wxCheckBoxNameStr declarations to wx/tglbtn.h from wx/port/tglbtn.h.

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

diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h
index 8554818c23a785d34ec918420fb3a42e33902e32..d4ddc8d813ee591276331d3683c7139e2ea2e3d6 100644 (file)
--- a/include/wx/msw/brush.h
+++ b/include/wx/msw/brush.h
@@ -12,21 +12,22 @@
 #ifndef _WX_BRUSH_H_
 #define _WX_BRUSH_H_
 
 #ifndef _WX_BRUSH_H_
 #define _WX_BRUSH_H_
 

-#include "wx/gdicmn.h"
-#include "wx/gdiobj.h"
-#include "wx/bitmap.h"
-

 class WXDLLIMPEXP_FWD_CORE wxBrush;
 class WXDLLIMPEXP_FWD_CORE wxBrush;

+class WXDLLIMPEXP_FWD_CORE wxColour;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;

 
 // ----------------------------------------------------------------------------
 // wxBrush
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxBrush
 // ----------------------------------------------------------------------------
 

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

 {
 public:
     wxBrush();
     wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
 {
 public:
     wxBrush();
     wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID);

+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) );
+#endif

     wxBrush(const wxBitmap& stipple);
     virtual ~wxBrush();
 
     wxBrush(const wxBitmap& stipple);
     virtual ~wxBrush();
 


@@ -39,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;