use wxDC::GetMultiLineTextExtent() instead of duplicating its code in wxButton::DoGet...

[wxWidgets.git] / samples / vscroll / vstest.cpp

diff --git a/samples/vscroll/vstest.cpp b/samples/vscroll/vstest.cpp
index eb44a21680af0b24e7f9c617bd7db9a9bc08e053..c1e18c824844e064f1e717b679ffe97c0143cc7a 100644 (file)
--- 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);