Fix for VA 4.0

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

diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp
index 9e0758f642adb2a9f7b6bdf83a5b8a6636bfaa73..6a093c743ea6bc82e458fb0412d43ee6ae8a1456 100644 (file)
--- a/samples/minimal/minimal.cpp
+++ b/samples/minimal/minimal.cpp
@@ -84,12 +84,7 @@ enum
 {
     // menu items
     Minimal_Quit = 1,
 {
     // menu items
     Minimal_Quit = 1,

-    Minimal_About,
-    Minimal_Test1,
-    Minimal_Test2,
-
-    // controls start here (the numbers are, of course, arbitrary)
-    Minimal_Text = 1000,
+    Minimal_About

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -122,14 +117,13 @@ IMPLEMENT_APP(MyApp)
 // `Main program' equivalent: the program execution "starts" here
 bool MyApp::OnInit()
 {
 // `Main program' equivalent: the program execution "starts" here
 bool MyApp::OnInit()
 {

-    // Create the main application window
+    // create the main application window

     MyFrame *frame = new MyFrame("Minimal wxWindows App",
                                  wxPoint(50, 50), wxSize(450, 340));
 
     MyFrame *frame = new MyFrame("Minimal wxWindows App",
                                  wxPoint(50, 50), wxSize(450, 340));
 

-    // Show it and tell the application that it's our main window
-    // @@@ what does it do exactly, in fact? is it necessary here?
+    // and show it (the frames, unlike simple controls, are not shown when
+    // created initially)

     frame->Show(TRUE);
     frame->Show(TRUE);

-    SetTopWindow(frame);

 
     // success: wxApp::OnRun() will be called which will enter the main message
     // loop and the application will run. If we returned FALSE here, the
 
     // success: wxApp::OnRun() will be called which will enter the main message
     // loop and the application will run. If we returned FALSE here, the


@@ -145,26 +139,37 @@ bool MyApp::OnInit()
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
        : wxFrame((wxFrame *)NULL, -1, title, pos, size)
 {
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
        : wxFrame((wxFrame *)NULL, -1, title, pos, size)
 {

+#ifdef __WXMAC__
+    // we need this in order to allow the about menu relocation, since ABOUT is
+    // not the default id of the about menu
+    wxApp::s_macAboutMenuItemId = Minimal_About;
+#endif
+

     // set the frame icon
     SetIcon(wxICON(mondrian));
 
     // create a menu bar
     // set the frame icon
     SetIcon(wxICON(mondrian));
 
     // create a menu bar

-    wxMenu *menuFile = new wxMenu;
+    wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF);
+
+    // the "About" item should be in the help menu
+    wxMenu *helpMenu = new wxMenu;
+    helpMenu->Append(Minimal_About, "&About...\tCtrl-A", "Show about dialog");

 
 

-    menuFile->Append(Minimal_About, "&About...", "Show about dialog");
-    menuFile->AppendSeparator();
-    menuFile->Append(Minimal_Quit, "E&xit", "Quit this program");
+    menuFile->Append(Minimal_Quit, "E&xit\tAlt-X", "Quit this program");

 
     // now append the freshly created menu to the menu bar...
 
     // now append the freshly created menu to the menu bar...

-    wxMenuBar *menuBar = new wxMenuBar;
+    wxMenuBar *menuBar = new wxMenuBar();

     menuBar->Append(menuFile, "&File");
     menuBar->Append(menuFile, "&File");

+    menuBar->Append(helpMenu, "&Help");

 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 
 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 

+#if wxUSE_STATUSBAR

     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);
     SetStatusText("Welcome to wxWindows!");
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);
     SetStatusText("Welcome to wxWindows!");

+#endif // wxUSE_STATUSBAR

 }
 
 
 }
 
 


@@ -180,15 +185,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxString msg;
     msg.Printf( _T("This is the about dialog of minimal sample.\n")
 {
     wxString msg;
     msg.Printf( _T("This is the about dialog of minimal sample.\n")

-                _T("Welcome to %s")
-#ifdef wxBETA_NUMBER
-               _T(" (beta %d)!")
-#endif // wxBETA_NUMBER
-               , wxVERSION_STRING
-#ifdef wxBETA_NUMBER
-               , wxBETA_NUMBER
-#endif // wxBETA_NUMBER
-              );
+                _T("Welcome to %s"), wxVERSION_STRING);

 
     wxMessageBox(msg, "About Minimal", wxOK | wxICON_INFORMATION, this);
 }
 
     wxMessageBox(msg, "About Minimal", wxOK | wxICON_INFORMATION, this);
 }