projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added test for wxScopeGuard
[wxWidgets.git]
/
samples
/
minimal
/
minimal.cpp
diff --git
a/samples/minimal/minimal.cpp
b/samples/minimal/minimal.cpp
index d6ab0abbfee285a1c2522ba1ce0e650cfa6a3126..7187ed46c6cbf2c5ec807645e64a04384812878f 100644
(file)
--- a/
samples/minimal/minimal.cpp
+++ b/
samples/minimal/minimal.cpp
@@
-1,6
+1,6
@@
/////////////////////////////////////////////////////////////////////////////
// Name: minimal.cpp
/////////////////////////////////////////////////////////////////////////////
// Name: minimal.cpp
-// Purpose: Minimal wxWi
ndow
s sample
+// Purpose: Minimal wxWi
dget
s sample
// Author: Julian Smart
// Modified by:
// Created: 04/01/98
// Author: Julian Smart
// Modified by:
// Created: 04/01/98
@@
-25,7
+25,7
@@
#endif
// for all others, include the necessary headers (this file is usually all you
#endif
// for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWi
ndow
s headers)
+// need because it includes almost all "standard" wxWi
dget
s headers)
#ifndef WX_PRECOMP
#include "wx/wx.h"
#endif
#ifndef WX_PRECOMP
#include "wx/wx.h"
#endif
@@
-34,9
+34,10
@@
// resources
// ----------------------------------------------------------------------------
// resources
// ----------------------------------------------------------------------------
-// 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"
+// the application icon (under Windows and OS/2 it is in resources and even
+// though we could still include the XPM here it would be unused)
+#if !defined(__WXMSW__) && !defined(__WXPM__)
+ #include "../sample.xpm"
#endif
// ----------------------------------------------------------------------------
#endif
// ----------------------------------------------------------------------------
@@
-61,15
+62,14
@@
class MyFrame : public wxFrame
{
public:
// ctor(s)
{
public:
// ctor(s)
- MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
- long style = wxDEFAULT_FRAME_STYLE);
+ MyFrame(const wxString& title);
// event handlers (these functions should _not_ be virtual)
void OnQuit(wxCommandEvent& event);
void OnAbout(wxCommandEvent& event);
private:
// event handlers (these functions should _not_ be virtual)
void OnQuit(wxCommandEvent& event);
void OnAbout(wxCommandEvent& event);
private:
- // any class wishing to process wxWi
ndow
s events must use this macro
+ // any class wishing to process wxWi
dget
s events must use this macro
DECLARE_EVENT_TABLE()
};
DECLARE_EVENT_TABLE()
};
@@
-81,7
+81,7
@@
private:
enum
{
// menu items
enum
{
// menu items
- Minimal_Quit =
1
,
+ Minimal_Quit =
wxID_EXIT
,
// 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
// 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
@@
-90,10
+90,10
@@
enum
};
// ----------------------------------------------------------------------------
};
// ----------------------------------------------------------------------------
-// event tables and other macros for wxWi
ndow
s
+// event tables and other macros for wxWi
dget
s
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
-// the event tables connect the wxWi
ndow
s events with the functions (event
+// the event tables connect the wxWi
dget
s 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)
// 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)
@@
-101,7
+101,7
@@
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(Minimal_About, MyFrame::OnAbout)
END_EVENT_TABLE()
EVT_MENU(Minimal_About, MyFrame::OnAbout)
END_EVENT_TABLE()
-// Create a new application object: this macro will allow wxWi
ndow
s to create
+// Create a new application object: this macro will allow wxWi
dget
s to create
// the application object during program execution (it's better than using a
// static object for many reasons) and also implements the accessor function
// wxGetApp() which will return the reference of the right type (i.e. MyApp and
// the application object during program execution (it's better than using a
// static object for many reasons) and also implements the accessor function
// wxGetApp() which will return the reference of the right type (i.e. MyApp and
@@
-120,21
+120,16
@@
IMPLEMENT_APP(MyApp)
bool MyApp::OnInit()
{
// create the main application window
bool MyApp::OnInit()
{
// create the main application window
- MyFrame *frame = new MyFrame(_T("Minimal wxWindows App"),
-#ifdef __WXWINCE__
- wxPoint(0, 0), wxDefaultSize, wxNO_BORDER);
-#else
- wxPoint(50, 50), wxSize(450, 340));
-#endif
+ MyFrame *frame = new MyFrame(_T("Minimal wxWidgets App"));
// and show it (the frames, unlike simple controls, are not shown when
// created initially)
// and show it (the frames, unlike simple controls, are not shown when
// created initially)
- frame->Show(
TRUE
);
+ frame->Show(
true
);
// success: wxApp::OnRun() will be called which will enter the main message
// success: wxApp::OnRun() will be called which will enter the main message
- // loop and the application will run. If we returned
FALSE
here, the
+ // loop and the application will run. If we returned
false
here, the
// application would exit immediately.
// application would exit immediately.
- return
TRUE
;
+ return
true
;
}
// ----------------------------------------------------------------------------
}
// ----------------------------------------------------------------------------
@@
-142,35
+137,35
@@
bool MyApp::OnInit()
// ----------------------------------------------------------------------------
// frame constructor
// ----------------------------------------------------------------------------
// frame constructor
-MyFrame::MyFrame(const wxString& title
, const wxPoint& pos, const wxSize& size, long style
)
- : wxFrame(NULL,
-1, title, pos, size, sty
le)
+MyFrame::MyFrame(const wxString& title)
+ : wxFrame(NULL,
wxID_ANY, tit
le)
{
// set the frame icon
{
// set the frame icon
- SetIcon(wxICON(
mondrian
));
+ SetIcon(wxICON(
sample
));
#if wxUSE_MENUS
// create a menu bar
#if wxUSE_MENUS
// create a menu bar
- wxMenu *
menuFile
= new wxMenu;
+ wxMenu *
fileMenu
= new wxMenu;
// the "About" item should be in the help menu
wxMenu *helpMenu = new wxMenu;
helpMenu->Append(Minimal_About, _T("&About...\tF1"), _T("Show about dialog"));
// 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"));
+
fileMenu
->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
, _T("&File"));
+ menuBar->Append(
fileMenu
, _T("&File"));
menuBar->Append(helpMenu, _T("&Help"));
// ... and attach this menu bar to the frame
SetMenuBar(menuBar);
#endif // wxUSE_MENUS
menuBar->Append(helpMenu, _T("&Help"));
// ... and attach this menu bar to the frame
SetMenuBar(menuBar);
#endif // wxUSE_MENUS
-#if wxUSE_STATUSBAR
&& !defined(__WXWINCE__)
+#if wxUSE_STATUSBAR
// create a status bar just for fun (by default with 1 pane only)
CreateStatusBar(2);
// create a status bar just for fun (by default with 1 pane only)
CreateStatusBar(2);
- SetStatusText(_T("Welcome to wxWi
ndow
s!"));
+ SetStatusText(_T("Welcome to wxWi
dget
s!"));
#endif // wxUSE_STATUSBAR
}
#endif // wxUSE_STATUSBAR
}
@@
-179,8
+174,8
@@
MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
{
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
{
- //
TRUE
is to force the frame to close
- Close(
TRUE
);
+ //
true
is to force the frame to close
+ Close(
true
);
}
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
}
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))