X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1ecffbff714ff707ded9266bf27c3347946cbcd9..c16d276354b116475bf85a0388b4b0f545da0f82:/samples/minimal/minimal.cpp?ds=sidebyside diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp index 87122a4e3a..e5eb0633d1 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__) #include "mondrian.xpm" #endif @@ -69,9 +66,6 @@ public: // event handlers (these functions should _not_ be virtual) void OnQuit(wxCommandEvent& event); void OnAbout(wxCommandEvent& event); - void OnTest(wxCommandEvent& event); - - void OnPaint(wxPaintEvent& event); private: // any class wishing to process wxWindows events must use this macro @@ -87,11 +81,11 @@ enum { // menu items Minimal_Quit = 1, - Minimal_About, - Minimal_Test, - // 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 }; // ---------------------------------------------------------------------------- @@ -104,10 +98,6 @@ enum BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Minimal_Quit, MyFrame::OnQuit) EVT_MENU(Minimal_About, MyFrame::OnAbout) - - EVT_MENU(Minimal_Test, MyFrame::OnTest) - - EVT_PAINT(MyFrame::OnPaint) END_EVENT_TABLE() // Create a new application object: this macro will allow wxWindows to create @@ -125,17 +115,16 @@ 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", + // 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 @@ -149,30 +138,34 @@ bool MyApp::OnInit() // 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("", wxMENU_TEAROFF); + wxMenu *menuFile = 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")); - menuFile->Append(Minimal_About, "&About...\tCtrl-A", "Show about dialog"); - menuFile->Append(Minimal_Test, "&Test...\tCtrl-T", "Test"); - menuFile->AppendSeparator(); - 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(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 } @@ -189,84 +182,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) { 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); -} - -struct Foo -{ - Foo(int n_) { n = n_; } - - int n; -}; - -WX_DECLARE_LIST(Foo, FooList); - -#include - -WX_DEFINE_LIST(FooList); - -int FooSort(const Foo **item1, const Foo **item2) -{ - return (*item2)->n - (*item1)->n; -} - -void ShowList(const FooList& list) -{ - wxString msg, str; - msg = "The list elements: ("; - for ( FooList::Node *node = list.GetFirst(); node; node = node->GetNext() ) - { - if ( !!str ) - msg += ", "; - str.Printf("%d", node->GetData()->n); - msg += str; - } - - msg += ')'; - - wxMessageBox(msg, "List contents", wxOK | wxICON_INFORMATION); -} - -void MyFrame::OnTest(wxCommandEvent& event) -{ - FooList list; - list.Append(new Foo(12)); - list.Append(new Foo(3)); - list.Append(new Foo(1)); - list.Append(new Foo(7)); - list.Append(new Foo(4)); - ShowList(list); - list.Sort(FooSort); - ShowList(list); -} - -void MyFrame::OnPaint(wxPaintEvent& event) -{ - wxPaintDC dc(this); - - wxMemoryDC dcMem; - wxSize size(GetClientSize()); - dcMem.SelectObject(wxBitmap(size.x, size.y, -1)); - - dcMem.SetBackground(wxBrush(wxColour(0, 0, 255), wxSOLID)); - dcMem.SetTextForeground(wxColour(0, 255, 0)); - dcMem.SetTextBackground(wxColour(0, 0, 0)); - dcMem.SetBackgroundMode(wxSOLID); - dcMem.Clear(); - dcMem.DrawText("Hello, wxWindows!", 10, 10); - - wxPoint ptOrig(0, 0); - dc.Blit(ptOrig, size, &dcMem, ptOrig); + _T("Welcome to %s"), wxVERSION_STRING); - dcMem.SelectObject(wxNullBitmap); + wxMessageBox(msg, _T("About Minimal"), wxOK | wxICON_INFORMATION, this); }