X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af615124b6d296c322246661301a36e258122a3a..ba7bd901502db16ac1ff00f8da84c5bcda8a7466:/samples/minimal/minimal.cpp?ds=sidebyside

diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp
index 978db2a254..d51eb10f59 100644
--- a/samples/minimal/minimal.cpp
+++ b/samples/minimal/minimal.cpp
@@ -16,9 +16,10 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
+
 #ifdef __GNUG__
-    #pragma implementation "minimal.cpp"
-    #pragma interface "minimal.cpp"
+//    #pragma implementation "minimal.cpp"
+//    #pragma interface "minimal.cpp"
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".
@@ -29,16 +30,16 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWindows headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
 
 // ----------------------------------------------------------------------------
-// ressources
+// resources
 // ----------------------------------------------------------------------------
 // the application icon
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
     #include "mondrian.xpm"
 #endif
 
@@ -84,12 +85,7 @@ enum
 {
     // 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
 };
 
 // ----------------------------------------------------------------------------
@@ -111,6 +107,7 @@ END_EVENT_TABLE()
 // not wxApp)
 IMPLEMENT_APP(MyApp)
 
+
 // ============================================================================
 // implementation
 // ============================================================================
@@ -119,17 +116,16 @@ IMPLEMENT_APP(MyApp)
 // the application class
 // ----------------------------------------------------------------------------
 
-// `Main program' equivalent: the program execution "starts" here
+// '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));
 
-    // 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);
-    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
@@ -145,26 +141,39 @@ bool MyApp::OnInit()
 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));
 
+#if wxUSE_MENUS
     // 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...
-    wxMenuBar *menuBar = new wxMenuBar;
+    wxMenuBar *menuBar = new wxMenuBar();
     menuBar->Append(menuFile, "&File");
+    menuBar->Append(helpMenu, "&Help");
 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
+#endif // wxUSE_MENUS
 
+#if wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);
     SetStatusText("Welcome to wxWindows!");
+#endif // wxUSE_STATUSBAR
 }
 
 
@@ -179,16 +188,8 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxString msg;
-    msg.Printf("This is the about dialog of minimal sample.\n"
-               "Welcome to %s"
-#ifdef wxBETA_NUMBER
-               " (beta %d)!"
-#endif // wxBETA_NUMBER
-               , wxVERSION_STRING
-#ifdef wxBETA_NUMBER
-               , wxBETA_NUMBER
-#endif // wxBETA_NUMBER
-              );
+    msg.Printf( _T("This is the about dialog of minimal sample.\n")
+                _T("Welcome to %s"), wxVERSION_STRING);
 
     wxMessageBox(msg, "About Minimal", wxOK | wxICON_INFORMATION, this);
 }