From 3aadbb82d9e8ea9b6495ea180112df6b9a94c4c7 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 17 Jul 1998 21:13:13 +0000 Subject: [PATCH] the very last traces of wxTString removed git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/filedlg.cpp | 6 +++--- src/msw/menuitem.cpp | 2 +- src/msw/ownerdrw.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp index 05c91f918c..78b3437750 100644 --- a/src/msw/filedlg.cpp +++ b/src/msw/filedlg.cpp @@ -328,10 +328,10 @@ wxDefaultFileSelector(bool load, const char *what, const char *extension, const char prompt[50]; wxString str; if (load) - str = (const char*) wxTString("Load %s file"); + str = "Load %s file"; else - str = (const char*) wxTString("Save %s file"); - sprintf(prompt, str, what); + str = "Save %s file"; + sprintf(prompt, wxGetTranslation(str), what); if (*ext == '.') ext++; char wild[60]; diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp index 4641f7d0dc..46625d1a08 100644 --- a/src/msw/menuitem.cpp +++ b/src/msw/menuitem.cpp @@ -54,7 +54,7 @@ // ----------- wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id, - const wxTString& strName, const wxTString& strHelp, + const wxString& strName, const wxString& strHelp, bool bCheckable, wxMenu *pSubMenu) : #if USE_OWNER_DRAWN diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp index 50d45ce921..117b784af3 100644 --- a/src/msw/ownerdrw.cpp +++ b/src/msw/ownerdrw.cpp @@ -35,7 +35,7 @@ // ctor // ---- -wxOwnerDrawn::wxOwnerDrawn(const wxTString& str, +wxOwnerDrawn::wxOwnerDrawn(const wxString& str, bool bCheckable, bool bMenuItem) : m_strName(str) { -- 2.45.2