AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Applied patch [ 761138 ] Replaces references to wxT("") and _T("") with wxEmptyString

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2003-07-10 08:36:14 +00:00
parent 7f03dc2854
commit fda7962d02
37 changed files with 71 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/cmdproc.h
View File

@ -28,7 +28,7 @@ class WXDLLEXPORT wxMenu;
class WXDLLEXPORT wxCommand : public wxObject
{
public:
wxCommand(bool canUndoIt = FALSE, const wxString& name = wxT(""));
wxCommand(bool canUndoIt = FALSE, const wxString& name = wxEmptyString);
~wxCommand();
// Override this to perform a command

2
include/wx/ffile.h
View File

@ -53,7 +53,7 @@ public:
bool Close();
// assign an existing file descriptor and get it back from wxFFile object
void Attach(FILE *fp, const wxString& name = wxT(""))
void Attach(FILE *fp, const wxString& name = wxEmptyString)
{ Close(); m_fp = fp; m_name = name; }
void Detach() { m_fp = NULL; }
FILE *fp() const { return m_fp; }

8
include/wx/fileconf.h
View File

@ -116,10 +116,10 @@ public:
// ctor & dtor
// New constructor: one size fits all. Specify wxCONFIG_USE_LOCAL_FILE or
// wxCONFIG_USE_GLOBAL_FILE to say which files should be used.
wxFileConfig(const wxString& appName = wxT(""),
const wxString& vendorName = wxT(""),
const wxString& localFilename = wxT(""),
const wxString& globalFilename = wxT(""),
wxFileConfig(const wxString& appName = wxEmptyString,
const wxString& vendorName = wxEmptyString,
const wxString& localFilename = wxEmptyString,
const wxString& globalFilename = wxEmptyString,
long style = wxCONFIG_USE_LOCAL_FILE,
wxMBConv& conv = wxConvUTF8);

4
include/wx/filename.h
View File

@ -150,7 +150,7 @@ public:
wxPathFormat format = wxPATH_NATIVE)
{
// empty volume
Assign(_T(""), path, name, ext, format);
Assign(wxEmptyString, path, name, ext, format);
}
void AssignDir(const wxString& dir, wxPathFormat format = wxPATH_NATIVE);
@ -270,7 +270,7 @@ public:
// returns TRUE if the file name was modified, FALSE if we failed to do
// anything with it (happens when the file is on a different volume,
// for example)
bool MakeRelativeTo(const wxString& pathBase = _T(""),
bool MakeRelativeTo(const wxString& pathBase = wxEmptyString,
wxPathFormat format = wxPATH_NATIVE);
// make the path absolute

2
include/wx/fontenum.h
View File

@ -43,7 +43,7 @@ public:
// enumerate the different encodings either for given font facename or for
// all facenames - will result in OnFontEncoding() being called for each
// available (facename, encoding) couple
virtual bool EnumerateEncodings(const wxString& facename = wxT(""));
virtual bool EnumerateEncodings(const wxString& facename = wxEmptyString);
// callbacks which are called after one of EnumerateXXX() functions from
// above is invoked - all of them may return FALSE to stop enumeration or

2
include/wx/helpbase.h
View File

@ -45,7 +45,7 @@ public:
virtual void SetViewer(const wxString& WXUNUSED(viewer), long WXUNUSED(flags) = 0) {}
// If file is "", reloads file given in Initialize
virtual bool LoadFile(const wxString& file = wxT("")) = 0;
virtual bool LoadFile(const wxString& file = wxEmptyString) = 0;
// Displays the contents
virtual bool DisplayContents(void) = 0;

2
include/wx/image.h
View File

@ -51,7 +51,7 @@ class WXDLLEXPORT wxImageHandler: public wxObject
{
public:
wxImageHandler()
: m_name(wxT("")), m_extension(wxT("")), m_mime(), m_type(0)
: m_name(wxEmptyString), m_extension(wxEmptyString), m_mime(), m_type(0)
{ }
#if wxUSE_STREAMS

2
include/wx/log.h
View File

@ -448,7 +448,7 @@ public:
#define wxSysErrorMsg( X ) (const wxChar*)NULL
// Fake symbolic trace masks... for those that are used frequently
#define wxTRACE_OleCalls wxT("") // OLE interface calls
#define wxTRACE_OleCalls wxEmptyString // OLE interface calls
#endif // wxUSE_LOG/!wxUSE_LOG

2
include/wx/mimetype.h
View File

@ -178,7 +178,7 @@ public:
// ctors
MessageParameters() { }
MessageParameters(const wxString& filename,
const wxString& mimetype = _T(""))
const wxString& mimetype = wxEmptyString)
: m_filename(filename), m_mimetype(mimetype) { }
// accessors (called by GetOpenCommand)

8
include/wx/msw/regconf.h
View File

@ -30,10 +30,10 @@ class WXDLLIMPEXP_BASE wxRegConfig : public wxConfigBase
public:
// ctor & dtor
// will store data in HKLM\appName and HKCU\appName
wxRegConfig(const wxString& appName = _T(""),
const wxString& vendorName = _T(""),
const wxString& localFilename = _T(""),
const wxString& globalFilename = _T(""),
wxRegConfig(const wxString& appName = wxEmptyString,
const wxString& vendorName = wxEmptyString,
const wxString& localFilename = wxEmptyString,
const wxString& globalFilename = wxEmptyString,
long style = 0);
// dtor will save unsaved data

4
src/msw/app.cpp
View File

@ -189,8 +189,8 @@ void *wxGUIAppTraits::BeforeChildWaitLoop()
wxWindow *winActive = new wxFrame
(
wxTheApp->GetTopWindow(),
-1,
_T(""),
wxID_ANY,
wxEmptyString,
wxPoint(32600, 32600),
wxSize(1, 1),
wxDEFAULT_FRAME_STYLE | wxFRAME_NO_TASKBAR

2
src/msw/bmpbuttn.cpp
View File

@ -95,7 +95,7 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
(
0,
wxT("BUTTON"),
wxT(""),
wxEmptyString,
msStyle,
0, 0, 0, 0,
GetWinHwnd(parent),

2
src/msw/combobox.cpp
View File

@ -410,7 +410,7 @@ void wxComboBox::SetInsertionPoint(long pos)
// Scroll insertion point into view
SendMessage(hEditWnd, EM_SCROLLCARET, (WPARAM)0, (LPARAM)0);
// Why is this necessary? (Copied from wxTextCtrl::SetInsertionPoint)
SendMessage(hEditWnd, EM_REPLACESEL, 0, (LPARAM)_T(""));
SendMessage(hEditWnd, EM_REPLACESEL, 0, (LPARAM) wxEmptyString);
}
#endif // __WIN32__
}

2
src/msw/dcprint.cpp
View File

@ -276,7 +276,7 @@ static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName)
GlobalFree(pd.hDevMode);
pd.hDevMode=NULL;
}
return ( deviceName != wxT("") );
return ( deviceName != wxEmptyString );
}
// Gets an HDC for the specified printer configuration

