// 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
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "minimal.cpp"
- #pragma interface "minimal.cpp"
-#endif
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#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
-#ifdef __WXGTK__
+
+// the application icon (under Windows and OS/2 it is in resources)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
#include "mondrian.xpm"
#endif
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()
{
// menu items
Minimal_Quit = 1,
- Minimal_About,
- Minimal_Test1,
- Minimal_Test2,
- // controls start here (the numbers are, of course, arbitrary)
- Minimal_Text = 1000,
+ // it is important for the id corresponding to the "About" command to have
+ // this standard value as otherwise it won't be handled properly under Mac
+ // (where it is special and put into the "Apple" menu)
+ Minimal_About = wxID_ABOUT
};
// ----------------------------------------------------------------------------
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
// 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
- MyFrame *frame = new MyFrame("Minimal wxWindows App",
+ // create the main application window
+ MyFrame *frame = new MyFrame(_T("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
// frame constructor
MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
- : wxFrame((wxFrame *)NULL, -1, title, pos, size)
+ : wxFrame(NULL, -1, title, pos, size)
{
// set the frame icon
SetIcon(wxICON(mondrian));
+#if wxUSE_MENUS
// create a menu bar
wxMenu *menuFile = new wxMenu;
- menuFile->Append(Minimal_About, "&About...");
- menuFile->AppendSeparator();
- menuFile->Append(Minimal_Quit, "E&xit");
+ // the "About" item should be in the help menu
+ wxMenu *helpMenu = new wxMenu;
+ helpMenu->Append(Minimal_About, _T("&About...\tF1"), _T("Show about dialog"));
+
+ menuFile->Append(Minimal_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
// now append the freshly created menu to the menu bar...
- wxMenuBar *menuBar = new wxMenuBar;
- menuBar->Append(menuFile, "&File");
+ wxMenuBar *menuBar = new wxMenuBar();
+ menuBar->Append(menuFile, _T("&File"));
+ menuBar->Append(helpMenu, _T("&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!");
+ SetStatusText(_T("Welcome to wxWindows!"));
+#endif // wxUSE_STATUSBAR
}
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);
-}
+ wxString msg;
+ msg.Printf( _T("This is the about dialog of minimal sample.\n")
+ _T("Welcome to %s"), wxVERSION_STRING);
-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());
+ wxMessageBox(msg, _T("About Minimal"), wxOK | wxICON_INFORMATION, this);
}
projects / wxWidgets.git / blobdiff