From fe6b43a36e8c641c86404cd9369ad3f1402d1546 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 4 Aug 2001 22:36:19 +0000 Subject: [PATCH] reverted my Set/getTitle change git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/window.h | 5 ----- include/wx/gtk1/window.h | 5 ----- include/wx/mgl/window.h | 4 ---- include/wx/window.h | 4 ++-- 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h index fde824a7b1..e648eb9815 100644 --- a/include/wx/gtk/window.h +++ b/include/wx/gtk/window.h @@ -48,8 +48,6 @@ 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(); @@ -215,9 +213,6 @@ 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 fde824a7b1..e648eb9815 100644 --- a/include/wx/gtk1/window.h +++ b/include/wx/gtk1/window.h @@ -48,8 +48,6 @@ 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(); @@ -215,9 +213,6 @@ 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/mgl/window.h b/include/wx/mgl/window.h index d507ca3689..4cd53c3d27 100644 --- a/include/wx/mgl/window.h +++ b/include/wx/mgl/window.h @@ -103,14 +103,10 @@ public: virtual WXWidget GetHandle() const { return m_wnd; } - virtual void SetTitle(const wxString& title) { m_title = title; } - virtual wxString GetTitle() const { return m_title; } - // implementation from now on // -------------------------- protected: - wxString m_title; // the window handle struct window_t *m_wnd; // whether there should be wxEraseEvent before wxPaintEvent or not diff --git a/include/wx/window.h b/include/wx/window.h index bdc25cdb64..e403a1ea05 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 ) = 0; - virtual wxString GetTitle() const = 0; + virtual void SetTitle( const wxString& WXUNUSED(title) ) {} + virtual wxString GetTitle() const { return wxEmptyString; } // label is just the same as the title (but for, e.g., buttons it // makes more sense to speak about labels) -- 2.45.2