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

simplify native textcontrol creations, adding search control for cocoa

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2008-09-05 14:41:11 +00:00
parent 23e00c551b
commit 1e181c7a2c
21 changed files with 734 additions and 972 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/wx/osx/carbon/srchctrl.h
View File

@@ -13,7 +13,7 @@
#if wxUSE_SEARCHCTRL
class wxMacSearchFieldControl;
class wxSearchWidgetImpl;
class WXDLLIMPEXP_CORE wxSearchCtrl : public wxSearchCtrlBase
{
@@ -54,14 +54,13 @@ public:
virtual bool IsCancelButtonVisible() const;
// TODO: In 2.9 these should probably be virtual, and declared in the base class...
void SetDescriptiveText(const wxString& text);
wxString GetDescriptiveText() const;
void SetDescriptiveText(const wxString& text);
wxString GetDescriptiveText() const;
virtual wxInt32 MacSearchFieldSearchHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
virtual wxInt32 MacSearchFieldCancelHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
virtual bool HandleSearchFieldSearchHit() ;
virtual bool HandleSearchFieldCancelHit() ;
wxMacSearchFieldControl * GetPeer() const
{ return (wxMacSearchFieldControl*) m_peer; }
wxSearchWidgetImpl * GetSearchPeer() const;
protected:
@@ -69,12 +68,9 @@ protected:
void Init();
virtual void CreatePeer(
const wxString& str,
const wxPoint& pos,
const wxSize& size, long style );
wxMenu *m_menu;
wxString m_descriptiveText;
private:
DECLARE_DYNAMIC_CLASS(wxSearchCtrl)