small sample cleanup (formatting, use stock menu items)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

samples/html/about/about.cpp

@@ -27,9 +27,9 @@
 
 
 // Define a new application type, each program should derive a class from wxApp
-   class MyApp : public wxApp
+class MyApp : public wxApp
-   {
+{
-   public:
+public:
     // override base class virtuals
     // ----------------------------
 
@@ -37,40 +37,23 @@
     // initialization (doing it here and not in the ctor allows to have an error
     // return: if OnInit() returns false, the application terminates)
     virtual bool OnInit();
-   };
+};
 
 // Define a new frame type: this is going to be our main frame
-   class MyFrame : public wxFrame
+class MyFrame : public wxFrame
-   {
+{
-   public:
+public:
     // ctor(s)
-      MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
+    MyFrame(const wxString& title);
 
     // event handlers (these functions should _not_ be virtual)
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 
-   private:
+private:
     // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()
-   };
+};
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// IDs for the controls and the menu commands
-   enum
-   {
-    // menu items
-   Minimal_Quit = 1,
-   Minimal_About,
-   Minimal_Back,
-   Minimal_Forward,
-
-    // controls start here (the numbers are, of course, arbitrary)
-   Minimal_Text = 1000
-   };
 
 // ----------------------------------------------------------------------------
 // event tables and other macros for wxWidgets
@@ -79,59 +62,55 @@
 // the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
-   BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-   EVT_MENU(Minimal_Quit,  MyFrame::OnQuit)
+   EVT_MENU(wxID_ABOUT, MyFrame::OnAbout)
-   EVT_MENU(Minimal_About, MyFrame::OnAbout)
+   EVT_MENU(wxID_EXIT,  MyFrame::OnQuit)
-   END_EVENT_TABLE()
+END_EVENT_TABLE()
 
-   // Create a new application object: this macro will allow wxWidgets to create
+// Create a new application object: this macro will allow wxWidgets to create
-   // the application object during program execution (it's better than using a
+// the application object during program execution (it's better than using a
-   // static object for many reasons) and also declares the accessor function
+// static object for many reasons) and also declares the accessor function
-   // wxGetApp() which will return the reference of the right type (i.e. MyApp and
+// wxGetApp() which will return the reference of the right type (i.e. MyApp and
-   // not wxApp)
+// not wxApp)
-   IMPLEMENT_APP(MyApp)
+IMPLEMENT_APP(MyApp)
 
-   // ============================================================================
+// ============================================================================
-   // implementation
+// implementation
-   // ============================================================================
+// ============================================================================
 
-   // ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
-   // the application class
+// the application class
-   // ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
-   // `Main program' equivalent: the program execution "starts" here
+
-   bool MyApp::OnInit()
+// `Main program' equivalent: the program execution "starts" here
-   {
+bool MyApp::OnInit()
+{
+    // we use a PNG image in our HTML page
     wxImage::AddHandler(new wxPNGHandler);
-    // Create the main application window
-      MyFrame *frame = new MyFrame(_("wxHtmlWindow testing application"),
-         wxDefaultPosition, wxDefaultSize);
-
-    // Show it and tell the application that it's our main window
-    // @@@ what does it do exactly, in fact? is it necessary here?
-      frame->Show(true);
-      SetTopWindow(frame);
 
+    // create and show the main application window
+    MyFrame *frame = new MyFrame(_("wxHtmlWindow testing application"));
+    frame->Show();
 
     // success: wxApp::OnRun() will be called which will enter the main message
     // loop and the application will run. If we returned false here, the
     // application would exit immediately.
     return true;
-   }
+}
 
 // ----------------------------------------------------------------------------
 // main frame
 // ----------------------------------------------------------------------------
 
-
 // frame constructor
-   MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
+MyFrame::MyFrame(const wxString& title)
-   : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size)
+       : wxFrame((wxFrame *)NULL, wxID_ANY, title)
-   {
+{
     // create a menu bar
     wxMenu *menuFile = new wxMenu;
 
-      menuFile->Append(Minimal_About, _("&About"));
+    menuFile->Append(wxID_ABOUT);
-      menuFile->Append(Minimal_Quit, _("E&xit"));
+    menuFile->Append(wxID_EXIT);
 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar;
@@ -139,19 +118,19 @@
 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
-   }
+}
 
 
 // event handlers
 
-   void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
+void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
-   {
+{
     // true is to force the frame to close
     Close(true);
-   }
+}
 
-   void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
+void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
-   {
+{
     wxBoxSizer *topsizer;
     wxHtmlWindow *html;
     wxDialog dlg(this, wxID_ANY, wxString(_("About")));
@@ -179,5 +158,5 @@
     topsizer -> Fit(&dlg);
 
     dlg.ShowModal();
-    }
+}