projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
synchronize GTK2 minimum version in docs
[wxWidgets.git]
/
include
/
wx
/
msw
/
brush.h
diff --git
a/include/wx/msw/brush.h
b/include/wx/msw/brush.h
index d034e59cd4120a294704346414c260ea884c0385..d4ddc8d813ee591276331d3683c7139e2ea2e3d6 100644
(file)
--- a/
include/wx/msw/brush.h
+++ b/
include/wx/msw/brush.h
@@
-12,57
+12,51
@@
#ifndef _WX_BRUSH_H_
#define _WX_BRUSH_H_
#ifndef _WX_BRUSH_H_
#define _WX_BRUSH_H_
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma interface "brush.h"
-#endif
-
-#include "wx/gdicmn.h"
-#include "wx/gdiobj.h"
-#include "wx/bitmap.h"
-
-class WXDLLEXPORT wxBrush;
+class WXDLLIMPEXP_FWD_CORE wxBrush;
+class WXDLLIMPEXP_FWD_CORE wxColour;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
// ----------------------------------------------------------------------------
// wxBrush
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// wxBrush
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT wxBrush : public wxGDIObject
+class WXDLL
IMPEXP_CORE wxBrush : public wxBrushBase
{
public:
wxBrush();
{
public:
wxBrush();
- wxBrush(const wxColour& col, int style = wxSOLID);
+ 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);
wxBrush(const wxBitmap& stipple);
- wxBrush(const wxBrush& brush) : wxGDIObject(brush) { Ref(brush); }
virtual ~wxBrush();
virtual void SetColour(const wxColour& col);
virtual void SetColour(unsigned char r, unsigned char g, unsigned char b);
virtual ~wxBrush();
virtual void SetColour(const wxColour& col);
virtual void SetColour(unsigned char r, unsigned char g, unsigned char b);
- virtual void SetStyle(
int
style);
+ virtual void SetStyle(
wxBrushStyle
style);
virtual void SetStipple(const wxBitmap& stipple);
virtual void SetStipple(const wxBitmap& stipple);
- wxBrush& operator=(const wxBrush& brush);
bool operator==(const wxBrush& brush) const;
bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
wxColour GetColour() const;
bool operator==(const wxBrush& brush) const;
bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
wxColour GetColour() const;
-
int
GetStyle() const;
+
wxBrushStyle
GetStyle() const;
wxBitmap *GetStipple() const;
wxBitmap *GetStipple() const;
- bool IsHatch() const
- { return (GetStyle()>=wxBDIAGONAL_HATCH) && (GetStyle()<=wxVERTICAL_HATCH); }
-
- bool Ok() const { return m_refData != NULL; }
+#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;
protected:
// return the HBRUSH for this brush
virtual WXHANDLE GetResourceHandle() const;
protected:
- virtual wx
ObjectRefData *Create
RefData() const;
- virtual wx
ObjectRefData *CloneRefData(const wxObject
RefData *data) const;
+ virtual wx
GDIRefData *CreateGDI
RefData() const;
+ virtual wx
GDIRefData *CloneGDIRefData(const wxGDI
RefData *data) const;
private:
DECLARE_DYNAMIC_CLASS(wxBrush)
};
private:
DECLARE_DYNAMIC_CLASS(wxBrush)
};
-#endif
- // _WX_BRUSH_H_
+#endif // _WX_BRUSH_H_