fixed linking with visibility enabled on Ubuntu and some other systems (any gcc 4.2 amd64?) by removing superfluous virtual wxColour::Ok() (already in wxColourBase) -- do this in all ports, not just wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50284 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -33,7 +33,6 @@ public:
|
|||||||
virtual ~wxColour();
|
virtual ~wxColour();
|
||||||
|
|
||||||
// accessors
|
// accessors
|
||||||
bool Ok() const { return IsOk(); }
|
|
||||||
bool IsOk() const { return m_isInit; }
|
bool IsOk() const { return m_isInit; }
|
||||||
|
|
||||||
unsigned char Red() const { return m_red; }
|
unsigned char Red() const { return m_red; }
|
||||||
|
@@ -45,7 +45,6 @@ public:
|
|||||||
|
|
||||||
virtual bool FromString(const wxString& str);
|
virtual bool FromString(const wxString& str);
|
||||||
|
|
||||||
bool Ok() const { return IsOk(); }
|
|
||||||
bool IsOk() const { return m_refData != NULL; }
|
bool IsOk() const { return m_refData != NULL; }
|
||||||
|
|
||||||
bool operator == ( const wxColour& col ) const;
|
bool operator == ( const wxColour& col ) const;
|
||||||
|
@@ -34,7 +34,6 @@ public:
|
|||||||
virtual ~wxColour();
|
virtual ~wxColour();
|
||||||
|
|
||||||
// accessors
|
// accessors
|
||||||
bool Ok() const { return IsOk(); }
|
|
||||||
bool IsOk() const;
|
bool IsOk() const;
|
||||||
|
|
||||||
ChannelType Red() const { return m_red; }
|
ChannelType Red() const { return m_red; }
|
||||||
|
@@ -36,7 +36,6 @@ public:
|
|||||||
|
|
||||||
|
|
||||||
// accessors
|
// accessors
|
||||||
bool Ok() const { return IsOk(); }
|
|
||||||
bool IsOk() const {return m_isInit; }
|
bool IsOk() const {return m_isInit; }
|
||||||
unsigned char Red() const { return m_red; }
|
unsigned char Red() const { return m_red; }
|
||||||
unsigned char Green() const { return m_green; }
|
unsigned char Green() const { return m_green; }
|
||||||
|
@@ -36,7 +36,6 @@ public:
|
|||||||
// accessors
|
// accessors
|
||||||
// ---------
|
// ---------
|
||||||
|
|
||||||
bool Ok() const { return IsOk(); }
|
|
||||||
bool IsOk() const { return m_isInit; }
|
bool IsOk() const { return m_isInit; }
|
||||||
|
|
||||||
unsigned char Red() const { return m_red; }
|
unsigned char Red() const { return m_red; }
|
||||||
|
@@ -34,7 +34,6 @@ public:
|
|||||||
virtual ~wxColour();
|
virtual ~wxColour();
|
||||||
|
|
||||||
// Accessors
|
// Accessors
|
||||||
bool Ok() const { return IsOk(); }
|
|
||||||
bool IsOk(void) const {return m_bIsInit; }
|
bool IsOk(void) const {return m_bIsInit; }
|
||||||
|
|
||||||
unsigned char Red(void) const { return m_cRed; }
|
unsigned char Red(void) const { return m_cRed; }
|
||||||
|
@@ -44,7 +44,6 @@ public:
|
|||||||
|
|
||||||
virtual ~wxColour();
|
virtual ~wxColour();
|
||||||
|
|
||||||
bool Ok() const { return IsOk(); }
|
|
||||||
bool IsOk() const { return m_refData != NULL; }
|
bool IsOk() const { return m_refData != NULL; }
|
||||||
|
|
||||||
bool operator == ( const wxColour& col ) const;
|
bool operator == ( const wxColour& col ) const;
|
||||||
|
Reference in New Issue
Block a user