From: Václav Slavík <vslavik@fastmail.fm>
Date: Tue, 27 Nov 2007 20:37:06 +0000 (+0000)
Subject: fixed linking with visibility enabled on Ubuntu and some other systems (any gcc 4... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b150bffc9e137b1fbcb29592512642f65ed331f2

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
---

diff --git a/include/wx/generic/colour.h b/include/wx/generic/colour.h
index 28627daa0a..feb4928550 100644
--- a/include/wx/generic/colour.h
+++ b/include/wx/generic/colour.h
@@ -33,7 +33,6 @@ public:
     virtual ~wxColour();
 
     // accessors
-    bool Ok() const { return IsOk(); }
     bool IsOk() const { return m_isInit; }
 
     unsigned char Red() const { return m_red; }
diff --git a/include/wx/gtk1/colour.h b/include/wx/gtk1/colour.h
index 8eb61124f3..ae9e22fdcd 100644
--- a/include/wx/gtk1/colour.h
+++ b/include/wx/gtk1/colour.h
@@ -45,7 +45,6 @@ public:
 
     virtual bool FromString(const wxString& str);
 
-    bool Ok() const { return IsOk(); }
     bool IsOk() const { return m_refData != NULL; }
 
     bool operator == ( const wxColour& col ) const;
diff --git a/include/wx/mac/carbon/colour.h b/include/wx/mac/carbon/colour.h
index 156e22d81e..7dbf363764 100644
--- a/include/wx/mac/carbon/colour.h
+++ b/include/wx/mac/carbon/colour.h
@@ -34,7 +34,6 @@ public:
     virtual ~wxColour();
 
     // accessors
-    bool Ok() const { return IsOk(); }
     bool IsOk() const;
 
     ChannelType Red() const { return m_red; }
diff --git a/include/wx/motif/colour.h b/include/wx/motif/colour.h
index 3f628a90d6..9c8bb43a42 100644
--- a/include/wx/motif/colour.h
+++ b/include/wx/motif/colour.h
@@ -36,7 +36,6 @@ public:
 
 
     // accessors
-    bool Ok() const { return IsOk(); }
     bool IsOk() const {return m_isInit; }
     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }
diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h
index c3854f50b8..64adfe9c3f 100644
--- a/include/wx/msw/colour.h
+++ b/include/wx/msw/colour.h
@@ -36,7 +36,6 @@ public:
     // accessors
     // ---------
 
-    bool Ok() const { return IsOk(); }
     bool IsOk() const { return m_isInit; }
 
     unsigned char Red() const { return m_red; }
diff --git a/include/wx/os2/colour.h b/include/wx/os2/colour.h
index f0538eab36..02b7fc00df 100644
--- a/include/wx/os2/colour.h
+++ b/include/wx/os2/colour.h
@@ -34,7 +34,6 @@ public:
     virtual ~wxColour();
 
     // Accessors
-    bool Ok() const { return IsOk(); }
     bool IsOk(void) const {return m_bIsInit; }
 
     unsigned char Red(void) const { return m_cRed; }
diff --git a/include/wx/x11/colour.h b/include/wx/x11/colour.h
index 4ae37558b6..249520c8e4 100644
--- a/include/wx/x11/colour.h
+++ b/include/wx/x11/colour.h
@@ -44,7 +44,6 @@ public:
 
     virtual ~wxColour();
 
-    bool Ok() const { return IsOk(); }
     bool IsOk() const { return m_refData != NULL; }
 
     bool operator == ( const wxColour& col ) const;