correct access for virtuals

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h
index 87004ed23a10626f84757a62e4e346439787994a..7f0693dca00e0ed7d4d3c01f4344bb0a59896d63 100644 (file)
--- a/include/wx/gtk/colour.h
+++ b/include/wx/gtk/colour.h
@@ -43,8 +43,6 @@ public:
 
     ~wxColour();
 
 
     ~wxColour();
 

-    virtual bool FromString(const wxChar *str);
-

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


@@ -64,6 +62,7 @@ protected:
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 

+    virtual bool FromString(const wxChar *str);

     virtual void InitWith( unsigned char red, unsigned char green, unsigned char blue );
 
 private:
     virtual void InitWith( unsigned char red, unsigned char green, unsigned char blue );
 
 private:

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index 689a81c2554bf6a58db301669a0c1a6263233528..0a9090c82151003cd4833d9c3006182ea014ed59 100644 (file)
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -156,6 +156,7 @@ public:
     virtual bool IsOwnGtkWindow( GdkWindow *window );
     void ConnectWidget( GtkWidget *widget );
 
     virtual bool IsOwnGtkWindow( GdkWindow *window );
     void ConnectWidget( GtkWidget *widget );
 

+protected:

     // Override GTKWidgetNeedsMnemonic and return true if your
     // needs to set its mnemonic widget, such as for a 
     // GtkLabel for wxStaticText, then do the actual
     // Override GTKWidgetNeedsMnemonic and return true if your
     // needs to set its mnemonic widget, such as for a 
     // GtkLabel for wxStaticText, then do the actual


@@ -163,6 +164,7 @@ public:
     virtual bool GTKWidgetNeedsMnemonic() const;
     virtual void GTKWidgetDoSetMnemonic(GtkWidget* w);
 
     virtual bool GTKWidgetNeedsMnemonic() const;
     virtual void GTKWidgetDoSetMnemonic(GtkWidget* w);
 

+public:

     // Returns the default context which usually is anti-aliased
     PangoContext   *GtkGetPangoDefaultContext();
 
     // Returns the default context which usually is anti-aliased
     PangoContext   *GtkGetPangoDefaultContext();
 

diff --git a/include/wx/x11/colour.h b/include/wx/x11/colour.h
index 8f1b3a631f58a31cd3723cf7fc4f00d71626dc31..502886f31fe19cc89417f5262b4910ebb43b405c 100644 (file)
--- a/include/wx/x11/colour.h
+++ b/include/wx/x11/colour.h
@@ -44,8 +44,6 @@ public:
 
     ~wxColour();
 
 
     ~wxColour();
 

-    virtual bool FromString(const wxChar *str);
-

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


@@ -66,6 +64,7 @@ protected:
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 

+    virtual bool FromString(const wxChar *str);

     virtual void InitWith( unsigned char red, unsigned char green, unsigned char blue );
 
 private:
     virtual void InitWith( unsigned char red, unsigned char green, unsigned char blue );
 
 private: