X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/01ca9e8ea7d4c6f00bd46653b96857998be0ae83..abefd7eebac853dfc6a9b8939fa6fb8bc5dafcf6:/samples/minimal/minimal.cpp?ds=sidebyside diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp index 8a7835efe4..c30f96946a 100644 --- a/samples/minimal/minimal.cpp +++ b/samples/minimal/minimal.cpp @@ -16,10 +16,6 @@ // ---------------------------------------------------------------------------- // 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" @@ -29,16 +25,17 @@ #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 @@ -64,7 +61,8 @@ class MyFrame : public wxFrame { 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); @@ -84,7 +82,11 @@ enum { // 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 }; // ---------------------------------------------------------------------------- @@ -114,11 +116,11 @@ IMPLEMENT_APP(MyApp) // 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", + 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 @@ -136,57 +138,35 @@ bool MyApp::OnInit() // ---------------------------------------------------------------------------- // 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) { -#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)); +#if wxUSE_MENUS // 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; - 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(); - 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); - - wxPanel *panel = new wxPanel(this, -1); - wxStaticBox *box = new wxStaticBox(panel, -1, "box"); - wxComboBox *combo = new wxComboBox(panel, -1, "combo"); - wxLayoutConstraints *c; - c = new wxLayoutConstraints; - c->left.SameAs(panel, wxLeft); - c->right.SameAs(panel, wxRight); - c->top.SameAs(panel, wxTop); - c->bottom.SameAs(panel, wxBottom); - box->SetConstraints(c); - c = new wxLayoutConstraints; - c->left.SameAs(box, wxLeft, 20); - c->right.SameAs(box, wxRight, 10); - c->top.SameAs(box, wxTop, 10); - c->bottom.SameAs(box, wxBottom, 10); - combo->SetConstraints(c); - panel->SetAutoLayout(TRUE); +#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 } @@ -201,9 +181,33 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) 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"), wxVERSION_STRING); - wxMessageBox(msg, "About Minimal", wxOK | wxICON_INFORMATION, this); + wxMessageBox(msg, _T("About Minimal"), wxOK | wxICON_INFORMATION, this); +#endif }