Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add more pure virtuals to wxBrushBase; fix the GetColour() functions to return a wxColour object and not a reference; remove from docs the non-existent SetColour(const wxString&) overloads

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-03-28 16:47:58 +00:00
parent 1f1d2182ff
commit 231b9591aa
37 changed files with 79 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
interface/brush.h
View File

@@ -137,7 +137,7 @@ public:
@see SetColour()
*/
wxColour& GetColour() const;
virtual wxColour GetColour() const;
/**
Gets a pointer to the stipple bitmap. If the brush does not have a wxBRUSHSTYLE_STIPPLE
@@ -145,7 +145,7 @@ public:
@see SetStipple()
*/
wxBitmap* GetStipple() const;
virtual wxBitmap* GetStipple() const;
/**
Returns the brush style, one of the ::wxBrushStyle values.
@@ -174,9 +174,8 @@ public:
@see GetColour()
*/
void SetColour(wxColour& colour);
void SetColour(const wxString& colourName);
void SetColour(unsigned char red, unsigned char green, unsigned char blue);
virtual void SetColour(wxColour& colour);
virtual void SetColour(unsigned char red, unsigned char green, unsigned char blue);
//@}
/**
@@ -191,7 +190,7 @@ public:
@see wxBitmap
*/
void SetStipple(const wxBitmap& bitmap);
virtual void SetStipple(const wxBitmap& bitmap);
/**
Sets the brush style.
@@ -201,7 +200,7 @@ public:
@see GetStyle()
*/
void SetStyle(wxBrushStyle style);
virtual void SetStyle(wxBrushStyle style);
/**
Inequality operator.