Added regex to WXINC line (patch from Markus G)

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

diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp
index e2cdcd941ab4c7aa4ddcbb1c5934ed8a2ef6a42e..d51eb10f59274080d389380c6264c3afbd7a9238 100644 (file)
--- a/samples/minimal/minimal.cpp
+++ b/samples/minimal/minimal.cpp
@@ -5,113 +5,191 @@
 // 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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #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".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+// for all others, include the necessary headers (this file is usually all you
+// need because it includes almost all "standard" wxWindows headers)

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/wx.h"
+    #include "wx/wx.h"

 #endif
 
 #endif
 

-#ifdef __WXGTK__
-#include "mondrian.xpm"
+// ----------------------------------------------------------------------------
+// resources
+// ----------------------------------------------------------------------------
+// the application icon
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+    #include "mondrian.xpm"

 #endif
 
 #endif
 

-// Define a new application type
-class MyApp: public wxApp
-{ public:
-    bool OnInit(void);
+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------
+
+// Define a new application type, each program should derive a class from wxApp
+class MyApp : public wxApp
+{
+public:
+    // override base class virtuals
+    // ----------------------------
+
+    // this one is called on application startup and is a good place for the app
+    // 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
-class MyFrame: public wxFrame
-{ public:
-    MyFrame(wxFrame *parent, const wxString& title,
-       const wxPoint& pos, const wxSize& size);
-    
- public:
+// Define a new frame type: this is going to be our main frame
+class MyFrame : public wxFrame
+{
+public:
+    // ctor(s)
+    MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
+
+    // event handlers (these functions should _not_ be virtual)

     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);

-       bool OnClose(void) { return TRUE; }

 
 

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

 };
 
 };
 

-// ID for the menu commands
-#define MINIMAL_QUIT   1
-#define MINIMAL_TEXT   101
-#define MINIMAL_ABOUT  102
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------

 
 

+// IDs for the controls and the menu commands
+enum
+{
+    // menu items
+    Minimal_Quit = 1,
+    Minimal_About
+};
+
+// ----------------------------------------------------------------------------
+// event tables and other macros for wxWindows
+// ----------------------------------------------------------------------------
+
+// the event tables connect the wxWindows 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(MINIMAL_ABOUT, MyFrame::OnAbout)
+    EVT_MENU(Minimal_Quit,  MyFrame::OnQuit)
+    EVT_MENU(Minimal_About, MyFrame::OnAbout)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-// Create a new application object
-IMPLEMENT_APP  (MyApp)
+// Create a new application object: this macro will allow wxWindows to create
+// the application object during program execution (it's better than using a
+// 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
+// not wxApp)
+IMPLEMENT_APP(MyApp)
+

 
 

-// `Main program' equivalent
-bool MyApp::OnInit(void)
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// the application class
+// ----------------------------------------------------------------------------
+
+// 'Main program' equivalent: the program execution "starts" here
+bool MyApp::OnInit()
+{
+    // create the main application window
+    MyFrame *frame = new MyFrame("Minimal wxWindows App",
+                                 wxPoint(50, 50), wxSize(450, 340));
+
+    // and show it (the frames, unlike simple controls, are not shown when
+    // created initially)
+    frame->Show(TRUE);
+
+    // 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)
+       : wxFrame((wxFrame *)NULL, -1, title, pos, size)

 {
 {

-  // Create the main frame window
-  MyFrame *frame = new MyFrame((wxFrame *) NULL, "Minimal wxWindows App",
-      wxPoint(50, 50), wxSize(450, 340));
+#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

 
 

-  // Give it an icon
-  frame->SetIcon(wxICON(mondrian));
+    // set the frame icon
+    SetIcon(wxICON(mondrian));

 
 

-  // Make a menubar
-  wxMenu *file_menu = new wxMenu;
+#if wxUSE_MENUS
+    // create a menu bar
+    wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF);

 
 

-  file_menu->Append(MINIMAL_ABOUT, "&About");
-  file_menu->Append(MINIMAL_QUIT, "E&xit");
-  wxMenuBar *menu_bar = new wxMenuBar;
-  menu_bar->Append(file_menu, "&File");
-  frame->SetMenuBar(menu_bar);
+    // the "About" item should be in the help menu
+    wxMenu *helpMenu = new wxMenu;
+    helpMenu->Append(Minimal_About, "&About...\tCtrl-A", "Show about dialog");

 
 

-  // Make a panel with a message
-  wxPanel *panel = new wxPanel(frame, -1, wxPoint(0, 0), wxSize(400, 200), wxTAB_TRAVERSAL);
+    menuFile->Append(Minimal_Quit, "E&xit\tAlt-X", "Quit this program");

 
 

-  (void)new wxStaticText(panel, 311, "Hello!", wxPoint(10, 10), wxSize(-1, -1), 0);
+    // now append the freshly created menu to the menu bar...
+    wxMenuBar *menuBar = new wxMenuBar();
+    menuBar->Append(menuFile, "&File");
+    menuBar->Append(helpMenu, "&Help");

 
 

-  // Show the frame
-  frame->Show(TRUE);
-  
-  SetTopWindow(frame);
+    // ... and attach this menu bar to the frame
+    SetMenuBar(menuBar);
+#endif // wxUSE_MENUS

 
 

-  return TRUE;
+#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

 }
 
 }
 

-// My frame constructor
-MyFrame::MyFrame(wxFrame *parent, const wxString& title,
-       const wxPoint& pos, const wxSize& size):
-  wxFrame(parent, -1, title, pos, size)
-{}

 
 

-void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
+// event handlers
+
+void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))

 {
 {

-  Close(TRUE);
+    // TRUE is to force the frame to close
+    Close(TRUE);

 }
 
 }
 

-void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
+void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))

 {
 {

-  wxMessageDialog dialog(this, "This is a minimal sample\nA second line in the message box",
-       "About Minimal", wxYES_NO|wxCANCEL);
+    wxString msg;
+    msg.Printf( _T("This is the about dialog of minimal sample.\n")
+                _T("Welcome to %s"), wxVERSION_STRING);

 
 

-  dialog.ShowModal();
+    wxMessageBox(msg, "About Minimal", wxOK | wxICON_INFORMATION, this);

 }
 }

-
-