add GetLabel/SetLabel implementation to wxWindowX11, the function just store the label string, but do nothing with it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77826 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -48,8 +48,9 @@ public:
|
||||
virtual void Raise();
|
||||
virtual void Lower();
|
||||
|
||||
virtual void SetLabel(const wxString& label);
|
||||
virtual wxString GetLabel() const;
|
||||
// SetLabel(), which does nothing in wxWindow
|
||||
virtual void SetLabel(const wxString& label) wxOVERRIDE { m_Label = label; }
|
||||
virtual wxString GetLabel() const wxOVERRIDE { return m_Label; }
|
||||
|
||||
virtual bool Show( bool show = true );
|
||||
virtual bool Enable( bool enable = true );
|
||||
@@ -187,6 +188,8 @@ private:
|
||||
// common part of all ctors
|
||||
void Init();
|
||||
|
||||
wxString m_Label;
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxWindowX11)
|
||||
wxDECLARE_NO_COPY_CLASS(wxWindowX11);
|
||||
DECLARE_EVENT_TABLE()
|
||||
|
@@ -934,7 +934,6 @@ MyFrame::MyFrame(wxWindow* parent,
|
||||
Name(wxT("test11")).Caption(wxT("Fixed Pane")).
|
||||
Bottom().Layer(1).Position(2).Fixed());
|
||||
|
||||
|
||||
m_mgr.AddPane(new SettingsPanel(this,this), wxAuiPaneInfo().
|
||||
Name(wxT("settings")).Caption(wxT("Dock Manager Settings")).
|
||||
Dockable(false).Float().Hide());
|
||||
|
@@ -527,17 +527,6 @@ void wxWindowX11::Lower()
|
||||
XLowerWindow( wxGlobalDisplay(), (Window) m_mainWindow );
|
||||
}
|
||||
|
||||
void wxWindowX11::SetLabel(const wxString& WXUNUSED(label))
|
||||
{
|
||||
// TODO
|
||||
}
|
||||
|
||||
wxString wxWindowX11::GetLabel() const
|
||||
{
|
||||
// TODO
|
||||
return wxEmptyString;
|
||||
}
|
||||
|
||||
void wxWindowX11::DoCaptureMouse()
|
||||
{
|
||||
if ((g_captureWindow != NULL) && (g_captureWindow != this))
|
||||
|
Reference in New Issue
Block a user