X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be5a51fb592f3fa2ba38ac6cd1e488d6d806058c..c4e2838090992384911a6a6aa44cac985d79a555:/samples/vscroll/vstest.cpp diff --git a/samples/vscroll/vstest.cpp b/samples/vscroll/vstest.cpp index eb44a21680..c1e18c8248 100644 --- a/samples/vscroll/vstest.cpp +++ b/samples/vscroll/vstest.cpp @@ -89,7 +89,7 @@ private: class VScrollWindow : public wxVScrolledWindow { public: - VScrollWindow(wxFrame *frame) : wxVScrolledWindow(frame, -1) + VScrollWindow(wxFrame *frame) : wxVScrolledWindow(frame, wxID_ANY) { m_frame = frame; @@ -100,6 +100,7 @@ public: void OnIdle(wxIdleEvent&) { +#if wxUSE_STATUSBAR m_frame->SetStatusText(wxString::Format ( _T("Page size = %d, pos = %d, max = %d"), @@ -107,6 +108,7 @@ public: GetScrollPos(wxVERTICAL), GetScrollRange(wxVERTICAL) )); +#endif // wxUSE_STATUSBAR m_changed = false; } @@ -216,10 +218,10 @@ bool VScrollApp::OnInit() // and show it (the frames, unlike simple controls, are not shown when // created initially) - frame->Show(TRUE); + frame->Show(true); // ok - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -229,7 +231,7 @@ bool VScrollApp::OnInit() // frame constructor VScrollFrame::VScrollFrame() : wxFrame(NULL, - -1, + wxID_ANY, _T("VScroll wxWidgets Sample"), wxDefaultPosition, wxSize(400, 350)) @@ -272,15 +274,15 @@ VScrollFrame::VScrollFrame() void VScrollFrame::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 VScrollFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) { wxMessageBox(_T("VScroll shows how to implement scrolling with\n") _T("variable line heights.\n") - _T("© 2003 Vadim Zeitlin"), + _T("(c) 2003 Vadim Zeitlin"), _T("About VScroll"), wxOK | wxICON_INFORMATION, this);