diff --git a/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp b/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp index aba261308b..8d4d2b31a4 100644 --- a/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp +++ b/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp @@ -140,8 +140,8 @@ DLG_SELECT_3DMODEL::DLG_SELECT_3DMODEL( wxWindow* aParent, S3D_CACHE* aCacheMana hboxDirChoice->Add( dirChoices, 1, wxEXPAND | wxALL, 5 ); hboxDirChoice->Add( cfgPaths, 0, wxALL, 5 ); - wxButton* btn_OK = new wxButton( this, wxID_OK, _T( "OK" ) ); - wxButton* btn_Cancel = new wxButton( this, wxID_CANCEL, _T( "Cancel" ) ); + wxButton* btn_OK = new wxButton( this, wxID_OK, _( "OK" ) ); + wxButton* btn_Cancel = new wxButton( this, wxID_CANCEL, _( "Cancel" ) ); wxStdDialogButtonSizer* hSizer1 = new wxStdDialogButtonSizer(); hSizer1->AddButton( btn_OK ); diff --git a/common/dialog_about/aboutinfo.h b/common/dialog_about/aboutinfo.h index 8e19c599ca..df38e7cc43 100644 --- a/common/dialog_about/aboutinfo.h +++ b/common/dialog_about/aboutinfo.h @@ -94,8 +94,8 @@ public: #if wxUSE_UNICODE const wxString utf8_copyrightSign = wxString::FromUTF8( "\xc2\xa9" ); - copyrightText.Replace( _T( "(c)" ), utf8_copyrightSign ); - copyrightText.Replace( _T( "(C)" ), utf8_copyrightSign ); + copyrightText.Replace( "(c)", utf8_copyrightSign ); + copyrightText.Replace( "(C)", utf8_copyrightSign ); #endif // wxUSE_UNICODE return copyrightText; diff --git a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp index 5c39ba98f0..e37f4ffb5b 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp +++ b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp @@ -498,7 +498,7 @@ void DIALOG_MODULE_BOARD_EDITOR::Edit3DShapeFileName() { wxString msg = _( "Invalid filename: " ); msg.append( filename ); - wxMessageBox( msg, _T( "Edit 3D file name" ) ); + wxMessageBox( msg, _( "Edit 3D file name" ) ); return; } diff --git a/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp b/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp index a79255d74b..547a846156 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp +++ b/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp @@ -349,7 +349,7 @@ void DIALOG_MODULE_MODULE_EDITOR::Edit3DShapeFileName() { wxString msg = _( "Invalid filename: " ); msg.append( filename ); - wxMessageBox( msg, _T( "Edit 3D file name" ) ); + wxMessageBox( msg, _( "Edit 3D file name" ) ); return; } diff --git a/scripting/python_scripting.cpp b/scripting/python_scripting.cpp index f2b3d22de0..059ceef6b8 100644 --- a/scripting/python_scripting.cpp +++ b/scripting/python_scripting.cpp @@ -287,10 +287,10 @@ wxWindow* CreatePythonShellWindow( wxWindow* parent, const wxString& aFramenameI { // Otherwise, get the returned window out of Python-land and // into C++-ville... - bool success = wxPyConvertSwigPtr( result, (void**) &window, _T( "wxWindow" ) ); + bool success = wxPyConvertSwigPtr( result, (void**) &window, "wxWindow" ); (void) success; - wxASSERT_MSG( success, _T( "Returned object was not a wxWindow!" ) ); + wxASSERT_MSG( success, "Returned object was not a wxWindow!" ); Py_DECREF( result ); window->SetName( aFramenameId );