X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/749bfe9a6de1187def2b26c0cbbb249c1548c1ac..26564cf29d6fe52e5f993381a662e47271674d0c:/samples/vscroll/vstest.cpp

diff --git a/samples/vscroll/vstest.cpp b/samples/vscroll/vstest.cpp
index c1e18c8248..432c032a7e 100644
--- 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
 
 // ----------------------------------------------------------------------------
@@ -174,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
@@ -213,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;
 
@@ -237,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