Merge branch 'statictext-setlabel'

wxControl label-related fixes and improvements.

See https://github.com/wxWidgets/wxWidgets/pull/1364

include/wx/qt/stattext.h

@@ -31,10 +31,13 @@ public:
                 const wxString &name = wxStaticTextNameStr );
 
     virtual void SetLabel(const wxString& label) wxOVERRIDE;
-    virtual wxString GetLabel() const wxOVERRIDE;
 
     virtual QWidget *GetHandle() const wxOVERRIDE;
 
+protected:
+    virtual wxString WXGetVisibleLabel() const wxOVERRIDE;
+    virtual void WXSetVisibleLabel(const wxString& str) wxOVERRIDE;
+
 private:
     QLabel *m_qtLabel;