2
src/msw/filedlg.cpp
View File

@ -99,7 +99,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
if ( ( m_dialogStyle & wxMULTIPLE ) && ( m_dialogStyle & wxSAVE ) )
m_dialogStyle &= ~wxMULTIPLE;
m_parent = parent;
m_path = wxT("");
m_path = wxEmptyString;
m_fileName = defaultFileName;
m_dir = defaultDir;
m_wildCard = wildCard;

4
src/msw/font.cpp
View File

@ -64,7 +64,7 @@ public:
wxFontRefData()
{
Init(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL,
FALSE, _T(""), wxFONTENCODING_DEFAULT);
FALSE, wxEmptyString, wxFONTENCODING_DEFAULT);
}
wxFontRefData(int size,
@ -891,7 +891,7 @@ bool wxFont::GetUnderlined() const
wxString wxFont::GetFaceName() const
{
wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") );
wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
return M_FONTDATA->GetFaceName();
}

2
src/msw/iniconf.cpp
View File

@ -95,7 +95,7 @@ wxIniConfig::wxIniConfig(const wxString& strAppName,
}
// set root path
SetPath(wxT(""));
SetPath(wxEmptyString);
}
wxIniConfig::~wxIniConfig()

2
src/msw/listctrl.cpp
View File

@ -313,7 +313,7 @@ bool wxListCtrl::DoCreateControl(int x, int y, int w, int h)
// Create the ListView control.
m_hWnd = (WXHWND)CreateWindowEx(exStyle,
WC_LISTVIEW,
wxT(""),
wxEmptyString,
wstyle,
x, y, w, h,
GetWinHwnd(GetParent()),

4
src/msw/metafile.cpp
View File

@ -94,7 +94,7 @@ wxMetafile::wxMetafile(const wxString& file)
M_METAFILEDATA->m_windowsMappingMode = wxMM_ANISOTROPIC;
M_METAFILEDATA->m_metafile = 0;
if (!file.IsNull() && (file.Cmp(wxT("")) == 0))
if (!file.IsNull() && (file.Cmp(wxEmptyString) == 0))
M_METAFILEDATA->m_metafile = (WXHANDLE) GetMetaFile(file);
}
@ -180,7 +180,7 @@ wxMetafileDC::wxMetafileDC(const wxString& file)
if (!file.IsNull() && wxFileExists(file))
wxRemoveFile(file);
if (!file.IsNull() && (file != wxT("")))
if (!file.IsNull() && (file != wxEmptyString))
m_hDC = (WXHDC) CreateMetaFile(file);
else
m_hDC = (WXHDC) CreateMetaFile(NULL);

