Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correct access for virtuals

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2006-05-05 17:04:48 +00:00
parent 51f5e2822c
commit cb3db09022
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/gtk/colour.h
View File

@@ -43,8 +43,6 @@ public:
~wxColour(); ~wxColour();
virtual bool FromString(const wxChar *str);
bool Ok() const { return m_refData != NULL; } bool Ok() const { return m_refData != NULL; }
bool operator == ( const wxColour& col ) const; bool operator == ( const wxColour& col ) const;
@@ -64,6 +62,7 @@ protected:
virtual wxObjectRefData *CreateRefData() const; virtual wxObjectRefData *CreateRefData() const;
virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) 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 ); virtual void InitWith( unsigned char red, unsigned char green, unsigned char blue );
private: private:

2
include/wx/gtk/window.h
View File

@@ -156,6 +156,7 @@ public:
virtual bool IsOwnGtkWindow( GdkWindow *window ); virtual bool IsOwnGtkWindow( GdkWindow *window );
void ConnectWidget( GtkWidget *widget ); void ConnectWidget( GtkWidget *widget );
protected:
// Override GTKWidgetNeedsMnemonic and return true if your // Override GTKWidgetNeedsMnemonic and return true if your
// needs to set its mnemonic widget, such as for a // needs to set its mnemonic widget, such as for a
// GtkLabel for wxStaticText, then do the actual // GtkLabel for wxStaticText, then do the actual
@@ -163,6 +164,7 @@ public:
virtual bool GTKWidgetNeedsMnemonic() const; virtual bool GTKWidgetNeedsMnemonic() const;
virtual void GTKWidgetDoSetMnemonic(GtkWidget* w); virtual void GTKWidgetDoSetMnemonic(GtkWidget* w);
public:
// Returns the default context which usually is anti-aliased // Returns the default context which usually is anti-aliased
PangoContext *GtkGetPangoDefaultContext(); PangoContext *GtkGetPangoDefaultContext();

3
include/wx/x11/colour.h
View File

@@ -44,8 +44,6 @@ public:
~wxColour(); ~wxColour();
virtual bool FromString(const wxChar *str);
bool Ok() const { return m_refData != NULL; } bool Ok() const { return m_refData != NULL; }
bool operator == ( const wxColour& col ) const; bool operator == ( const wxColour& col ) const;
@@ -66,6 +64,7 @@ protected:
virtual wxObjectRefData *CreateRefData() const; virtual wxObjectRefData *CreateRefData() const;
virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) 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 ); virtual void InitWith( unsigned char red, unsigned char green, unsigned char blue );
private: private: