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

1. Renamed Set/GetXXXVisible() to ShowXXX() and IsXXXVisible()

Browse Source 
2. Moved wxSearchCtrlBase to wx/srchctrl.h to avoid duplicating it
3. Removed gcc #pragmas


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-12-11 13:48:18 +00:00
parent 8138b9a4e2
commit ec184e3242
7 changed files with 60 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,37 +14,11 @@
#if wxUSE_SEARCHCTRL
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "srchctlg.h"
#endif
#include "wx/bitmap.h"
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxSearchButton;
class WXDLLEXPORT wxSearchTextCtrl;
class WXDLLEXPORT wxSearchCtrlBase : public wxTextCtrlBase
{
public:
wxSearchCtrlBase() {}
virtual ~wxSearchCtrlBase() {}
// search control
virtual void SetMenu( wxMenu* menu ) = 0;
virtual wxMenu* GetMenu() = 0;
// get/set options
virtual void SetSearchButtonVisible( bool show ) = 0;
virtual bool GetSearchButtonVisible() const = 0;
virtual void SetCancelButtonVisible( bool show ) = 0;
virtual bool GetCancelButtonVisible() const = 0;
protected:
};
// ----------------------------------------------------------------------------
// wxSearchCtrl is a combination of wxTextCtrl and wxSearchButton
// ----------------------------------------------------------------------------
@@ -81,11 +55,11 @@ public:
// get/set search options
// ----------------------
virtual void SetSearchButtonVisible( bool show );
virtual bool GetSearchButtonVisible() const;
virtual void ShowSearchButton( bool show );
virtual bool IsSearchButtonVisible() const;
virtual void SetCancelButtonVisible( bool show );
virtual bool GetCancelButtonVisible() const;
virtual void ShowCancelButton( bool show );
virtual bool IsCancelButtonVisible() const;
// accessors
// ---------