X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3cb332c1553bb977cb8db16c19c733684ef72805..dd9ec5961f0ad1594d48205b3902130f3a5c85a3:/samples/joytest/joytest.cpp diff --git a/samples/joytest/joytest.cpp b/samples/joytest/joytest.cpp index e5abd60f97..6bf7bc96c3 100644 --- a/samples/joytest/joytest.cpp +++ b/samples/joytest/joytest.cpp @@ -6,7 +6,7 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // For compilers that support precompilation, includes "wx/wx.h". @@ -29,6 +29,12 @@ #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) @@ -89,8 +95,6 @@ bool MyApp::OnInit() frame->CenterOnScreen(); frame->Show(true); - SetTopWindow(frame); - return true; }