Make wxSpinCtrlGenericBase a wxCompositeWindow.

[wxWidgets.git] / samples / widgets / searchctrl.cpp

diff --git a/samples/widgets/searchctrl.cpp b/samples/widgets/searchctrl.cpp
index 0ff7330fade8d35beae4053774ad24a0456e4975..4c8e900c406ab74759fbb8769864683c2b536c34 100644 (file)
--- a/samples/widgets/searchctrl.cpp
+++ b/samples/widgets/searchctrl.cpp
@@ -73,7 +73,7 @@ public:
 
     virtual wxControl *GetWidget() const { return m_srchCtrl; }
     virtual wxTextEntryBase *GetTextEntry() const { return m_srchCtrl; }
 
     virtual wxControl *GetWidget() const { return m_srchCtrl; }
     virtual wxTextEntryBase *GetTextEntry() const { return m_srchCtrl; }

-    virtual void RecreateWidget() { CreateControl(); }
+    virtual void RecreateWidget();

 
     // lazy creation of the content
     virtual void CreateContent();
 
     // lazy creation of the content
     virtual void CreateContent();


@@ -85,15 +85,13 @@ protected:
     void OnToggleSearchMenu(wxCommandEvent&);
 
     void OnSearch(wxCommandEvent& event);
     void OnToggleSearchMenu(wxCommandEvent&);
 
     void OnSearch(wxCommandEvent& event);

+    void OnSearchCancel(wxCommandEvent& event);

 
     wxMenu* CreateTestMenu();
 
     // (re)create the control
     void CreateControl();
 
 
     wxMenu* CreateTestMenu();
 
     // (re)create the control
     void CreateControl();
 

-    // reset the control parameters
-    void Reset();
-

 
     wxSearchCtrl*       m_srchCtrl;
     wxCheckBox*         m_searchBtnCheck;
 
     wxSearchCtrl*       m_srchCtrl;
     wxCheckBox*         m_searchBtnCheck;


@@ -115,6 +113,7 @@ BEGIN_EVENT_TABLE(SearchCtrlWidgetsPage, WidgetsPage)
     EVT_CHECKBOX(ID_MENU_CB, SearchCtrlWidgetsPage::OnToggleSearchMenu)
 
     EVT_SEARCHCTRL_SEARCH_BTN(wxID_ANY, SearchCtrlWidgetsPage::OnSearch)
     EVT_CHECKBOX(ID_MENU_CB, SearchCtrlWidgetsPage::OnToggleSearchMenu)
 
     EVT_SEARCHCTRL_SEARCH_BTN(wxID_ANY, SearchCtrlWidgetsPage::OnSearch)

+    EVT_SEARCHCTRL_CANCEL_BTN(wxID_ANY, SearchCtrlWidgetsPage::OnSearchCancel)

 END_EVENT_TABLE()
 
 // ============================================================================
 END_EVENT_TABLE()
 
 // ============================================================================


@@ -140,7 +139,6 @@ void SearchCtrlWidgetsPage::CreateContent()
 {
     m_srchCtrl = NULL;
 
 {
     m_srchCtrl = NULL;
 

-    Reset();

     CreateControl();
 
 
     CreateControl();
 
 


@@ -176,10 +174,14 @@ void SearchCtrlWidgetsPage::CreateControl()
                                   wxSize(150, -1), style);
 }
 
                                   wxSize(150, -1), style);
 }
 

-void SearchCtrlWidgetsPage::Reset()
+void SearchCtrlWidgetsPage::RecreateWidget()

 {
 {

-}
+    CreateControl();

 
 

+    GetSizer()->Add(m_srchCtrl, wxSizerFlags().Centre().TripleBorder());
+
+    Layout();
+}

 
 wxMenu* SearchCtrlWidgetsPage::CreateTestMenu()
 {
 
 wxMenu* SearchCtrlWidgetsPage::CreateTestMenu()
 {


@@ -231,4 +233,11 @@ void SearchCtrlWidgetsPage::OnSearch(wxCommandEvent& event)
     wxLogMessage("Search button: search for \"%s\".", event.GetString());
 }
 
     wxLogMessage("Search button: search for \"%s\".", event.GetString());
 }
 

+void SearchCtrlWidgetsPage::OnSearchCancel(wxCommandEvent& event)
+{
+    wxLogMessage("Cancel button pressed.");
+
+    event.Skip();
+}
+

 #endif  //  wxUSE_SEARCHCTRL
 #endif  //  wxUSE_SEARCHCTRL