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

add GetLabel/SetLabel implementation to wxWindowX11, the function just store the label string, but do nothing with it

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77826 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-09-23 17:42:33 +00:00
parent 31f0808ee2
commit cc3acf904b
3 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/x11/window.h
View File

@@ -48,8 +48,9 @@ public:
virtual void Raise(); virtual void Raise();
virtual void Lower(); virtual void Lower();
virtual void SetLabel(const wxString& label); // SetLabel(), which does nothing in wxWindow
virtual wxString GetLabel() const; 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 Show( bool show = true );
virtual bool Enable( bool enable = true ); virtual bool Enable( bool enable = true );
@@ -187,6 +188,8 @@ private:
// common part of all ctors // common part of all ctors
void Init(); void Init();
wxString m_Label;
DECLARE_DYNAMIC_CLASS(wxWindowX11) DECLARE_DYNAMIC_CLASS(wxWindowX11)
wxDECLARE_NO_COPY_CLASS(wxWindowX11); wxDECLARE_NO_COPY_CLASS(wxWindowX11);
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()

1
samples/aui/auidemo.cpp
View File

@@ -934,7 +934,6 @@ MyFrame::MyFrame(wxWindow* parent,
Name(wxT("test11")).Caption(wxT("Fixed Pane")). Name(wxT("test11")).Caption(wxT("Fixed Pane")).
Bottom().Layer(1).Position(2).Fixed()); Bottom().Layer(1).Position(2).Fixed());
m_mgr.AddPane(new SettingsPanel(this,this), wxAuiPaneInfo(). m_mgr.AddPane(new SettingsPanel(this,this), wxAuiPaneInfo().
Name(wxT("settings")).Caption(wxT("Dock Manager Settings")). Name(wxT("settings")).Caption(wxT("Dock Manager Settings")).
Dockable(false).Float().Hide()); Dockable(false).Float().Hide());

11
src/x11/window.cpp
View File

@@ -527,17 +527,6 @@ void wxWindowX11::Lower()
XLowerWindow( wxGlobalDisplay(), (Window) m_mainWindow ); XLowerWindow( wxGlobalDisplay(), (Window) m_mainWindow );
} }
void wxWindowX11::SetLabel(const wxString& WXUNUSED(label))
{
// TODO
}
wxString wxWindowX11::GetLabel() const
{
// TODO
return wxEmptyString;
}
void wxWindowX11::DoCaptureMouse() void wxWindowX11::DoCaptureMouse()
{ {
if ((g_captureWindow != NULL) && (g_captureWindow != this)) if ((g_captureWindow != NULL) && (g_captureWindow != this))