move wxDataFormat and wxDataObject docs at the beginning of the file, before the...

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

diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp
index c13a43b87d48238deab310c2355ab311ecaee2c7..3b9d95cac011f33b4c550e74824cff2e538c4484 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;
 
+    if (toolBar && m_searchTool && m_searchTool->GetToolBar() == NULL)
+    {
+        // see ~MyFrame()
+        toolBar->AddTool(m_searchTool);
+    }
+    m_searchTool = NULL;
+
     delete toolBar;
 
     SetToolBar(NULL);
@@ -401,7 +408,7 @@ void MyFrame::PopulateToolbar(wxToolBarBase* toolBar)
     INIT_TOOL_BMP(paste);
     INIT_TOOL_BMP(print);
     INIT_TOOL_BMP(help);
-    
+
     int w = toolBarBitmaps[Tool_new].GetWidth(),
         h = toolBarBitmaps[Tool_new].GetHeight();
 
@@ -412,25 +419,13 @@ void MyFrame::PopulateToolbar(wxToolBarBase* toolBar)
 
         for ( size_t n = Tool_new; n < WXSIZEOF(toolBarBitmaps); n++ )
         {
-#if 0
-            wxBitmap source = toolBarBitmaps[n];
-            wxBitmap target( w, h );
-            wxMemoryDC dc( target );
-            dc.SetPen( wxPen( wxColour(100,100,100), 1, wxSOLID ) );
-            dc.SetBrush( *wxTRANSPARENT_BRUSH );
-            dc.DrawRectangle( 0, 0, w, h );
-            wxRect inner(1,1,w-2,h-2);
-            dc.GradientFillLinear( inner, wxColour(240,240,240), wxColour(150,150,150), wxSOUTH );
-            
-            dc.DrawBitmap( source, w/4, h/4, true );
-            toolBarBitmaps[n] = target;
-#else       
             toolBarBitmaps[n] =
                 wxBitmap(toolBarBitmaps[n].ConvertToImage().Scale(w, h));
-#endif
         }
     }
 
+    // this call is actually unnecessary as the toolbar will adjust its tools
+    // size to fit the biggest icon used anyhow but it doesn't hurt neither
     toolBar->SetToolBitmapSize(wxSize(w, h));
 
     toolBar->AddTool(wxID_NEW, _T("New"),