wxBrushBase between wxBrush and wxGDIObject (class follows wxFontBase model).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-12-03 15:31:31 +00:00
parent 7a4d2469f9
commit cb9d5bd07e
13 changed files with 44 additions and 60 deletions

View File

@@ -30,7 +30,7 @@ typedef enum
} wxMacBrushKind ;
// Brush
class WXDLLEXPORT wxBrush: public wxGDIObject
class WXDLLEXPORT wxBrush: public wxBrushBase
{
DECLARE_DYNAMIC_CLASS(wxBrush)
@@ -40,7 +40,7 @@ public:
wxBrush(const wxColour& col, int style = wxSOLID);
wxBrush(const wxBitmap& stipple);
wxBrush(const wxBrush& brush)
: wxGDIObject()
: wxBrushBase()
{ Ref(brush); }
~wxBrush();
@@ -63,12 +63,9 @@ public:
unsigned long GetMacThemeBackground(WXRECTPTR extent) const ;
short GetMacTheme() const ;
wxColour& GetColour() const ;
int GetStyle() const ;
virtual int GetStyle() const ;
wxBitmap *GetStipple() const ;
bool IsHatch() const
{ return (GetStyle()>=wxBDIAGONAL_HATCH) && (GetStyle()<=wxVERTICAL_HATCH); }
virtual bool Ok() const { return (m_refData != NULL) ; }
// Implementation