more files to ignore in cvs commands (setup.h, lex_yy.c, y_tab.c)

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

diff --git a/samples/toolbar/test.cpp b/samples/toolbar/test.cpp
index 9b4b9434e254199ec3996deb5a3cd76df13036a1..9d6232483aaf2a8ff75eb5ca1c59a9e502558709 100644 (file)
--- a/samples/toolbar/test.cpp
+++ b/samples/toolbar/test.cpp
@@ -21,6 +21,8 @@
 #endif
 
 #include "wx/toolbar.h"
+#include <wx/log.h>
+
 #include "test.h"
 
 #if defined(__WXGTK__) || defined(__WXMOTIF__)
@@ -38,7 +40,6 @@
 
 IMPLEMENT_APP(MyApp)
 
-
 // The `main program' equivalent, creating the windows and returning the
 // main frame
 bool MyApp::OnInit(void)
@@ -51,18 +52,14 @@ bool MyApp::OnInit(void)
   frame->CreateStatusBar();
 
   // Give it an icon
-#ifdef __WXMSW__
-  frame->SetIcon(wxIcon("mondrian"));
-#else
-  frame->SetIcon( wxIcon(mondrian_xpm) );
-#endif
+  frame->SetIcon(wxICON(mondrian));
 
   // Make a menubar
   wxMenu *fileMenu = new wxMenu;
-  fileMenu->Append(wxID_EXIT, "E&xit");
+  fileMenu->Append(wxID_EXIT, "E&xit", "Quit toolbar sample" );
 
   wxMenu *helpMenu = new wxMenu;
-  helpMenu->Append(wxID_HELP, "&About");
+  helpMenu->Append(wxID_HELP, "&About", "About toolbar sample");
 
   wxMenuBar* menuBar = new wxMenuBar;
 
@@ -74,6 +71,8 @@ bool MyApp::OnInit(void)
 
   // Create the toolbar
   frame->CreateToolBar(wxNO_BORDER|wxHORIZONTAL|wxTB_FLAT, ID_TOOLBAR);
+  
+  frame->GetToolBar()->SetMargins( 2, 2 );
 
   InitToolbar(frame->GetToolBar());
 
@@ -92,8 +91,6 @@ bool MyApp::OnInit(void)
 
 bool MyApp::InitToolbar(wxToolBar* toolBar)
 {
-  toolBar->SetMargins(5, 5);
-
   // Set up toolbar
   wxBitmap* toolBarBitmaps[8];
 
@@ -179,7 +176,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
-    (void)wxMessageBox("wxWindows wxToolBar demo\n", "About wxToolBar");
+    (void)wxMessageBox("wxWindows toolbar sample", "About wxToolBar");
 }
 
 // Define the behaviour for the frame closing