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

Make wxQt build again, with less compiler warnings

Browse Source 
This fixes a missing include in qt/nonownedwnd.cpp and a missing method
in qt/glcanvas.cpp, allowing the build to complete again. A number of
missing wxOVERRIDE statements were added to reduce the important number of
compiler warnings about those missing labels.
This commit is contained in:
R.J.V. Bertin
2017-11-05 22:56:57 +01:00
committed by Vadim Zeitlin
parent 1c249a6934
commit 3da6b9c14f
6 changed files with 77 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/wx/qt/combobox.h
View File

@@ -52,18 +52,18 @@ public:
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr);
virtual void SetSelection(int n) { wxChoice::SetSelection(n); }
virtual void SetSelection(long from, long to);
virtual void SetSelection(int n) wxOVERRIDE { wxChoice::SetSelection(n); }
virtual void SetSelection(long from, long to) wxOVERRIDE;
virtual int GetSelection() const { return wxChoice::GetSelection(); }
virtual void GetSelection(long *from, long *to) const;
virtual int GetSelection() const wxOVERRIDE { return wxChoice::GetSelection(); }
virtual void GetSelection(long *from, long *to) const wxOVERRIDE;
virtual wxString GetStringSelection() const
virtual wxString GetStringSelection() const wxOVERRIDE
{
return wxItemContainer::GetStringSelection();
}
virtual void Clear()
virtual void Clear() wxOVERRIDE
{
wxTextEntry::Clear();
wxItemContainer::Clear();
@@ -79,7 +79,7 @@ public:
protected:
// From wxTextEntry:
virtual wxString DoGetValue() const;
virtual wxString DoGetValue() const wxOVERRIDE;
private: