Further corrections to wxFileName docs

[wxWidgets.git] / samples / toolbar / toolbar.cpp

diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp
index 8a4ef7d0b429d9443c58a5773ebce556e292eb51..c1c95e469b6283c13370cc22bf83eaf05aeb2380 100644 (file)
--- a/samples/toolbar/toolbar.cpp
+++ b/samples/toolbar/toolbar.cpp
@@ -332,6 +332,13 @@ void MyFrame::RecreateToolbar()
     wxToolBarBase *toolBar = GetToolBar();
     long style = toolBar ? toolBar->GetWindowStyle() : TOOLBAR_STYLE;
 
     wxToolBarBase *toolBar = GetToolBar();
     long style = toolBar ? toolBar->GetWindowStyle() : TOOLBAR_STYLE;
 

+    if (toolBar && m_searchTool && m_searchTool->GetToolBar() == NULL)
+    {
+        // see ~MyFrame()
+        toolBar->AddTool(m_searchTool);
+    }
+    m_searchTool = NULL;
+

     delete toolBar;
 
     SetToolBar(NULL);
     delete toolBar;
 
     SetToolBar(NULL);


@@ -518,6 +525,7 @@ MyFrame::MyFrame(wxFrame* parent,
     m_horzText = false;
     m_useCustomDisabled = false;
     m_showTooltips = true;
     m_horzText = false;
     m_useCustomDisabled = false;
     m_showTooltips = true;

+    m_searchTool = NULL;

 
     m_rows = 1;
     m_nPrint = 1;
 
     m_rows = 1;
     m_nPrint = 1;


@@ -588,7 +596,7 @@ MyFrame::MyFrame(wxFrame* parent,
     toolMenu->Append(IDM_TOOLBAR_DELETEPRINT, _T("&Delete print button\tCtrl-D"));
     toolMenu->Append(IDM_TOOLBAR_INSERTPRINT, _T("&Insert print button\tCtrl-I"));
     toolMenu->Append(IDM_TOOLBAR_TOGGLEHELP, _T("Toggle &help button\tCtrl-T"));
     toolMenu->Append(IDM_TOOLBAR_DELETEPRINT, _T("&Delete print button\tCtrl-D"));
     toolMenu->Append(IDM_TOOLBAR_INSERTPRINT, _T("&Insert print button\tCtrl-I"));
     toolMenu->Append(IDM_TOOLBAR_TOGGLEHELP, _T("Toggle &help button\tCtrl-T"));

-    toolMenu->Append(IDM_TOOLBAR_TOGGLESEARCH, _T("Toggle &search field\tCtrl-F"));
+    toolMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLESEARCH, _T("Toggle &search field\tCtrl-F"));

     toolMenu->AppendSeparator();
     toolMenu->Append(IDM_TOOLBAR_TOGGLERADIOBTN1, _T("Toggle &1st radio button\tCtrl-1"));
     toolMenu->Append(IDM_TOOLBAR_TOGGLERADIOBTN2, _T("Toggle &2nd radio button\tCtrl-2"));
     toolMenu->AppendSeparator();
     toolMenu->Append(IDM_TOOLBAR_TOGGLERADIOBTN1, _T("Toggle &1st radio button\tCtrl-1"));
     toolMenu->Append(IDM_TOOLBAR_TOGGLERADIOBTN2, _T("Toggle &2nd radio button\tCtrl-2"));


@@ -874,16 +882,21 @@ void MyFrame::OnToggleSearch(wxCommandEvent& WXUNUSED(event))
     }
     else // tool already exists
     {
     }
     else // tool already exists
     {

+        wxControl * const win = m_searchTool->GetControl();

         if ( m_searchTool->GetToolBar() )
         {
             // attached now, remove it
         if ( m_searchTool->GetToolBar() )
         {
             // attached now, remove it

+            win->Hide();

             tb->RemoveTool(m_searchTool->GetId());
         }
         else // tool exists in detached state, attach it back
         {
             tb->InsertTool(searchPos, m_searchTool);
             tb->RemoveTool(m_searchTool->GetId());
         }
         else // tool exists in detached state, attach it back
         {
             tb->InsertTool(searchPos, m_searchTool);

+            win->Show();

         }
     }
         }
     }

+
+    tb->Realize();

 }
 
 void MyFrame::OnUpdateCopyAndCut(wxUpdateUIEvent& event)
 }
 
 void MyFrame::OnUpdateCopyAndCut(wxUpdateUIEvent& event)