fixed linking with visibility enabled on Ubuntu and some other systems (any gcc 4...

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 28627daa0a0c372aea30da30f8a5a394c6a3fadb..feb49285500ffe697e131d1afaf4408e58bff6b8 100644 (file)
--- a/include/wx/generic/colour.h
+++ b/include/wx/generic/colour.h
@@ -33,7 +33,6 @@ public:
     virtual ~wxColour();
 
     // accessors
     virtual ~wxColour();
 
     // accessors

-    bool Ok() const { return IsOk(); }

     bool IsOk() const { return m_isInit; }
 
     unsigned char Red() const { return m_red; }
     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 8eb61124f3dc14a0ea2ba4fd67f957b1e10eb8c2..ae9e22fdcd2844b2ec981deb1fefe0bf2eb5a7a0 100644 (file)
--- a/include/wx/gtk1/colour.h
+++ b/include/wx/gtk1/colour.h
@@ -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 operator == ( const wxColour& col ) const;
     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 156e22d81e5977cd81acef3b7fd944d335ac44c0..7dbf36376454c1b929ecea884647d06e08a95a5d 100644 (file)
--- a/include/wx/mac/carbon/colour.h
+++ b/include/wx/mac/carbon/colour.h
@@ -34,7 +34,6 @@ public:
     virtual ~wxColour();
 
     // accessors
     virtual ~wxColour();
 
     // accessors

-    bool Ok() const { return IsOk(); }

     bool IsOk() const;
 
     ChannelType Red() const { return m_red; }
     bool IsOk() const;
 
     ChannelType Red() const { return m_red; }

diff --git a/include/wx/motif/colour.h b/include/wx/motif/colour.h
index 3f628a90d69a011e5f3d1a53cfc7f53c58ec3411..9c8bb43a4275db193796b9e5c1a7bd121a870f9b 100644 (file)
--- a/include/wx/motif/colour.h
+++ b/include/wx/motif/colour.h
@@ -36,7 +36,6 @@ public:
 
 
     // accessors
 
 
     // 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; }
     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 c3854f50b8475c65eb0d48eab1ca42ae627dae79..64adfe9c3fbe07c81553f6253188e7ef2d5ed899 100644 (file)
--- a/include/wx/msw/colour.h
+++ b/include/wx/msw/colour.h
@@ -36,7 +36,6 @@ public:
     // accessors
     // ---------
 
     // accessors
     // ---------
 

-    bool Ok() const { return IsOk(); }

     bool IsOk() const { return m_isInit; }
 
     unsigned char Red() const { return m_red; }
     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 f0538eab36e6d8025ddd9e9eceb49982d3c390cb..02b7fc00df0bedae5cd40ab6605c2aab470c262f 100644 (file)
--- a/include/wx/os2/colour.h
+++ b/include/wx/os2/colour.h
@@ -34,7 +34,6 @@ public:
     virtual ~wxColour();
 
     // Accessors
     virtual ~wxColour();
 
     // Accessors

-    bool Ok() const { return IsOk(); }

     bool IsOk(void) const {return m_bIsInit; }
 
     unsigned char Red(void) const { return m_cRed; }
     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 4ae37558b6ddf2e37bd98637630da9106ba2c31d..249520c8e448a77945f92eefed9f4cb3cde47798 100644 (file)
--- a/include/wx/x11/colour.h
+++ b/include/wx/x11/colour.h
@@ -44,7 +44,6 @@ public:
 
     virtual ~wxColour();
 
 
     virtual ~wxColour();
 

-    bool Ok() const { return IsOk(); }

     bool IsOk() const { return m_refData != NULL; }
 
     bool operator == ( const wxColour& col ) const;
     bool IsOk() const { return m_refData != NULL; }
 
     bool operator == ( const wxColour& col ) const;