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

Supress SetFocus() warning in wxVListBoxComboPopup

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2010-05-09 10:29:48 +00:00
parent 008809c73c
commit c0c05e79b2
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/odcombo.h
View File

@@ -80,6 +80,7 @@ public:
// required virtuals // required virtuals
virtual void Init(); virtual void Init();
virtual bool Create(wxWindow* parent); virtual bool Create(wxWindow* parent);
virtual void SetFocus();
virtual wxWindow *GetControl() { return this; } virtual wxWindow *GetControl() { return this; }
virtual void SetStringValue( const wxString& value ); virtual void SetStringValue( const wxString& value );
virtual wxString GetStringValue() const; virtual wxString GetStringValue() const;

12
src/generic/odcombo.cpp
View File

@@ -96,6 +96,18 @@ wxVListBoxComboPopup::~wxVListBoxComboPopup()
Clear(); Clear();
} }
void wxVListBoxComboPopup::SetFocus()
{
// Suppress SetFocus() warning by simply not calling it. This combo popup
// has already been designed with the assumption that SetFocus() may not
// do anything useful, so it really doesn't need to be called.
#ifdef __WXMSW__
//
#else
wxVListBox::SetFocus();
#endif
}
bool wxVListBoxComboPopup::LazyCreate() bool wxVListBoxComboPopup::LazyCreate()
{ {
// NB: There is a bug with wxVListBox that can be avoided by creating // NB: There is a bug with wxVListBox that can be avoided by creating