the very last traces of wxTString removed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index 05c91f918cddab38ead2b96355bc616b54bf08db..78b34377507b1285480e4a6c5874c6d5a765daa7 100644 (file)
--- 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)
   char prompt[50];
   wxString str;
   if (load)

-    str = (const char*) wxTString("Load %s file");
+    str = "Load %s file";

   else
   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];
 
   if (*ext == '.') ext++;
   char wild[60];

diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index 4641f7d0dc912d71aab4d1d3460512d4d49b97cb..46625d1a080f324ac263ed3c74249268bd188d90 100644 (file)
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -54,7 +54,7 @@
 // -----------
 
 wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id,
 // -----------
 
 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
                        bool bCheckable,
                        wxMenu *pSubMenu) :
 #if USE_OWNER_DRAWN

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index 50d45ce9219eab296aede97100b01987aca54617..117b784af36f0edf71809ba4b72a69df4b2adde1 100644 (file)
--- a/src/msw/ownerdrw.cpp
+++ b/src/msw/ownerdrw.cpp
@@ -35,7 +35,7 @@
 
 // ctor
 // ----
 
 // ctor
 // ----

-wxOwnerDrawn::wxOwnerDrawn(const wxTString& str, 
+wxOwnerDrawn::wxOwnerDrawn(const wxString& str, 

                            bool bCheckable, bool bMenuItem)
             : m_strName(str)
 {
                            bool bCheckable, bool bMenuItem)
             : m_strName(str)
 {