the very last traces of wxTString removed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
11ed4f79aa
commit
3aadbb82d9
@ -328,10 +328,10 @@ wxDefaultFileSelector(bool load, const char *what, const char *extension, const
|
|||||||
char prompt[50];
|
char prompt[50];
|
||||||
wxString str;
|
wxString str;
|
||||||
if (load)
|
if (load)
|
||||||
str = (const char*) wxTString("Load %s file");
|
str = "Load %s file";
|
||||||
else
|
else
|
||||||
str = (const char*) wxTString("Save %s file");
|
str = "Save %s file";
|
||||||
sprintf(prompt, str, what);
|
sprintf(prompt, wxGetTranslation(str), what);
|
||||||
|
|
||||||
if (*ext == '.') ext++;
|
if (*ext == '.') ext++;
|
||||||
char wild[60];
|
char wild[60];
|
||||||
|
@ -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,
|
bool bCheckable,
|
||||||
wxMenu *pSubMenu) :
|
wxMenu *pSubMenu) :
|
||||||
#if USE_OWNER_DRAWN
|
#if USE_OWNER_DRAWN
|
||||||
|
@ -35,7 +35,7 @@
|
|||||||
|
|
||||||
// ctor
|
// ctor
|
||||||
// ----
|
// ----
|
||||||
wxOwnerDrawn::wxOwnerDrawn(const wxTString& str,
|
wxOwnerDrawn::wxOwnerDrawn(const wxString& str,
|
||||||
bool bCheckable, bool bMenuItem)
|
bool bCheckable, bool bMenuItem)
|
||||||
: m_strName(str)
|
: m_strName(str)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user