diff --git a/include/wx/x11/window.h b/include/wx/x11/window.h
index a1b62407ac..d17038204c 100644
--- a/include/wx/x11/window.h
+++ b/include/wx/x11/window.h
@@ -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()
diff --git a/samples/aui/auidemo.cpp b/samples/aui/auidemo.cpp
index 2b5c6f5be0..cefffcc5ec 100644
--- a/samples/aui/auidemo.cpp
+++ b/samples/aui/auidemo.cpp
@@ -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());
diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index 419423bdec..afaf857530 100644
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -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))