X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/10afaa0b97d8c47ea700f546a50ccf3ecd9a3acd..69358718959f700434643f341bfee8f38b55cbb7:/samples/internat/internat.cpp?ds=sidebyside diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp index c2fa8fcb36..b39fb8972c 100644 --- a/samples/internat/internat.cpp +++ b/samples/internat/internat.cpp @@ -6,7 +6,7 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // NOTE: don't miss the "readme.txt" file which comes with this sample! @@ -37,8 +37,8 @@ #include "wx/log.h" #include "wx/cmdline.h" -#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) -#include "mondrian.xpm" +#if !defined(__WXMSW__) && !defined(__WXPM__) + #include "../sample.xpm" #endif // ---------------------------------------------------------------------------- @@ -271,7 +271,6 @@ bool MyApp::OnInit() // Show the frame frame->Show(true); - SetTopWindow(frame); return true; } @@ -287,7 +286,7 @@ MyFrame::MyFrame(wxLocale& locale) _("International wxWidgets App")), m_locale(locale) { - SetIcon(wxICON(mondrian)); + SetIcon(wxICON(sample)); // Make a menubar wxMenu *file_menu = new wxMenu;