minor corrections for CodeWarrior

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

diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp
index 84a4ff0a090b918b98e71aa57deb491a238d08bc..7f1ab0047cc7178316adeea597f231ee454b9d56 100644 (file)
--- a/samples/minimal/minimal.cpp
+++ b/samples/minimal/minimal.cpp
@@ -29,13 +29,13 @@
 #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__)
@@ -67,6 +67,16 @@ public:
     MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
 
     // event handlers (these functions should _not_ be virtual)
+    void OnPaint(wxPaintEvent& event)
+    {
+        wxPaintDC dc(this);
+        dc.DrawRectangle(20, 20, 100, 100);
+        dc.SetPen(*wxRED_PEN);
+        dc.SetDeviceOrigin(20, 20);
+        dc.SetClippingRegion(0, 0, 100, 100);
+        dc.DrawLine(0, 0, 1000, 1000);
+    }
+
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 
@@ -95,6 +105,7 @@ enum
 // 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)
+    EVT_PAINT(MyFrame::OnPaint)
     EVT_MENU(Minimal_Quit,  MyFrame::OnQuit)
     EVT_MENU(Minimal_About, MyFrame::OnAbout)
 END_EVENT_TABLE()
@@ -114,17 +125,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
@@ -141,8 +151,9 @@ 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 ;
+    // 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
@@ -151,22 +162,16 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     // create a menu bar
     wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF);
 
-#ifdef __WXMAC__
-       // since the about should be in the help menu for auto-relocation we have to do a little more...
-    wxMenu *helpMenu = new wxMenu("", wxMENU_TEAROFF);
-    helpMenu->Append(Minimal_About, "&About...\tCntrl+A", "Show about dialog");
-#else
-    menuFile->Append(Minimal_About, "&About...\tCtrl-A", "Show about dialog");
-    menuFile->AppendSeparator();
-#endif
+    // 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_Quit, "E&xit\tAlt-X", "Quit this program");
+
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar();
     menuBar->Append(menuFile, "&File");
-#ifdef __WXMAC__
     menuBar->Append(helpMenu, "&Help");
-#endif
 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
@@ -191,15 +196,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     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);
 }