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

Merge branch 'statictext-setlabel'

Browse Source 
wxControl label-related fixes and improvements.

See https://github.com/wxWidgets/wxWidgets/pull/1364
This commit is contained in:
Vadim Zeitlin
2019-07-08 10:09:49 +02:00
parent 1f9dd05797 958521183a
commit 4a6f16cf15
21 changed files with 238 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/gtk/stattext.h
View File

@@ -49,8 +49,8 @@ protected:
virtual wxSize DoGetBestSize() const wxOVERRIDE;
virtual wxString DoGetLabel() const wxOVERRIDE;
virtual void DoSetLabel(const wxString& str) wxOVERRIDE;
virtual wxString WXGetVisibleLabel() const wxOVERRIDE;
virtual void WXSetVisibleLabel(const wxString& str) wxOVERRIDE;
#if wxUSE_MARKUP
virtual bool DoSetLabelMarkup(const wxString& markup) wxOVERRIDE;
#endif // wxUSE_MARKUP