MingW32 compilation works now.

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

diff --git a/samples/toolbar/test.cpp b/samples/toolbar/test.cpp
index 994cb5e0bf13c3e33c75b3550e98ed2fc16508ad..f9720337ab71d6461518eb7caeab198253eafac6 100644 (file)
--- a/samples/toolbar/test.cpp
+++ b/samples/toolbar/test.cpp
@@ -70,7 +70,7 @@ bool MyApp::OnInit(void)
   frame->SetMenuBar(menuBar);
 
   // Create the toolbar
   frame->SetMenuBar(menuBar);
 
   // Create the toolbar

-  frame->CreateToolBar(wxNO_BORDER|wxHORIZONTAL|wxTB_FLAT|wxTB_DOCKABLE, ID_TOOLBAR);
+  frame->CreateToolBar(wxNO_BORDER|wxTB_HORIZONTAL|wxTB_FLAT|wxTB_DOCKABLE, ID_TOOLBAR);

   
   frame->GetToolBar()->SetMargins( 2, 2 );
 
   
   frame->GetToolBar()->SetMargins( 2, 2 );
 


@@ -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_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 );
 
   
   toolBar->EnableTool( wxID_PRINT, FALSE );
 


@@ -160,7 +160,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(wxID_HELP, MyFrame::OnAbout)
     EVT_CLOSE(MyFrame::OnCloseWindow)
     EVT_TOOL_RANGE(wxID_OPEN, wxID_PASTE, MyFrame::OnToolLeftClick)
     EVT_MENU(wxID_HELP, MyFrame::OnAbout)
     EVT_CLOSE(MyFrame::OnCloseWindow)
     EVT_TOOL_RANGE(wxID_OPEN, wxID_PASTE, MyFrame::OnToolLeftClick)

-    EVT_TOOL_ENTER(wxID_OPEN, MyFrame::OnToolEnter)
+    EVT_TOOL_ENTER(ID_TOOLBAR, MyFrame::OnToolEnter)

 END_EVENT_TABLE()
 
 // Define my frame constructor
 END_EVENT_TABLE()
 
 // Define my frame constructor


@@ -191,7 +191,7 @@ void MyFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 void MyFrame::OnToolLeftClick(wxCommandEvent& event)
 {
   wxString str;
 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);
 }
 
   SetStatusText(str);
 }
 


@@ -200,7 +200,7 @@ void MyFrame::OnToolEnter(wxCommandEvent& event)
   if (event.GetSelection() > -1)
   {
     wxString str;
   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
     SetStatusText(str);
   }
   else