X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8138b9a4e23846d7a2feea239c2bd46d459b33f4..d8eff331e23435d9d8d6483a40f6fd9997a13f87:/samples/widgets/searchctrl.cpp diff --git a/samples/widgets/searchctrl.cpp b/samples/widgets/searchctrl.cpp index 414cfe1f2f..3c5bb3956a 100644 --- a/samples/widgets/searchctrl.cpp +++ b/samples/widgets/searchctrl.cpp @@ -72,6 +72,7 @@ public: virtual ~SearchCtrlWidgetsPage(){}; virtual wxControl *GetWidget() const { return m_srchCtrl; } + virtual wxTextEntryBase *GetTextEntry() const { return m_srchCtrl; } virtual void RecreateWidget() { CreateControl(); } // lazy creation of the content @@ -122,7 +123,7 @@ END_EVENT_TABLE() #define FAMILY_CTRLS GENERIC_CTRLS #endif -IMPLEMENT_WIDGETS_PAGE(SearchCtrlWidgetsPage, _T("SearchCtrl"), +IMPLEMENT_WIDGETS_PAGE(SearchCtrlWidgetsPage, wxT("SearchCtrl"), FAMILY_CTRLS | EDITABLE_CTRLS | ALL_CTRLS); SearchCtrlWidgetsPage::SearchCtrlWidgetsPage(WidgetsBookCtrl *book, @@ -180,7 +181,7 @@ wxMenu* SearchCtrlWidgetsPage::CreateTestMenu() { wxMenu* menu = new wxMenu; const int SEARCH_MENU_SIZE = 5; - wxMenuItem* menuItem = menu->Append(wxID_ANY, _T("Recent Searches"), wxT(""), wxITEM_NORMAL); + wxMenuItem* menuItem = menu->Append(wxID_ANY, wxT("Recent Searches"), wxT(""), wxITEM_NORMAL); menuItem->Enable(false); for ( int i = 0; i < SEARCH_MENU_SIZE; i++ ) { @@ -204,12 +205,12 @@ wxMenu* SearchCtrlWidgetsPage::CreateTestMenu() void SearchCtrlWidgetsPage::OnToggleSearchButton(wxCommandEvent&) { - m_srchCtrl->SetSearchButtonVisible( m_searchBtnCheck->GetValue() ); + m_srchCtrl->ShowSearchButton( m_searchBtnCheck->GetValue() ); } void SearchCtrlWidgetsPage::OnToggleCancelButton(wxCommandEvent&) { - m_srchCtrl->SetCancelButtonVisible( m_cancelBtnCheck->GetValue() ); + m_srchCtrl->ShowCancelButton( m_cancelBtnCheck->GetValue() ); }