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

reverted my Set/getTitle change

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-08-04 22:36:19 +00:00
parent b496583bb1
commit fe6b43a36e
4 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,8 +48,6 @@ public:
// implement base class (pure) virtual methods // 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 bool Destroy();
@@ -215,9 +213,6 @@ public:
// wxMDIFrame, wxNotebook etc. this is the callback that will get used. // wxMDIFrame, wxNotebook etc. this is the callback that will get used.
wxInsertChildFunction m_insertCallback; wxInsertChildFunction m_insertCallback;
// the window label
wxString m_title;
// implement the base class pure virtuals // implement the base class pure virtuals
virtual void DoClientToScreen( int *x, int *y ) const; virtual void DoClientToScreen( int *x, int *y ) const;
virtual void DoScreenToClient( int *x, int *y ) const; virtual void DoScreenToClient( int *x, int *y ) const;

5
include/wx/gtk1/window.h
View File

@@ -48,8 +48,6 @@ public:
// implement base class (pure) virtual methods // 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 bool Destroy();
@@ -215,9 +213,6 @@ public:
// wxMDIFrame, wxNotebook etc. this is the callback that will get used. // wxMDIFrame, wxNotebook etc. this is the callback that will get used.
wxInsertChildFunction m_insertCallback; wxInsertChildFunction m_insertCallback;
// the window label
wxString m_title;
// implement the base class pure virtuals // implement the base class pure virtuals
virtual void DoClientToScreen( int *x, int *y ) const; virtual void DoClientToScreen( int *x, int *y ) const;
virtual void DoScreenToClient( int *x, int *y ) const; virtual void DoScreenToClient( int *x, int *y ) const;

4
include/wx/mgl/window.h
View File

@@ -103,14 +103,10 @@ public:
virtual WXWidget GetHandle() const { return m_wnd; } 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 // implementation from now on
// -------------------------- // --------------------------
protected: protected:
wxString m_title;
// the window handle // the window handle
struct window_t *m_wnd; struct window_t *m_wnd;
// whether there should be wxEraseEvent before wxPaintEvent or not // whether there should be wxEraseEvent before wxPaintEvent or not

4
include/wx/window.h
View File

@@ -172,8 +172,8 @@ public:
// the title (or label, see below) of the window: the text which the // the title (or label, see below) of the window: the text which the
// window shows // window shows
virtual void SetTitle( const wxString& title ) = 0; virtual void SetTitle( const wxString& WXUNUSED(title) ) {}
virtual wxString GetTitle() const = 0; virtual wxString GetTitle() const { return wxEmptyString; }
// label is just the same as the title (but for, e.g., buttons it // label is just the same as the title (but for, e.g., buttons it
// makes more sense to speak about labels) // makes more sense to speak about labels)