From cb3db09022512bcbb6c6c41dd6859ab9245186a1 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Fri, 5 May 2006 17:04:48 +0000 Subject: [PATCH] correct access for virtuals git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/colour.h | 3 +-- include/wx/gtk/window.h | 2 ++ include/wx/x11/colour.h | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h index 87004ed23a..7f0693dca0 100644 --- a/include/wx/gtk/colour.h +++ b/include/wx/gtk/colour.h @@ -43,8 +43,6 @@ public: ~wxColour(); - virtual bool FromString(const wxChar *str); - 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 bool FromString(const wxChar *str); 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 689a81c255..0a9090c821 100644 --- 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 ); +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 @@ -163,6 +164,7 @@ public: virtual bool GTKWidgetNeedsMnemonic() const; virtual void GTKWidgetDoSetMnemonic(GtkWidget* w); +public: // 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 8f1b3a631f..502886f31f 100644 --- a/include/wx/x11/colour.h +++ b/include/wx/x11/colour.h @@ -44,8 +44,6 @@ public: ~wxColour(); - virtual bool FromString(const wxChar *str); - 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 bool FromString(const wxChar *str); virtual void InitWith( unsigned char red, unsigned char green, unsigned char blue ); private: -- 2.47.2