34
src/msw/mimetype.cpp
View File

@ -111,7 +111,7 @@ size_t wxFileTypeImpl::GetAllCommands(wxArrayString *verbs,
// get it from the registry
wxFileTypeImpl *self = wxConstCast(this, wxFileTypeImpl);
wxRegKey rkey(wxRegKey::HKCR, m_ext);
if ( !rkey.Exists() || !rkey.QueryValue(_T(""), self->m_strFileType) )
if ( !rkey.Exists() || !rkey.QueryValue(wxEmptyString, self->m_strFileType) )
{
wxLogDebug(_T("Can't get the filetype for extension '%s'."),
m_ext.c_str());
@ -164,7 +164,7 @@ bool wxFileTypeImpl::EnsureExtKeyExists()
wxRegKey rkey(wxRegKey::HKCR, m_ext);
if ( !rkey.Exists() )
{
if ( !rkey.Create() || !rkey.SetValue(_T(""), m_strFileType) )
if ( !rkey.Create() || !rkey.SetValue(wxEmptyString, m_strFileType) )
{
wxLogError(_("Failed to create registry entry for '%s' files."),
m_ext.c_str());
@ -201,7 +201,7 @@ wxString wxFileTypeImpl::GetCommand(const wxChar *verb) const
wxString command;
if ( key.Open() ) {
// it's the default value of the key
if ( key.QueryValue(wxT(""), command) ) {
if ( key.QueryValue(wxEmptyString, command) ) {
// transform it from '%1' to '%s' style format string (now also
// test for %L - apparently MS started using it as well for the
// same purpose)
@ -230,13 +230,13 @@ wxString wxFileTypeImpl::GetCommand(const wxChar *verb) const
wxRegKey keyDDE(wxRegKey::HKCR, strKey);
if ( keyDDE.Open() ) {
wxString ddeCommand, ddeServer, ddeTopic;
keyDDE.QueryValue(_T(""), ddeCommand);
keyDDE.QueryValue(wxEmptyString, ddeCommand);
ddeCommand.Replace(_T("%1"), _T("%s"));
wxRegKey(wxRegKey::HKCR, strKey + _T("\\Application")).
QueryValue(_T(""), ddeServer);
QueryValue(wxEmptyString, ddeServer);
wxRegKey(wxRegKey::HKCR, strKey + _T("\\Topic")).
QueryValue(_T(""), ddeTopic);
QueryValue(wxEmptyString, ddeTopic);
if (ddeTopic.IsEmpty())
ddeTopic = wxT("System");
@ -347,7 +347,7 @@ bool wxFileTypeImpl::GetIcon(wxIconLocation *iconLoc) const
if ( key.Open() ) {
wxString strIcon;
// it's the default value of the key
if ( key.QueryValue(wxT(""), strIcon) ) {
if ( key.QueryValue(wxEmptyString, strIcon) ) {
// the format is the following: <full path to file>, <icon index>
// NB: icon index may be negative as well as positive and the full
// path may contain the environment variables inside '%'
@ -384,7 +384,7 @@ bool wxFileTypeImpl::GetDescription(wxString *desc) const
if ( key.Open() ) {
// it's the default value of the key
if ( key.QueryValue(wxT(""), *desc) ) {
if ( key.QueryValue(wxEmptyString, *desc) ) {
return TRUE;
}
}
@ -421,7 +421,7 @@ wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString& ext)
wxRegKey key(wxRegKey::HKCR, str);
if ( key.Open() ) {
// it's the default value of the key
if ( key.QueryValue(wxT(""), strFileType) ) {
if ( key.QueryValue(wxEmptyString, strFileType) ) {
// create the new wxFileType object
return CreateFileType(strFileType, ext);
}
@ -542,7 +542,7 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
filetype = filetypeOrig;
}
ok = key.SetValue(_T(""), filetype);
ok = key.SetValue(wxEmptyString, filetype);
}
}
else
@ -551,11 +551,11 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
if (!filetypeOrig.empty())
{
filetype = filetypeOrig;
ok = key.SetValue(_T(""), filetype);
ok = key.SetValue(wxEmptyString, filetype);
}
else
{
ok = key.QueryValue(_T(""), filetype);
ok = key.QueryValue(wxEmptyString, filetype);
}
}
// now set a mimetypeif we have it, but ignore it if none
@ -593,7 +593,7 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
wxRegKey key(wxRegKey::HKCR, extWithDot);
if ( !key.Exists() ) ok = key.Create();
ok = key.SetValue(_T(""), filetype);
ok = key.SetValue(wxEmptyString, filetype);
// now set any mimetypes we may have, but ignore it if none
const wxString& mimetype = ftInfo.GetMimeType();
@ -657,7 +657,7 @@ bool wxFileTypeImpl::SetCommand(const wxString& cmd,
{
#if wxUSE_GUI
wxString old;
rkey.QueryValue(wxT(""), old);
rkey.QueryValue(wxEmptyString, old);
if ( wxMessageBox
(
wxString::Format(
@ -681,7 +681,7 @@ bool wxFileTypeImpl::SetCommand(const wxString& cmd,
// TODO:
// 1. translate '%s' to '%1' instead of always adding it
// 2. create DDEExec value if needed (undo GetCommand)
return rkey.Create() && rkey.SetValue(_T(""), cmd + _T(" \"%1\"") );
return rkey.Create() && rkey.SetValue(wxEmptyString, cmd + _T(" \"%1\"") );
}
/* // no longer used
@ -724,7 +724,7 @@ bool wxFileTypeImpl::SetDefaultIcon(const wxString& cmd, int index)
wxRegKey rkey(wxRegKey::HKCR, m_strFileType + _T("\\DefaultIcon"));
return rkey.Create() &&
rkey.SetValue(_T(""),
rkey.SetValue(wxEmptyString,
wxString::Format(_T("%s,%d"), cmd.c_str(), index));
}
@ -739,7 +739,7 @@ bool wxFileTypeImpl::SetDescription (const wxString& desc)
wxRegKey rkey(wxRegKey::HKCR, m_strFileType );
return rkey.Create() &&
rkey.SetValue(_T(""), desc);
rkey.SetValue(wxEmptyString, desc);
}
// ----------------------------------------------------------------------------

4
src/msw/notebook.cpp
View File

@ -175,7 +175,7 @@ bool wxNotebook::Create(wxWindow *parent,
wxDefaultValidator, name) )
return FALSE;
if ( !MSWCreateControl(WC_TABCONTROL, _T(""), pos, size) )
if ( !MSWCreateControl(WC_TABCONTROL, wxEmptyString, pos, size) )
return FALSE;
SetBackgroundColour(wxColour(::GetSysColor(COLOR_BTNFACE)));
@ -265,7 +265,7 @@ bool wxNotebook::SetPageText(int nPage, const wxString& strText)
wxString wxNotebook::GetPageText(int nPage) const
{
wxCHECK_MSG( IS_VALID_PAGE(nPage), wxT(""), wxT("notebook page out of range") );
wxCHECK_MSG( IS_VALID_PAGE(nPage), wxEmptyString, wxT("notebook page out of range") );
wxChar buf[256];
TC_ITEM tcItem;

2
src/msw/ole/dataobj.cpp
View File

@ -62,7 +62,7 @@
#ifdef __WXDEBUG__
static const wxChar *GetTymedName(DWORD tymed);
#else // !Debug
#define GetTymedName(tymed) _T("")
#define GetTymedName(tymed) wxEmptyString
#endif // Debug/!Debug
// ----------------------------------------------------------------------------

2
src/msw/radiobox.cpp
View File

@ -284,7 +284,7 @@ bool wxRadioBox::Create(wxWindow *parent,
// Create a dummy radio control to end the group.
(void)::CreateWindow(_T("BUTTON"),
_T(""),
wxEmptyString,
WS_GROUP | BS_AUTORADIOBUTTON | WS_CHILD,
0, 0, 0, 0, hwndParent,
(HMENU)NewControlId(), wxGetInstance(), NULL);

4
src/msw/regconf.cpp
View File

@ -124,7 +124,7 @@ wxRegConfig::wxRegConfig(const wxString& appName, const wxString& vendorName,
m_keyLocal.ReserveMemoryForName(MEMORY_PREALLOC);
m_keyLocalRoot.SetName(wxRegKey::HKCU, SOFTWARE_KEY + str);
m_keyLocal.SetName(m_keyLocalRoot, _T(""));
m_keyLocal.SetName(m_keyLocalRoot, wxEmptyString);
if ( bDoUseGlobal )
{
@ -134,7 +134,7 @@ wxRegConfig::wxRegConfig(const wxString& appName, const wxString& vendorName,
m_keyGlobal.ReserveMemoryForName(MEMORY_PREALLOC);
m_keyGlobalRoot.SetName(wxRegKey::HKLM, SOFTWARE_KEY + str);
m_keyGlobal.SetName(m_keyGlobalRoot, _T(""));
m_keyGlobal.SetName(m_keyGlobalRoot, wxEmptyString);
}
// Create() will Open() if key already exists

4
src/msw/registry.cpp
View File

@ -127,7 +127,7 @@ const size_t wxRegKey::nStdKeys = WXSIZEOF(aStdKeys);
const wxChar *wxRegKey::GetStdKeyName(size_t key)
{
// return empty string if key is invalid
wxCHECK_MSG( key < nStdKeys, wxT(""), wxT("invalid key in wxRegKey::GetStdKeyName") );
wxCHECK_MSG( key < nStdKeys, wxEmptyString, wxT("invalid key in wxRegKey::GetStdKeyName") );
return aStdKeys[key].szName;
}
@ -135,7 +135,7 @@ const wxChar *wxRegKey::GetStdKeyName(size_t key)
const wxChar *wxRegKey::GetStdKeyShortName(size_t key)
{
// return empty string if key is invalid
wxCHECK( key < nStdKeys, wxT("") );
wxCHECK( key < nStdKeys, wxEmptyString );
return aStdKeys[key].szShortName;
}

4
src/msw/slider95.cpp
View File

@ -155,7 +155,7 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
HWND scroll_bar = CreateWindowEx
(
exStyle, TRACKBAR_CLASS, wxT(""),
exStyle, TRACKBAR_CLASS, wxEmptyString,
msStyle,
0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
wxGetInstance(), NULL
@ -174,7 +174,7 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
SubclassWin(GetHWND());
::SetWindowText((HWND) m_hWnd, wxT(""));
::SetWindowText((HWND) m_hWnd, wxEmptyString);
SetFont(parent->GetFont());

2
src/msw/slidrmsw.cpp
View File

@ -108,7 +108,7 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
else
msStyle = SBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;
HWND scroll_bar = CreateWindowEx(exStyle, wxT("SCROLLBAR"), wxT(""),
HWND scroll_bar = CreateWindowEx(exStyle, wxT("SCROLLBAR"), wxEmptyString,
msStyle,
0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
wxGetInstance(), NULL);

2
src/msw/statbmp.cpp
View File

@ -122,7 +122,7 @@ bool wxStaticBitmap::Create(wxWindow *parent,
#else // Win16
_T("BUTTON"),
#endif // Win32/16
_T(""), pos, size) )
wxEmptyString, pos, size) )
{
// control creation failed
return FALSE;

2
src/msw/statline.cpp
View File

@ -64,7 +64,7 @@ bool wxStaticLine::Create(wxWindow *parent,
if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
return FALSE;
return MSWCreateControl(_T("STATIC"), _T(""), pos, size);
return MSWCreateControl(_T("STATIC"), wxEmptyString, pos, size);
}
WXDWORD wxStaticLine::MSWGetStyle(long style, WXDWORD *exstyle) const

6
src/msw/tabctrl.cpp
View File

@ -106,7 +106,7 @@ bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
// Create the toolbar control.
HWND hWndTabCtrl = CreateWindowEx(0L, // No extended styles.
WC_TABCONTROL, // Class name for the tab control
wxT(""), // No default text.
wxEmptyString, // No default text.
tabStyle, // Styles and defaults.
x, y, width, height, // Standard size and position.
(HWND) parent->GetHWND(), // Parent window
@ -237,7 +237,7 @@ int wxTabCtrl::GetRowCount() const
wxString wxTabCtrl::GetItemText(int item) const
{
wxChar buf[256];
wxString str(wxT(""));
wxString str(wxEmptyString);
TC_ITEM tcItem;
tcItem.mask = TCIF_TEXT;
tcItem.pszText = buf;
@ -299,7 +299,7 @@ bool wxTabCtrl::InsertItem(int item, const wxString& text, int imageId, void* da
TC_ITEM tcItem;
tcItem.mask = TCIF_PARAM;
tcItem.lParam = (long) data;
if (text != wxT(""))
if (text != wxEmptyString)
{
tcItem.mask |= TCIF_TEXT;
wxStrcpy(buf, (const wxChar*) text);

2
src/msw/tbar95.cpp
View File

@ -245,7 +245,7 @@ bool wxToolBar::Create(wxWindow *parent,
bool wxToolBar::MSWCreateToolbar(const wxPoint& pos, const wxSize& size)
{
if ( !MSWCreateControl(TOOLBARCLASSNAME, _T(""), pos, size) )
if ( !MSWCreateControl(TOOLBARCLASSNAME, wxEmptyString, pos, size) )
return FALSE;
// toolbar-specific post initialisation

4
src/msw/textctrl.cpp
View File

@ -749,7 +749,7 @@ void wxTextCtrl::AppendText(const wxString& text)
void wxTextCtrl::Clear()
{
::SetWindowText(GetHwnd(), wxT(""));
::SetWindowText(GetHwnd(), wxEmptyString);
#if wxUSE_RICHEDIT
if ( !IsRich() )
@ -1064,7 +1064,7 @@ void wxTextCtrl::Replace(long from, long to, const wxString& value)
void wxTextCtrl::Remove(long from, long to)
{
Replace(from, to, _T(""));
Replace(from, to, wxEmptyString);
}
bool wxTextCtrl::LoadFile(const wxString& file)

2
src/msw/toplevel.cpp
View File

@ -945,7 +945,7 @@ HWND wxTLWHiddenParentModule::GetHWND()
}
}
ms_hwnd = ::CreateWindow(ms_className, _T(""), 0, 0, 0, 0, 0, NULL,
ms_hwnd = ::CreateWindow(ms_className, wxEmptyString, 0, 0, 0, 0, 0, NULL,
(HMENU)NULL, wxGetInstance(), NULL);
if ( !ms_hwnd )
{

2
src/msw/utils.cpp
View File

@ -309,7 +309,7 @@ error:
#else // !USE_NET_API
// Could use NIS, MS-Mail or other site specific programs
// Use wxWindows configuration data
bool ok = GetProfileString(WX_SECTION, eUSERNAME, wxT(""), buf, maxSize - 1) != 0;
bool ok = GetProfileString(WX_SECTION, eUSERNAME, wxEmptyString, buf, maxSize - 1) != 0;
if ( !ok )
{
ok = wxGetUserId(buf, maxSize);

2
src/msw/utilsexc.cpp
View File

@ -454,7 +454,7 @@ static bool wxExecuteDDE(const wxString& ddeServer,
bool ok = FALSE;
wxDDEClient client;
wxConnectionBase *conn = client.MakeConnection(_T(""),
wxConnectionBase *conn = client.MakeConnection(wxEmptyString,
ddeServer,
ddeTopic);
if ( !conn )

4
src/msw/utilsgui.cpp
View File

@ -44,7 +44,7 @@
#if wxUSE_RESOURCES
bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file)
{
if (file != wxT(""))
if (file != wxEmptyString)
// Don't know what the correct cast should be, but it doesn't
// compile in BC++/16-bit without this cast.
#if !defined(__WIN32__)
@ -85,7 +85,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, wxChar **valu
static const wxChar defunkt[] = wxT("$$default");
wxChar buf[1024];
if (file != wxT(""))
if (file != wxEmptyString)
{
int n = GetPrivateProfileString(section, entry, defunkt,
buf, WXSIZEOF(buf), file);

2
src/msw/window.cpp
View File

@ -2895,7 +2895,7 @@ bool wxWindowMSW::MSWCreate(const wxChar *wclass,
(
extendedStyle,
className,
title ? title : wxT(""),
title ? title : wxEmptyString,
style,
x, y, w, h,
(HWND)MSWGetParent(),