diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp index 22caa8fbf3..558b579e0c 100644 --- a/src/common/dynlib.cpp +++ b/src/common/dynlib.cpp @@ -333,14 +333,11 @@ void *wxDllLoader::GetSymbol(wxDllType dllHandle, const wxString &name, bool *su if ( !symbol ) { - wxString msg(_("wxDllLoader failed to GetSymbol '%s'")); - #ifdef HAVE_DLERROR const wxChar *err = dlerror(); if( err ) { - failed = TRUE; - wxLogError( msg, err ); + wxLogError(wxT("%s"), err); } #else failed = TRUE; diff --git a/src/common/dynload.cpp b/src/common/dynload.cpp index 240c4e0c55..51c0a13359 100644 --- a/src/common/dynload.cpp +++ b/src/common/dynload.cpp @@ -279,7 +279,6 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const if ( !symbol ) { - wxString msg(_("wxDynamicLibrary failed to GetSymbol '%s'")); #if defined(HAVE_DLERROR) && !defined(__EMX__) #if wxUSE_UNICODE @@ -291,8 +290,7 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const if( err ) { - failed = TRUE; - wxLogError( msg, err ); + wxLogError(wxT("%s"), err); } #else failed = TRUE; diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp index 921ae318ad..c1c3a939d0 100644 --- a/src/common/prntbase.cpp +++ b/src/common/prntbase.cpp @@ -370,9 +370,9 @@ void wxPreviewControlBar::OnGoto(void) wxString strPrompt; wxString strPage; - strPrompt.Printf( _("%d...%d"), + strPrompt.Printf( wxT("%d...%d"), preview->GetMinPage(), preview->GetMaxPage()); - strPage.Printf( _("%d"), preview->GetCurrentPage() ); + strPage.Printf( wxT("%d"), preview->GetCurrentPage() ); strPage = wxGetTextFromUser( strPrompt, _("Goto Page"), strPage); diff --git a/src/mac/carbon/scrolbar.cpp b/src/mac/carbon/scrolbar.cpp index 9073f70995..68d403ae26 100644 --- a/src/mac/carbon/scrolbar.cpp +++ b/src/mac/carbon/scrolbar.cpp @@ -140,7 +140,7 @@ void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart scrollEvent = wxEVT_SCROLL_THUMBTRACK; break ; default : - wxLogError(_("illegal scrollbar selector %d"), controlpart); + wxFAIL_MSG(wxT("illegal scrollbar selector")); break ; } diff --git a/src/mac/scrolbar.cpp b/src/mac/scrolbar.cpp index 9073f70995..68d403ae26 100644 --- a/src/mac/scrolbar.cpp +++ b/src/mac/scrolbar.cpp @@ -140,7 +140,7 @@ void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart scrollEvent = wxEVT_SCROLL_THUMBTRACK; break ; default : - wxLogError(_("illegal scrollbar selector %d"), controlpart); + wxFAIL_MSG(wxT("illegal scrollbar selector")); break ; } diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp index bd65405e7f..4ed7b93ce4 100644 --- a/src/msw/toplevel.cpp +++ b/src/msw/toplevel.cpp @@ -310,9 +310,9 @@ bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate, if ( !m_hWnd ) { - wxFAIL_MSG(_("Failed to create dialog. Incorrect DLGTEMPLATE?")); + wxFAIL_MSG(wxT("Failed to create dialog. Incorrect DLGTEMPLATE?")); - wxLogSysError(_("Can't create dialog using memory template")); + wxLogSysError(wxT("Can't create dialog using memory template")); return FALSE; } diff --git a/src/os2/toplevel.cpp b/src/os2/toplevel.cpp index 252b601bd0..f30cb9c990 100644 --- a/src/os2/toplevel.cpp +++ b/src/os2/toplevel.cpp @@ -364,9 +364,9 @@ bool wxTopLevelWindowOS2::CreateDialog( if ( !m_hWnd ) { - wxFAIL_MSG(_("Did you forget to include wx/os2/wx.rc in your resources?")); + wxFAIL_MSG(wxT("Did you forget to include wx/os2/wx.rc in your resources?")); - wxLogSysError(_("Can't create dialog using template '%ul'"), ulDlgTemplate); + wxLogSysError(wxT("Can't create dialog using template '%ul'"), ulDlgTemplate); return FALSE; }