X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3acf8a8d9b31ca97d21627d6f6c82fd4a9ed04b5..56d85ddeece939e0d2cf602a45286e8368544320:/samples/internat/internat.cpp diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp index c2ffd69059..d285652e7c 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" +#ifndef wxHAS_IMAGES_IN_RESOURCES + #include "../sample.xpm" #endif // ---------------------------------------------------------------------------- @@ -252,7 +252,7 @@ bool MyApp::OnInit() // Now try to add wxstd.mo so that loading "NOTEXIST.ING" file will produce // a localized error message: - m_locale.AddCatalog("wxstd.mo"); + m_locale.AddCatalog("wxstd"); // NOTE: it's not an error if we couldn't find it! // this catalog is installed in standard location on Linux systems and @@ -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; @@ -296,7 +295,7 @@ MyFrame::MyFrame(wxLocale& locale) // since wxID_ABOUT and wxID_EXIT are stock IDs they will automatically get // translated help strings; nice isn't it? - file_menu->Append(wxID_ABOUT, _("&About...")); + file_menu->Append(wxID_ABOUT, _("&About")); file_menu->AppendSeparator(); file_menu->Append(wxID_EXIT, _("E&xit")); @@ -399,7 +398,7 @@ void MyFrame::OnPlay(wxCommandEvent& WXUNUSED(event)) str = wxGetTranslation(wxTRANSLATE("Bad luck! try again...")); // note also that if we want 'str' to contain a localized string - // we need to use wxGetTranslation explicitely as wxTRANSLATE just + // we need to use wxGetTranslation explicitly as wxTRANSLATE just // tells xgettext to extract the string but has no effect on the // runtime of the program! }