]> git.saurik.com Git - wxWidgets.git/blame_incremental - include/wx/brush.h
Remove deprecated methods
[wxWidgets.git] / include / wx / brush.h
... / ...
CommitLineData
1/////////////////////////////////////////////////////////////////////////////
2// Name: wx/brush.h
3// Purpose: Includes platform-specific wxBrush file
4// Author: Julian Smart
5// Modified by:
6// Created:
7// RCS-ID: $Id$
8// Copyright: Julian Smart
9// Licence: wxWindows Licence
10/////////////////////////////////////////////////////////////////////////////
11
12#ifndef _WX_BRUSH_H_BASE_
13#define _WX_BRUSH_H_BASE_
14
15#include "wx/defs.h"
16#include "wx/object.h"
17#include "wx/gdiobj.h"
18#include "wx/gdicmn.h" // for wxGDIObjListBase
19
20// NOTE: these values cannot be combined together!
21enum wxBrushStyle
22{
23 wxBRUSHSTYLE_INVALID = -1,
24
25 wxBRUSHSTYLE_SOLID = wxSOLID,
26 wxBRUSHSTYLE_TRANSPARENT = wxTRANSPARENT,
27 wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE = wxSTIPPLE_MASK_OPAQUE,
28 wxBRUSHSTYLE_STIPPLE_MASK = wxSTIPPLE_MASK,
29 wxBRUSHSTYLE_STIPPLE = wxSTIPPLE,
30 wxBRUSHSTYLE_BDIAGONAL_HATCH = wxBDIAGONAL_HATCH,
31 wxBRUSHSTYLE_CROSSDIAG_HATCH = wxCROSSDIAG_HATCH,
32 wxBRUSHSTYLE_FDIAGONAL_HATCH = wxFDIAGONAL_HATCH,
33 wxBRUSHSTYLE_CROSS_HATCH = wxCROSS_HATCH,
34 wxBRUSHSTYLE_HORIZONTAL_HATCH = wxHORIZONTAL_HATCH,
35 wxBRUSHSTYLE_VERTICAL_HATCH = wxVERTICAL_HATCH,
36 wxBRUSHSTYLE_FIRST_HATCH = wxFIRST_HATCH,
37 wxBRUSHSTYLE_LAST_HATCH = wxLAST_HATCH
38};
39
40
41// wxBrushBase
42class WXDLLIMPEXP_CORE wxBrushBase: public wxGDIObject
43{
44public:
45 virtual ~wxBrushBase() { }
46
47 virtual void SetColour(const wxColour& col) = 0;
48 virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) = 0;
49 virtual void SetStyle(wxBrushStyle style) = 0;
50 virtual void SetStipple(const wxBitmap& stipple) = 0;
51
52 virtual wxColour GetColour() const = 0;
53 virtual wxBrushStyle GetStyle() const = 0;
54 virtual wxBitmap *GetStipple() const = 0;
55
56 virtual bool IsHatch() const
57 { return (GetStyle()>=wxBRUSHSTYLE_FIRST_HATCH) && (GetStyle()<=wxBRUSHSTYLE_LAST_HATCH); }
58
59#if FUTURE_WXWIN_COMPATIBILITY_3_0
60 wxDEPRECATED_FUTURE( void SetStyle(int style) )
61 { SetStyle((wxBrushStyle)style); }
62#endif
63};
64
65#if defined(__WXPALMOS__)
66 #include "wx/palmos/brush.h"
67#elif defined(__WXMSW__)
68 #include "wx/msw/brush.h"
69#elif defined(__WXMOTIF__) || defined(__WXX11__)
70 #include "wx/x11/brush.h"
71#elif defined(__WXGTK20__)
72 #include "wx/gtk/brush.h"
73#elif defined(__WXGTK__)
74 #include "wx/gtk1/brush.h"
75#elif defined(__WXMGL__)
76 #include "wx/mgl/brush.h"
77#elif defined(__WXDFB__)
78 #include "wx/dfb/brush.h"
79#elif defined(__WXMAC__)
80 #include "wx/mac/brush.h"
81#elif defined(__WXCOCOA__)
82 #include "wx/cocoa/brush.h"
83#elif defined(__WXPM__)
84 #include "wx/os2/brush.h"
85#endif
86
87class WXDLLIMPEXP_CORE wxBrushList: public wxGDIObjListBase
88{
89public:
90 wxBrush *FindOrCreateBrush(const wxColour& colour,
91 wxBrushStyle style = wxBRUSHSTYLE_SOLID);
92
93#if FUTURE_WXWIN_COMPATIBILITY_3_0
94 wxBrush *FindOrCreateBrush(const wxColour& colour, int style)
95 { return FindOrCreateBrush(colour, (wxBrushStyle)style); }
96#endif
97
98#if WXWIN_COMPATIBILITY_2_6
99 wxDEPRECATED( void AddBrush(wxBrush*) );
100 wxDEPRECATED( void RemoveBrush(wxBrush*) );
101#endif
102};
103
104extern WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList;
105
106// provide comparison operators to allow code such as
107//
108// if ( brush.GetStyle() == wxTRANSPARENT )
109//
110// to compile without warnings which it would otherwise provoke from some
111// compilers as it compares elements of different enums
112#if FUTURE_WXWIN_COMPATIBILITY_3_0
113
114inline bool operator==(wxBrushStyle s, wxDeprecatedGUIConstants t)
115{
116 return wx_static_cast(int, s) == wx_static_cast(int, t);
117}
118
119inline bool operator!=(wxBrushStyle s, wxDeprecatedGUIConstants t)
120{
121 return !(s == t);
122}
123
124#endif // FUTURE_WXWIN_COMPATIBILITY_3_0
125
126#endif // _WX_BRUSH_H_BASE_