Fix return value of wxGenericTreeCtrl::FindItem().

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

diff --git a/samples/widgets/searchctrl.cpp b/samples/widgets/searchctrl.cpp
index 0ff7330fade8d35beae4053774ad24a0456e4975..7ba5df5a9337108b9c3c5c7019ea99cb9f6ad443 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();


@@ -91,9 +91,6 @@ protected:
     // (re)create the control
     void CreateControl();
 
     // (re)create the control
     void CreateControl();
 

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

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


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

-    Reset();

     CreateControl();
 
 
     CreateControl();
 
 


@@ -176,10 +172,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()
 {