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/generic/stattextg.h
View File

@@ -54,8 +54,8 @@ public:
protected:
virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
virtual wxString DoGetLabel() const wxOVERRIDE { return m_label; }
virtual void DoSetLabel(const wxString& label) wxOVERRIDE;
virtual wxString WXGetVisibleLabel() const wxOVERRIDE { return m_label; }
virtual void WXSetVisibleLabel(const wxString& label) wxOVERRIDE;
void DoSetSize(int x, int y, int width, int height, int sizeFlags) wxOVERRIDE;