No changes, just remove unnecessary wxPickerBase::OnSize().

[wxWidgets.git] / samples / joytest / joytest.cpp

diff --git a/samples/joytest/joytest.cpp b/samples/joytest/joytest.cpp
index 0d25748342c32ddd16f92111b0a3e580fc080c20..6bf7bc96c3f4621913a22245a2bbfb84273494c1 100644 (file)
--- a/samples/joytest/joytest.cpp
+++ b/samples/joytest/joytest.cpp
@@ -29,6 +29,12 @@
 
 #include "joytest.h"
 
 
 #include "joytest.h"
 

+// the application icon (under Windows and OS/2 it is in resources and even
+// though we could still include the XPM here it would be unused)
+#if !defined(__WXMSW__) && !defined(__WXPM__)
+    #include "../sample.xpm"
+#endif
+

 MyFrame *frame = NULL;
 
 IMPLEMENT_APP(MyApp)
 MyFrame *frame = NULL;
 
 IMPLEMENT_APP(MyApp)


@@ -89,8 +95,6 @@ bool MyApp::OnInit()
     frame->CenterOnScreen();
     frame->Show(true);
 
     frame->CenterOnScreen();
     frame->Show(true);
 

-    SetTopWindow(frame);
-

     return true;
 }
 
     return true;
 }