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

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)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-08-02 23:32:27 +00:00
parent a643192e96
commit a264ece2c5
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,6 +48,9 @@ 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();
virtual void Raise(); virtual void Raise();
@@ -212,6 +215,9 @@ 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;

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

@@ -48,6 +48,9 @@ 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();
virtual void Raise(); virtual void Raise();
@@ -212,6 +215,9 @@ 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;

7
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 ) { m_title = title; } virtual void SetTitle( const wxString& title ) = 0;
virtual wxString GetTitle() const { return m_title; } virtual wxString GetTitle() const = 0;
// 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)
@@ -787,9 +787,6 @@ protected:
// its siblings unless it is -1 // its siblings unless it is -1
wxWindowID m_windowId; wxWindowID m_windowId;
// the window label
wxString m_title;
// the parent window of this window (or NULL) and the list of the children // the parent window of this window (or NULL) and the list of the children
// of this window // of this window
wxWindow *m_parent; wxWindow *m_parent;