MingW32 compilation works now.

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

diff --git a/samples/toolbar/test.cpp b/samples/toolbar/test.cpp
index 889c478a13418478cbd4b657fb8dcdad13dba792..f9720337ab71d6461518eb7caeab198253eafac6 100644 (file)
--- a/samples/toolbar/test.cpp
+++ b/samples/toolbar/test.cpp
@@ -139,7 +139,7 @@ bool MyApp::InitToolbar(wxToolBar* toolBar)
   toolBar->AddTool(wxID_PRINT, *(toolBarBitmaps[6]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Print");
   currentX += width + 5;
   toolBar->AddSeparator();
-  toolBar->AddTool(wxID_HELP, *(toolBarBitmaps[7]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Help");
+  toolBar->AddTool(wxID_HELP, *(toolBarBitmaps[7]), *(toolBarBitmaps[6]), TRUE, currentX, -1, (wxObject *) NULL, "Help");
   
   toolBar->EnableTool( wxID_PRINT, FALSE );
 
@@ -191,7 +191,7 @@ void MyFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 void MyFrame::OnToolLeftClick(wxCommandEvent& event)
 {
   wxString str;
-  str.Printf("Clicked on tool %d", event.GetId());
+  str.Printf( _T("Clicked on tool %d"), event.GetId());
   SetStatusText(str);
 }
 
@@ -200,7 +200,7 @@ void MyFrame::OnToolEnter(wxCommandEvent& event)
   if (event.GetSelection() > -1)
   {
     wxString str;
-    str.Printf("This is tool number %d", event.GetSelection());
+    str.Printf(_T("This is tool number %d"), event.GetSelection());
     SetStatusText(str);
   }
   else