test whether pointer is non-NULL before using it, not after, in wxDoFindStringInList...

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

diff --git a/samples/vscroll/vstest.cpp b/samples/vscroll/vstest.cpp
index 515b8183bc458b2864a79e9bf225bd28291d8aa4..432c032a7ef9634d6283be50ee8efc2900b359b6 100644 (file)
--- a/samples/vscroll/vstest.cpp
+++ b/samples/vscroll/vstest.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        vscroll.cpp
+// Name:        samples/vscroll/vstest.cpp
 // Purpose:     VScroll wxWidgets sample
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -40,8 +40,8 @@
 // ----------------------------------------------------------------------------
 
 // the application icon (under Windows and OS/2 it is in resources)
-#if !defined(__WXMSW__) && !defined(__WXOS2__)
-    #include "mondrian.xpm"
+#if !defined(__WXMSW__) && !defined(__WXPM__)
+    #include "../sample.xpm"
 #endif
 
 // ----------------------------------------------------------------------------
@@ -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;
     }
 
@@ -172,7 +174,7 @@ END_EVENT_TABLE()
 enum
 {
     // menu items
-    VScroll_Quit = 1,
+    VScroll_Quit = wxID_EXIT,
 
     // 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
@@ -211,6 +213,9 @@ IMPLEMENT_APP(VScrollApp)
 // 'Main program' equivalent: the program execution "starts" here
 bool VScrollApp::OnInit()
 {
+    if ( !wxApp::OnInit() )
+        return false;
+
     // create the main application window
     VScrollFrame *frame = new VScrollFrame;
 
@@ -235,7 +240,7 @@ VScrollFrame::VScrollFrame()
                       wxSize(400, 350))
 {
     // set the frame icon
-    SetIcon(wxICON(mondrian));
+    SetIcon(wxICON(sample));
 
 #if wxUSE_MENUS
     // create a menu bar
@@ -280,7 +285,7 @@ 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);