projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new VC++ project files
[wxWidgets.git]
/
samples
/
minimal
/
minimal.cpp
diff --git
a/samples/minimal/minimal.cpp
b/samples/minimal/minimal.cpp
index 55d27665ecc77bd72c664e204a42fdc2ffbbdaec..e2e7765102c7d3b5b3f12dca3ed711823689b1a7 100644
(file)
--- a/
samples/minimal/minimal.cpp
+++ b/
samples/minimal/minimal.cpp
@@
-17,11
+17,6
@@
// headers
// ----------------------------------------------------------------------------
// 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"
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
@@
-38,7
+33,8
@@
// ----------------------------------------------------------------------------
// resources
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// resources
// ----------------------------------------------------------------------------
-// the application icon
+
+// the application icon (under Windows and OS/2 it is in resources)
#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
#include "mondrian.xpm"
#endif
#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
#include "mondrian.xpm"
#endif
@@
-85,7
+81,11
@@
enum
{
// menu items
Minimal_Quit = 1,
{
// menu items
Minimal_Quit = 1,
- Minimal_About
+
+ // 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
};
// ----------------------------------------------------------------------------
};
// ----------------------------------------------------------------------------
@@
-119,7
+119,7
@@
IMPLEMENT_APP(MyApp)
bool MyApp::OnInit()
{
// create the main application window
bool MyApp::OnInit()
{
// create the main application window
- MyFrame *frame = new MyFrame(
"Minimal wxWindows App"
,
+ MyFrame *frame = new MyFrame(
_T("Minimal wxWindows App")
,
wxPoint(50, 50), wxSize(450, 340));
// and show it (the frames, unlike simple controls, are not shown when
wxPoint(50, 50), wxSize(450, 340));
// and show it (the frames, unlike simple controls, are not shown when
@@
-138,38
+138,34
@@
bool MyApp::OnInit()
// frame constructor
MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
// 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)
{
{
-#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
-
// set the frame icon
SetIcon(wxICON(mondrian));
// set the frame icon
SetIcon(wxICON(mondrian));
+#if wxUSE_MENUS
// create a menu bar
// create a menu bar
- wxMenu *menuFile = new wxMenu
("", wxMENU_TEAROFF)
;
+ wxMenu *menuFile = new wxMenu;
// the "About" item should be in the help menu
wxMenu *helpMenu = new wxMenu;
// the "About" item should be in the help menu
wxMenu *helpMenu = new wxMenu;
- helpMenu->Append(Minimal_About,
"&About...\tCtrl-A", "Show about dialog"
);
+ helpMenu->Append(Minimal_About,
_T("&About...\tF1"), _T("Show about dialog")
);
- menuFile->Append(Minimal_Quit,
"E&xit\tAlt-X", "Quit this program"
);
+ 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();
// now append the freshly created menu to the menu bar...
wxMenuBar *menuBar = new wxMenuBar();
- menuBar->Append(menuFile,
"&File"
);
- menuBar->Append(helpMenu,
"&Help"
);
+ menuBar->Append(menuFile,
_T("&File")
);
+ menuBar->Append(helpMenu,
_T("&Help")
);
// ... and attach this menu bar to the frame
SetMenuBar(menuBar);
// ... 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);
#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
}
#endif // wxUSE_STATUSBAR
}
@@
-188,5
+184,5
@@
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
msg.Printf( _T("This is the about dialog of minimal sample.\n")
_T("Welcome to %s"), wxVERSION_STRING);
msg.Printf( _T("This is the about dialog of minimal sample.\n")
_T("Welcome to %s"), wxVERSION_STRING);
- wxMessageBox(msg,
"About Minimal"
, wxOK | wxICON_INFORMATION, this);
+ wxMessageBox(msg,
_T("About Minimal")
, wxOK | wxICON_INFORMATION, this);
}
}