added wxColourBase::Init() and use DEFINE_STD_WXCOLOUR_CONSTRUCTORS() in all ports now (patch 1851600)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -23,16 +23,8 @@ class WXDLLEXPORT wxColour : public wxColourBase
|
||||
public:
|
||||
// constructors
|
||||
// ------------
|
||||
|
||||
// default
|
||||
wxColour() { Init(); }
|
||||
DEFINE_STD_WXCOLOUR_CONSTRUCTORS
|
||||
|
||||
|
||||
// dtor
|
||||
virtual ~wxColour();
|
||||
|
||||
|
||||
// accessors
|
||||
// ---------
|
||||
|
||||
@@ -53,11 +45,10 @@ public:
|
||||
&& m_alpha == colour.m_alpha;
|
||||
}
|
||||
|
||||
bool operator != (const wxColour& colour) const { return !(*this == colour); }
|
||||
bool operator!=(const wxColour& colour) const { return !(*this == colour); }
|
||||
|
||||
WXCOLORREF GetPixel() const { return m_pixel; }
|
||||
|
||||
|
||||
public:
|
||||
WXCOLORREF m_pixel;
|
||||
|
||||
@@ -79,5 +70,4 @@ private:
|
||||
DECLARE_DYNAMIC_CLASS(wxColour)
|
||||
};
|
||||
|
||||
#endif
|
||||
// _WX_COLOUR_H_
|
||||
#endif // _WX_COLOUR_H_
|
||||
|
Reference in New Issue
Block a user