piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 00:59:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

wxWidgets3: update to svn r70933

Browse Source
This commit is contained in:
Shawn Hoffman
2012-03-17 18:12:27 -07:00
parent 0ed8af2287
commit a648aca65c
906 changed files with 39468 additions and 17244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Externals/wxWidgets3/include/wx/generic/srchctlg.h vendored
View File

@ -3,7 +3,7 @@
// Purpose: generic wxSearchCtrl class
// Author: Vince Harron
// Created: 2006-02-19
// RCS-ID: $Id: srchctlg.h 59269 2009-03-02 14:49:55Z VZ $
// RCS-ID: $Id: srchctlg.h 68911 2011-08-27 12:13:23Z VZ $
// Copyright: Vince Harron
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -191,6 +191,7 @@ public:
// wxWindow overrides
virtual bool SetFont(const wxFont& font);
virtual bool SetBackgroundColour(const wxColour& colour);
// search control generic only
void SetSearchBitmap( const wxBitmap& bitmap );
@ -235,6 +236,9 @@ protected:
private:
friend class wxSearchButton;
// Implement pure virtual function inherited from wxCompositeWindow.
virtual wxWindowList GetCompositeWindowParts() const;
#if wxUSE_MENUS
void PopupSearchMenu();
#endif // wxUSE_MENUS