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

Declare wxSearchCtrl::{Set,Get}DescriptiveText() in the base class

Browse Source 
Fix a trivial "TODO" remaining from 2.8 days and declare the functions
that are part of the public control API as pure virtuals in the base
class.

No real changes.
This commit is contained in:
Vadim Zeitlin
2018-01-27 13:38:47 +01:00
parent 7d6b44687f
commit 8ee3394e5e
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/generic/srchctlg.h
View File

@@ -61,9 +61,8 @@ public:
virtual void ShowCancelButton( bool show ) wxOVERRIDE; virtual void ShowCancelButton( bool show ) wxOVERRIDE;
virtual bool IsCancelButtonVisible() const wxOVERRIDE; virtual bool IsCancelButtonVisible() const wxOVERRIDE;
// TODO: In 2.9 these should probably be virtual, and declared in the base class... virtual void SetDescriptiveText(const wxString& text) wxOVERRIDE;
void SetDescriptiveText(const wxString& text); virtual wxString GetDescriptiveText() const wxOVERRIDE;
wxString GetDescriptiveText() const;
// accessors // accessors
// --------- // ---------

5
include/wx/osx/srchctrl.h
View File

@@ -54,9 +54,8 @@ public:
virtual void ShowCancelButton( bool show ) wxOVERRIDE; virtual void ShowCancelButton( bool show ) wxOVERRIDE;
virtual bool IsCancelButtonVisible() const wxOVERRIDE; virtual bool IsCancelButtonVisible() const wxOVERRIDE;
// TODO: In 2.9 these should probably be virtual, and declared in the base class... virtual void SetDescriptiveText(const wxString& text) wxOVERRIDE;
void SetDescriptiveText(const wxString& text); virtual wxString GetDescriptiveText() const wxOVERRIDE;
wxString GetDescriptiveText() const;
virtual bool HandleSearchFieldSearchHit() ; virtual bool HandleSearchFieldSearchHit() ;
virtual bool HandleSearchFieldCancelHit() ; virtual bool HandleSearchFieldCancelHit() ;

3
include/wx/srchctrl.h
View File

@@ -68,6 +68,9 @@ public:
virtual void ShowCancelButton( bool show ) = 0; virtual void ShowCancelButton( bool show ) = 0;
virtual bool IsCancelButtonVisible() const = 0; virtual bool IsCancelButtonVisible() const = 0;
virtual void SetDescriptiveText(const wxString& text) = 0;
virtual wxString GetDescriptiveText() const = 0;
private: private:
// implement wxTextEntry pure virtual method // implement wxTextEntry pure virtual method
virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; } virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; }