// ----------------------------------------------------------------------------
// 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
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+
+// 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
{
public:
// ctor(s)
- MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
+ MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
+ long style = wxDEFAULT_FRAME_STYLE);
// event handlers (these functions should _not_ be virtual)
void OnQuit(wxCommandEvent& event);
void OnAbout(wxCommandEvent& event);
- void OnPaint(wxPaintEvent& event);
-
private:
// any class wishing to process wxWindows events must use this macro
DECLARE_EVENT_TABLE()
{
// 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
};
// ----------------------------------------------------------------------------
// 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)
+MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, long style)
+ : wxFrame(NULL, -1, title, pos, size, style)
{
// set the frame icon
SetIcon(wxICON(mondrian));
+#if wxUSE_MENUS
// create a menu bar
- wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF);
+ wxMenu *menuFile = new wxMenu;
- menuFile->Append(Minimal_About, "&About...\tCtrl-A", "Show about dialog");
- menuFile->AppendSeparator();
- menuFile->Append(Minimal_Quit, "E&xit\tAlt-X", "Quit this program");
+ // 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");
+ 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))
{
+#if 1
+ wxDialog dialog( this, -1, "Test", wxDefaultPosition, wxDefaultSize,
+ wxDEFAULT_DIALOG_STYLE | wxCLIP_CHILDREN | wxRESIZE_BORDER );
+ wxDialog *parent = &dialog;
+
+ wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
+
+ wxStaticBox *item2 = new wxStaticBox( parent, -1, "Text" );
+ wxStaticBoxSizer *item1 = new wxStaticBoxSizer( item2, wxVERTICAL );
+
+ wxCheckBox *item3 = new wxCheckBox( parent, -1, "Check", wxDefaultPosition, wxDefaultSize, 0 );
+ item1->Add( item3, 0, wxALIGN_CENTRE|wxALL, 5 );
+
+ item0->Add( item1, 0, wxALIGN_CENTRE|wxALL, 10 );
+
+ parent->SetAutoLayout( TRUE );
+ parent->SetSizer( item0 );
+ item0->Fit( parent );
+ item0->SetSizeHints( parent );
+
+ dialog.ShowModal();
+
+#else
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);
-}
+ _T("Welcome to %s"), wxVERSION_STRING);
+ wxMessageBox(msg, _T("About Minimal"), wxOK | wxICON_INFORMATION, this);
+#endif
+}
projects / wxWidgets.git / blobdiff