X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fb4769829bba20468f2222ef68fa2b3c13b5f3b8..6ba5438dda164146bf36ca729f8328332fae36b7:/samples/caret/caret.cpp diff --git a/samples/caret/caret.cpp b/samples/caret/caret.cpp index 6ca8f4a29c..4f811d4838 100644 --- a/samples/caret/caret.cpp +++ b/samples/caret/caret.cpp @@ -17,14 +17,14 @@ #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" - #include "wx/log.h" #endif #include "wx/caret.h" +#include "wx/numdlg.h" // ---------------------------------------------------------------------------- // ressources @@ -127,7 +127,7 @@ public: private: MyCanvas *m_canvas; - // 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() }; @@ -150,10 +150,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) @@ -164,7 +164,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Caret_Move, MyFrame::OnCaretMove) 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 @@ -183,15 +183,15 @@ IMPLEMENT_APP(MyApp) bool MyApp::OnInit() { // create and show the main application window - MyFrame *frame = new MyFrame(_T("Caret wxWindows sample"), + MyFrame *frame = new MyFrame(_T("Caret wxWidgets sample"), wxPoint(50, 50), wxSize(450, 340)); - frame->Show(TRUE); + frame->Show(true); // 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; } // ---------------------------------------------------------------------------- @@ -200,7 +200,7 @@ 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)); @@ -225,9 +225,11 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) m_canvas = new MyCanvas(this); +#if wxUSE_STATUSBAR // create a status bar just for fun (by default with 1 pane only) CreateStatusBar(2); - SetStatusText(_T("Welcome to wxWindows!")); + SetStatusText(_T("Welcome to wxWidgets!")); +#endif // wxUSE_STATUSBAR } @@ -235,13 +237,13 @@ 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)) { - wxMessageBox(_T("The caret wxWindows sample.\n© 1999 Vadim Zeitlin"), + wxMessageBox(_T("The caret wxWidgets sample.\n(c) 1999 Vadim Zeitlin"), _T("About Caret"), wxOK | wxICON_INFORMATION, this); } @@ -272,8 +274,7 @@ void MyFrame::OnSetFontSize(wxCommandEvent& WXUNUSED(event)) { long fontSize = wxGetNumberFromUser ( - _T("The font size also determines the caret size so\n" - "this demonstrates resizing the caret."), + _T("The font size also determines the caret size so\nthis demonstrates resizing the caret."), _T("Font size (in points):"), _T("wxCaret sample"), 12, 1, 100, @@ -299,7 +300,7 @@ BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) END_EVENT_TABLE() MyCanvas::MyCanvas( wxWindow *parent ) - : wxScrolledWindow( parent, -1, + : wxScrolledWindow( parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER ) { @@ -386,15 +387,16 @@ void MyCanvas::ChangeSize() free(m_text); m_text = (wxChar *)calloc(m_xChars * m_yChars, sizeof(wxChar)); +#if wxUSE_STATUSBAR wxFrame *frame = wxDynamicCast(GetParent(), wxFrame); if ( frame && frame->GetStatusBar() ) { wxString msg; msg.Printf(_T("Panel size is (%d, %d)"), m_xChars, m_yChars); - frame->SetStatusText(msg, 1); } +#endif // wxUSE_STATUSBAR } // NB: this method is horrible inefficient especially because the caret