From cd83a3c3db44da7c50fb2dd1937353f3383d458c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 10 Nov 2002 15:01:56 +0000 Subject: [PATCH] _really_ fixed internat.cpp crash (?) instead of commenting the code out and hapilly forgetting about it git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/internat/internat.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp index 3245e301e7..42ac1167e8 100644 --- a/samples/internat/internat.cpp +++ b/samples/internat/internat.cpp @@ -171,16 +171,12 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) ) void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) { wxString localeInfo; -#if 0 - localeInfo.Printf( _("Language: %s\nSystem locale name: %s\nCanonical locale name: %s\n"), - m_locale.GetLocale(), - m_locale.GetSysName().c_str(), - m_locale.GetCanonicalName().c_str() ); -#endif + wxString locale = m_locale.GetLocale(); + wxString sysname = m_locale.GetSysName(); + wxString canname = m_locale.GetCanonicalName(); - localeInfo.Printf( _("Language: %s\nCanonical locale name: %s\n"), - m_locale.GetLocale(), - m_locale.GetCanonicalName().c_str() ); + localeInfo.Printf( _("Language: %s\nSystem locale name: %s\nCanonical locale name: %s\n"), + locale.c_str(), sysname.c_str(), canname.c_str() ); wxMessageDialog(this, wxString(_("I18n sample\n(c) 1998, 1999 Vadim Zeitlin and Julian Smart")) + wxT("\n\n") + localeInfo,