wxWindowBase remembers title/label now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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 & WXUNUSED(title) ) { }
|
virtual void SetTitle( const wxString& title ) { m_title = title; }
|
||||||
virtual wxString GetTitle() const { return ""; }
|
virtual wxString GetTitle() const { return m_title; }
|
||||||
|
|
||||||
// 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)
|
||||||
@@ -786,6 +786,9 @@ protected:
|
|||||||
// the window id - a number which uniquely identifies a window among
|
// the window id - a number which uniquely identifies a window among
|
||||||
// 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
|
||||||
@@ -996,7 +999,7 @@ private:
|
|||||||
#define sm_classwxWindowGTK sm_classwxWindow
|
#define sm_classwxWindowGTK sm_classwxWindow
|
||||||
#endif // wxUniv
|
#endif // wxUniv
|
||||||
#include "wx/gtk/window.h"
|
#include "wx/gtk/window.h"
|
||||||
#elif defined(__WXGL__)
|
#elif defined(__WXMGL__)
|
||||||
#ifdef __WXUNIVERSAL__
|
#ifdef __WXUNIVERSAL__
|
||||||
#define wxWindowNative wxWindowMGL
|
#define wxWindowNative wxWindowMGL
|
||||||
#else // !wxUniv
|
#else // !wxUniv
|
||||||
|
Reference in New Issue
Block a user