projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
enum wxWebViewBackend has been removed.
[wxWidgets.git]
/
include
/
wx
/
msw
/
brush.h
diff --git
a/include/wx/msw/brush.h
b/include/wx/msw/brush.h
index 621b0c28c7de0f7f4692a90b0124b0beb7833dae..d4ddc8d813ee591276331d3683c7139e2ea2e3d6 100644
(file)
--- a/
include/wx/msw/brush.h
+++ b/
include/wx/msw/brush.h
@@
-20,11
+20,14
@@
class WXDLLIMPEXP_FWD_CORE wxBitmap;
// wxBrush
// ----------------------------------------------------------------------------
// wxBrush
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxBrush : public wxBrushBase
+class WXDLL
IMPEXP_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();
@@
-37,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;