reverted my Set/getTitle change

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

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index fde824a7b1498a9e1111a96b26d9b3a521d166cd..e648eb9815cd2b1cc7d0e8817f5f4292178c8b6f 100644 (file)
--- 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 fde824a7b1498a9e1111a96b26d9b3a521d166cd..e648eb9815cd2b1cc7d0e8817f5f4292178c8b6f 100644 (file)
--- 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 d507ca36894fadabd825ee54945474a022f134c3..4cd53c3d278c75ec0e34703265f4071c63772384 100644 (file)
--- 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 bdc25cdb64282bc1879cf07b1b50aab5fb9f8331..e403a1ea05c4ffe3d07508eda75b33da6d5102d5 100644 (file)
--- 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)