From a264ece2c5b95171a222f37b856df9af2577f3bf Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Thu, 2 Aug 2001 23:32:27 +0000 Subject: [PATCH] Set/GetTitle out of wxWindowBase, forked and put to gtk/window.h and mgl/window.h (and no, we can't get rid of them completely unless Vadim stops using them in wxUniv) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/window.h | 6 ++++++ include/wx/gtk1/window.h | 6 ++++++ include/wx/window.h | 7 ++----- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h index 8fafeca033..fde824a7b1 100644 --- a/include/wx/gtk/window.h +++ b/include/wx/gtk/window.h @@ -48,6 +48,9 @@ public: // implement base class (pure) virtual methods // ------------------------------------------- + virtual void SetTitle( const wxString& title ) { m_title = title; } + virtual wxString GetTitle() const { return m_title; } + virtual bool Destroy(); virtual void Raise(); @@ -212,6 +215,9 @@ public: // wxMDIFrame, wxNotebook etc. this is the callback that will get used. wxInsertChildFunction m_insertCallback; + // the window label + wxString m_title; + // implement the base class pure virtuals virtual void DoClientToScreen( int *x, int *y ) const; virtual void DoScreenToClient( int *x, int *y ) const; diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h index 8fafeca033..fde824a7b1 100644 --- a/include/wx/gtk1/window.h +++ b/include/wx/gtk1/window.h @@ -48,6 +48,9 @@ public: // implement base class (pure) virtual methods // ------------------------------------------- + virtual void SetTitle( const wxString& title ) { m_title = title; } + virtual wxString GetTitle() const { return m_title; } + virtual bool Destroy(); virtual void Raise(); @@ -212,6 +215,9 @@ public: // wxMDIFrame, wxNotebook etc. this is the callback that will get used. wxInsertChildFunction m_insertCallback; + // the window label + wxString m_title; + // implement the base class pure virtuals virtual void DoClientToScreen( int *x, int *y ) const; virtual void DoScreenToClient( int *x, int *y ) const; diff --git a/include/wx/window.h b/include/wx/window.h index fb8971a94c..bdc25cdb64 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -172,8 +172,8 @@ public: // the title (or label, see below) of the window: the text which the // window shows - virtual void SetTitle( const wxString& title ) { m_title = title; } - virtual wxString GetTitle() const { return m_title; } + virtual void SetTitle( const wxString& title ) = 0; + virtual wxString GetTitle() const = 0; // label is just the same as the title (but for, e.g., buttons it // makes more sense to speak about labels) @@ -787,9 +787,6 @@ protected: // its siblings unless it is -1 wxWindowID m_windowId; - // the window label - wxString m_title; - // the parent window of this window (or NULL) and the list of the children // of this window wxWindow *m_parent; -- 2.45.2