Some doc corrections; various small fixes for Cygwin and BC++

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

diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp
index e83ec9a08d5540178e733a1c3db4106863d56156..8db65d0ad9fc6e52c9f96cb51439bc046e368c55 100644 (file)
--- a/samples/minimal/minimal.cpp
+++ b/samples/minimal/minimal.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -38,7 +38,7 @@
 // ressources
 // ----------------------------------------------------------------------------
 // the application icon
 // ressources
 // ----------------------------------------------------------------------------
 // the application icon

-#ifdef __WXGTK__
+#if defined(__WXGTK__) || defined(__WXMOTIF__)

     #include "mondrian.xpm"
 #endif
 
     #include "mondrian.xpm"
 #endif
 


@@ -70,9 +70,6 @@ public:
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 

-    void OnPopupMenu(wxCommandEvent& event);
-    void OnRightDown(wxMouseEvent& event);
-

 private:
     // any class wishing to process wxWindows events must use this macro
     DECLARE_EVENT_TABLE()
 private:
     // any class wishing to process wxWindows events must use this macro
     DECLARE_EVENT_TABLE()


@@ -105,10 +102,6 @@ enum
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Minimal_Quit,  MyFrame::OnQuit)
     EVT_MENU(Minimal_About, MyFrame::OnAbout)
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Minimal_Quit,  MyFrame::OnQuit)
     EVT_MENU(Minimal_About, MyFrame::OnAbout)

-
-    EVT_MENU_RANGE(Minimal_Test1, Minimal_Test2, MyFrame::OnPopupMenu)
-
-    EVT_RIGHT_DOWN(MyFrame::OnRightDown)

 END_EVENT_TABLE()
 
 // Create a new application object: this macro will allow wxWindows to create
 END_EVENT_TABLE()
 
 // Create a new application object: this macro will allow wxWindows to create


@@ -158,9 +151,9 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     // create a menu bar
     wxMenu *menuFile = new wxMenu;
 
     // create a menu bar
     wxMenu *menuFile = new wxMenu;
 

-    menuFile->Append(Minimal_About, "&About...");
+    menuFile->Append(Minimal_About, "&About...\tCtrl-A", "Show about dialog");

     menuFile->AppendSeparator();
     menuFile->AppendSeparator();

-    menuFile->Append(Minimal_Quit, "E&xit");
+    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;
 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar;


@@ -185,31 +178,17 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {

-    wxMessageBox("This is a minimal sample\nA second line in the message box",
-                 "About Minimal", wxOK | wxICON_INFORMATION, this);
-}
-
-void MyFrame::OnPopupMenu(wxCommandEvent& event)
-{
-  wxString str;
-  str.Printf("Test%d clicked.", event.GetId() == Minimal_Test1 ? 1 : 2);
-  SetStatusText(str, 1);
-}
-
-void MyFrame::OnRightDown(wxMouseEvent& event)
-{
-  class MyMenu : public wxMenu
-  {
-  public:
-    MyMenu()
-    {
-      Append(Minimal_Test1, "Test&1");
-      AppendSeparator();
-      Append(Minimal_Test2, "Test&2");
-    }
-
-    ~MyMenu() { printf("menu destroyed"); }
-  } *menu = new MyMenu;
-
-  PopupMenu(menu, event.GetX(), event.GetY());
+    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
+              );
+
+    wxMessageBox(msg, "About Minimal", wxOK | wxICON_INFORMATION, this);

 }
 }