X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/788233da909b0f6bc684a99200c614e3dee2aa20..c4e2838090992384911a6a6aa44cac985d79a555:/samples/propsize/propsize.cpp?ds=sidebyside diff --git a/samples/propsize/propsize.cpp b/samples/propsize/propsize.cpp index d17a0e57f5..c217cba597 100644 --- a/samples/propsize/propsize.cpp +++ b/samples/propsize/propsize.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: propsize.cpp -// Purpose: wxWindows propsize sample +// Purpose: wxWidgets propsize sample // Author: Julian Smart // Modified by: // Created: 04/01/98 @@ -29,7 +29,7 @@ #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" wxWidgets headers #ifndef WX_PRECOMP #include "wx/wx.h" #endif @@ -73,7 +73,7 @@ public: void OnAbout(wxCommandEvent& event); private: - // any class wishing to process wxWindows events must use this macro + // any class wishing to process wxWidgets events must use this macro DECLARE_EVENT_TABLE() }; @@ -89,10 +89,10 @@ enum }; // ---------------------------------------------------------------------------- -// event tables and other macros for wxWindows +// event tables and other macros for wxWidgets // ---------------------------------------------------------------------------- -// the event tables connect the wxWindows events with the functions (event +// the event tables connect the wxWidgets 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) @@ -100,7 +100,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(wxID_ABOUT, MyFrame::OnAbout) END_EVENT_TABLE() -// Create a new application object: this macro will allow wxWindows to create +// Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a // static object for many reasons) and also declares the accessor function // wxGetApp() which will return the reference of the right type (i.e. MyApp and @@ -119,18 +119,18 @@ IMPLEMENT_APP(MyApp) bool MyApp::OnInit() { // Create the main application window - MyFrame *frame = new MyFrame("Proportional resize", + MyFrame *frame = new MyFrame(_T("Proportional resize"), 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? - frame->Show(TRUE); + 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 + // loop and the application will run. If we returned false here, the // application would exit immediately. - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -139,21 +139,21 @@ bool MyApp::OnInit() // frame constructor MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) - : wxFrame((wxFrame *)NULL, -1, title, pos, size) + : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size) { // set the frame icon SetIcon(wxICON(mondrian)); // create a menu bar - wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF); + wxMenu *menuFile = new wxMenu(_T(""), wxMENU_TEAROFF); - menuFile->Append(wxID_ABOUT, "&About...\tCtrl-A", "Show about dialog"); + menuFile->Append(wxID_ABOUT, _T("&About...\tCtrl-A"), _T("Show about dialog")); 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")); // ... and attach this menu bar to the frame SetMenuBar(menuBar); @@ -161,56 +161,61 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) #if wxUSE_STATUSBAR // create a status bar just for fun (by default with 1 pane only) CreateStatusBar(1); - SetStatusText("Resize the frame to see how controls react"); + SetStatusText(_T("Resize the frame to see how controls react")); #endif // wxUSE_STATUSBAR -#define AddLine(orient) \ - Add( new wxStaticLine( this, -1, wxDefaultPosition, wxSize(2,2), orient), \ - 0, wxEXPAND) +#if wxUSE_STATLINE + #define AddLine(orient) \ + Add( new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxSize(2,2), orient), \ + 0, wxEXPAND) +#else + #define AddLine(orient) \ + Add( 2, 2) +#endif // wxUSE_STATLINE #define AddButton(label,align) Add( \ - new wxButton( this, -1, label, wxDefaultPosition, wxSize(100,50)), \ + new wxButton( this, wxID_ANY, label, wxDefaultPosition, wxSize(100,50)), \ 1, wxSHAPED | align) wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); // top row -- top-aligned wxBoxSizer *hsizer1 = new wxBoxSizer( wxHORIZONTAL ); - hsizer1->AddButton( "one", wxALIGN_LEFT | wxALIGN_TOP); + hsizer1->AddButton( _T("one"), wxALIGN_LEFT | wxALIGN_TOP); hsizer1->AddLine(wxVERTICAL); - hsizer1->AddButton( "two", wxALIGN_CENTER_HORIZONTAL | wxALIGN_TOP); + hsizer1->AddButton( _T("two"), wxALIGN_CENTER_HORIZONTAL | wxALIGN_TOP); hsizer1->AddLine(wxVERTICAL); - hsizer1->AddButton( "three", wxALIGN_RIGHT | wxALIGN_TOP); + hsizer1->AddButton( _T("three"), wxALIGN_RIGHT | wxALIGN_TOP); topsizer->Add(hsizer1, 1, wxEXPAND); topsizer->AddLine(wxHORIZONTAL); wxBoxSizer *hsizer2 = new wxBoxSizer( wxHORIZONTAL ); - hsizer2->AddButton( "four", wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL); + hsizer2->AddButton( _T("four"), wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL); hsizer2->AddLine(wxVERTICAL); // sizer that preserves it's shape wxBoxSizer *vsizer = new wxBoxSizer( wxVERTICAL ); vsizer->Add( - new wxButton( this, -1, "up", wxDefaultPosition, wxSize(100,25) ), + new wxButton( this, wxID_ANY, _T("up"), wxDefaultPosition, wxSize(100,25) ), 1, wxEXPAND); vsizer->Add( - new wxButton( this, -1, "down", wxDefaultPosition, wxSize(100,25) ), + new wxButton( this, wxID_ANY, _T("down"), wxDefaultPosition, wxSize(100,25) ), 1, wxEXPAND); hsizer2->Add(vsizer, 1, wxSHAPED | wxALIGN_CENTER); hsizer2->AddLine(wxVERTICAL); - hsizer2->AddButton( "six", wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL); + hsizer2->AddButton( _T("six"), wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL); topsizer->Add(hsizer2, 1, wxEXPAND); topsizer->AddLine(wxHORIZONTAL); wxBoxSizer *hsizer3 = new wxBoxSizer( wxHORIZONTAL ); - hsizer3->AddButton( "seven", wxALIGN_LEFT | wxALIGN_BOTTOM); + hsizer3->AddButton( _T("seven"), wxALIGN_LEFT | wxALIGN_BOTTOM); hsizer3->AddLine(wxVERTICAL); - hsizer3->AddButton( "eight", wxALIGN_CENTER_HORIZONTAL | wxALIGN_BOTTOM); + hsizer3->AddButton( _T("eight"), wxALIGN_CENTER_HORIZONTAL | wxALIGN_BOTTOM); hsizer3->AddLine(wxVERTICAL); // wxEXPAND should have no effect - hsizer3->AddButton( "nine", wxEXPAND | wxALIGN_RIGHT | wxALIGN_BOTTOM); + hsizer3->AddButton( _T("nine"), wxEXPAND | wxALIGN_RIGHT | wxALIGN_BOTTOM); topsizer->Add(hsizer3, 1, wxEXPAND); @@ -228,8 +233,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) 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)) @@ -246,5 +251,5 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) #endif // wxBETA_NUMBER ); - wxMessageBox(msg, "About Shaped Sizer", wxOK | wxICON_INFORMATION, this); + wxMessageBox(msg, _T("About Shaped Sizer"), wxOK | wxICON_INFORMATION, this); }