reverted my Set/getTitle change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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;
|
||||
|
@@ -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;
|
||||
|
@@ -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
|
||||
|
@@ -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)
|
||||
|
Reference in New Issue
Block a user