Fix Ok/IsOk() mess in wxGDIObject-derived classes; also added
wxGDIObject::Create/CloneGDIRefData() and implemented them for (almost) all ports git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -44,10 +44,8 @@ public:
|
||||
|
||||
virtual ~wxColour();
|
||||
|
||||
bool IsOk() const { return m_refData != NULL; }
|
||||
|
||||
bool operator == ( const wxColour& col ) const;
|
||||
bool operator != ( const wxColour& col ) const { return !(*this == col); }
|
||||
bool operator==(const wxColour& col) const;
|
||||
bool operator!=(const wxColour& col) const { return !(*this == col); }
|
||||
|
||||
unsigned char Red() const;
|
||||
unsigned char Green() const;
|
||||
@@ -60,9 +58,8 @@ public:
|
||||
WXColor *GetColor() const;
|
||||
|
||||
protected:
|
||||
// ref counting code
|
||||
virtual wxObjectRefData *CreateRefData() const;
|
||||
virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
|
||||
virtual wxGDIRefData *CreateGDIRefData() const;
|
||||
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
|
||||
|
||||
virtual void
|
||||
InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
|
||||
@@ -73,6 +70,4 @@ private:
|
||||
DECLARE_DYNAMIC_CLASS(wxColour)
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
// _WX_COLOUR_H_
|
||||
#endif // _WX_COLOUR_H_
|
||||
|
Reference in New Issue
Block a user