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

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

View File

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

View File

@@ -53,7 +53,7 @@ public:
bool Close(); bool Close();
// assign an existing file descriptor and get it back from wxFFile object // 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; } { Close(); m_fp = fp; m_name = name; }
void Detach() { m_fp = NULL; } void Detach() { m_fp = NULL; }
FILE *fp() const { return m_fp; } FILE *fp() const { return m_fp; }

View File

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

View File

@@ -150,7 +150,7 @@ public:
wxPathFormat format = wxPATH_NATIVE) wxPathFormat format = wxPATH_NATIVE)
{ {
// empty volume // empty volume
Assign(_T(""), path, name, ext, format); Assign(wxEmptyString, path, name, ext, format);
} }
void AssignDir(const wxString& dir, wxPathFormat format = wxPATH_NATIVE); 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 // 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, // anything with it (happens when the file is on a different volume,
// for example) // for example)
bool MakeRelativeTo(const wxString& pathBase = _T(""), bool MakeRelativeTo(const wxString& pathBase = wxEmptyString,
wxPathFormat format = wxPATH_NATIVE); wxPathFormat format = wxPATH_NATIVE);
// make the path absolute // make the path absolute

View File

@@ -43,7 +43,7 @@ public:
// enumerate the different encodings either for given font facename or for // enumerate the different encodings either for given font facename or for
// all facenames - will result in OnFontEncoding() being called for each // all facenames - will result in OnFontEncoding() being called for each
// available (facename, encoding) couple // 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 // callbacks which are called after one of EnumerateXXX() functions from
// above is invoked - all of them may return FALSE to stop enumeration or // above is invoked - all of them may return FALSE to stop enumeration or

View File

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

View File

@@ -51,7 +51,7 @@ class WXDLLEXPORT wxImageHandler: public wxObject
{ {
public: public:
wxImageHandler() 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 #if wxUSE_STREAMS

View File

@@ -448,7 +448,7 @@ public:
#define wxSysErrorMsg( X ) (const wxChar*)NULL #define wxSysErrorMsg( X ) (const wxChar*)NULL
// Fake symbolic trace masks... for those that are used frequently // 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 #endif // wxUSE_LOG/!wxUSE_LOG

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -175,7 +175,7 @@ bool wxNotebook::Create(wxWindow *parent,
wxDefaultValidator, name) ) wxDefaultValidator, name) )
return FALSE; return FALSE;
if ( !MSWCreateControl(WC_TABCONTROL, _T(""), pos, size) ) if ( !MSWCreateControl(WC_TABCONTROL, wxEmptyString, pos, size) )
return FALSE; return FALSE;
SetBackgroundColour(wxColour(::GetSysColor(COLOR_BTNFACE))); SetBackgroundColour(wxColour(::GetSysColor(COLOR_BTNFACE)));
@@ -265,7 +265,7 @@ bool wxNotebook::SetPageText(int nPage, const wxString& strText)
wxString wxNotebook::GetPageText(int nPage) const 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]; wxChar buf[256];
TC_ITEM tcItem; TC_ITEM tcItem;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -108,7 +108,7 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
else else
msStyle = SBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP ; 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, msStyle,
0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId, 0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
wxGetInstance(), NULL); wxGetInstance(), NULL);

View File

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

View File

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

View File

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

View File

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

View File

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

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); (HMENU)NULL, wxGetInstance(), NULL);
if ( !ms_hwnd ) if ( !ms_hwnd )
{ {

View File

@@ -309,7 +309,7 @@ error:
#else // !USE_NET_API #else // !USE_NET_API
// Could use NIS, MS-Mail or other site specific programs // Could use NIS, MS-Mail or other site specific programs
// Use wxWindows configuration data // 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 ) if ( !ok )
{ {
ok = wxGetUserId(buf, maxSize); ok = wxGetUserId(buf, maxSize);

View File

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

View File

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

View File

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