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

Addition of missing overrides in dirdlgg.h and filedlgg.h

Browse Source
This commit is contained in:
Hartwig
2015-11-22 09:54:05 +01:00
parent c09ff65f7e
commit b67c5a9395
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/generic/dirdlgg.h
View File

@@ -54,12 +54,12 @@ public:
const wxString& name = wxDirDialogNameStr); const wxString& name = wxDirDialogNameStr);
//// Accessors //// Accessors
void SetPath(const wxString& path); void SetPath(const wxString& path) wxOVERRIDE;
wxString GetPath() const; wxString GetPath() const wxOVERRIDE;
//// Overrides //// Overrides
virtual int ShowModal(); virtual int ShowModal() wxOVERRIDE;
virtual void EndModal(int retCode); virtual void EndModal(int retCode) wxOVERRIDE;
// this one is specific to wxGenericDirDialog // this one is specific to wxGenericDirDialog
wxTextCtrl* GetInputCtrl() const { return m_input; } wxTextCtrl* GetInputCtrl() const { return m_input; }

32
include/wx/generic/filedlgg.h
View File

@@ -60,39 +60,39 @@ public:
virtual ~wxGenericFileDialog(); virtual ~wxGenericFileDialog();
virtual void SetDirectory(const wxString& dir) virtual void SetDirectory(const wxString& dir) wxOVERRIDE
{ m_filectrl->SetDirectory(dir); } { m_filectrl->SetDirectory(dir); }
virtual void SetFilename(const wxString& name) virtual void SetFilename(const wxString& name) wxOVERRIDE
{ m_filectrl->SetFilename(name); } { m_filectrl->SetFilename(name); }
virtual void SetMessage(const wxString& message) { SetTitle(message); } virtual void SetMessage(const wxString& message) wxOVERRIDE { SetTitle(message); }
virtual void SetPath(const wxString& path) virtual void SetPath(const wxString& path) wxOVERRIDE
{ m_filectrl->SetPath(path); } { m_filectrl->SetPath(path); }
virtual void SetFilterIndex(int filterIndex) virtual void SetFilterIndex(int filterIndex) wxOVERRIDE
{ m_filectrl->SetFilterIndex(filterIndex); } { m_filectrl->SetFilterIndex(filterIndex); }
virtual void SetWildcard(const wxString& wildCard) virtual void SetWildcard(const wxString& wildCard) wxOVERRIDE
{ m_filectrl->SetWildcard(wildCard); } { m_filectrl->SetWildcard(wildCard); }
virtual wxString GetPath() const virtual wxString GetPath() const wxOVERRIDE
{ return m_filectrl->GetPath(); } { return m_filectrl->GetPath(); }
virtual void GetPaths(wxArrayString& paths) const virtual void GetPaths(wxArrayString& paths) const wxOVERRIDE
{ m_filectrl->GetPaths(paths); } { m_filectrl->GetPaths(paths); }
virtual wxString GetDirectory() const virtual wxString GetDirectory() const wxOVERRIDE
{ return m_filectrl->GetDirectory(); } { return m_filectrl->GetDirectory(); }
virtual wxString GetFilename() const virtual wxString GetFilename() const wxOVERRIDE
{ return m_filectrl->GetFilename(); } { return m_filectrl->GetFilename(); }
virtual void GetFilenames(wxArrayString& files) const virtual void GetFilenames(wxArrayString& files) const wxOVERRIDE
{ m_filectrl->GetFilenames(files); } { m_filectrl->GetFilenames(files); }
virtual wxString GetWildcard() const virtual wxString GetWildcard() const wxOVERRIDE
{ return m_filectrl->GetWildcard(); } { return m_filectrl->GetWildcard(); }
virtual int GetFilterIndex() const virtual int GetFilterIndex() const wxOVERRIDE
{ return m_filectrl->GetFilterIndex(); } { return m_filectrl->GetFilterIndex(); }
virtual bool SupportsExtraControl() const { return true; } virtual bool SupportsExtraControl() const wxOVERRIDE { return true; }
// implementation only from now on // implementation only from now on
// ------------------------------- // -------------------------------
virtual int ShowModal(); virtual int ShowModal() wxOVERRIDE;
virtual bool Show( bool show = true ); virtual bool Show( bool show = true ) wxOVERRIDE;
void OnList( wxCommandEvent &event ); void OnList( wxCommandEvent &event );
void OnReport( wxCommandEvent &event ); void OnReport( wxCommandEvent &event );