Amebis/wxWidgets
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Globally replace _T() with wxT().

Browse Source 
Standardize on using a single macro across all wxWidgets sources and solve the name clash with Sun CC standard headers (see #10660).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-07-23 20:30:22 +00:00
parent 32cdc45397
commit 9a83f86094
798 changed files with 10370 additions and 10349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/common/dynload.cpp
View File

@@ -105,7 +105,7 @@ wxPluginLibrary::~wxPluginLibrary()
wxPluginLibrary *wxPluginLibrary::RefLib()
{
wxCHECK_MSG( m_linkcount > 0, NULL,
_T("Library had been already deleted!") );
wxT("Library had been already deleted!") );
++m_linkcount;
return this;
@@ -114,7 +114,7 @@ wxPluginLibrary *wxPluginLibrary::RefLib()
bool wxPluginLibrary::UnrefLib()
{
wxASSERT_MSG( m_objcount == 0,
_T("Library unloaded before all objects were destroyed") );
wxT("Library unloaded before all objects were destroyed") );
if ( m_linkcount == 0 || --m_linkcount == 0 )
{
@@ -165,7 +165,7 @@ void wxPluginLibrary::RegisterModules()
// though, as there is currently no way to Unregister it without it.
wxASSERT_MSG( m_linkcount == 1,
_T("RegisterModules should only be called for the first load") );
wxT("RegisterModules should only be called for the first load") );
for ( const wxClassInfo *info = m_after; info != m_before; info = info->GetNext())
{
@@ -173,7 +173,7 @@ void wxPluginLibrary::RegisterModules()
{
wxModule *m = wxDynamicCast(info->CreateObject(), wxModule);
wxASSERT_MSG( m, _T("wxDynamicCast of wxModule failed") );
wxASSERT_MSG( m, wxT("wxDynamicCast of wxModule failed") );
m_wxmodules.push_back(m);
wxModule::RegisterModule(m);
@@ -188,7 +188,7 @@ void wxPluginLibrary::RegisterModules()
{
if( !(*it)->Init() )
{
wxLogDebug(_T("wxModule::Init() failed for wxPluginLibrary"));
wxLogDebug(wxT("wxModule::Init() failed for wxPluginLibrary"));
// XXX: Watch this, a different hash implementation might break it,
// a good hash implementation would let us fix it though.
@@ -258,8 +258,8 @@ wxPluginManager::LoadLibrary(const wxString &libname, int flags)
if ( entry )
{
wxLogTrace(_T("dll"),
_T("LoadLibrary(%s): already loaded."), realname.c_str());
wxLogTrace(wxT("dll"),
wxT("LoadLibrary(%s): already loaded."), realname.c_str());
entry->RefLib();
}
@@ -271,20 +271,20 @@ wxPluginManager::LoadLibrary(const wxString &libname, int flags)
{
(*ms_manifest)[realname] = entry;
wxLogTrace(_T("dll"),
_T("LoadLibrary(%s): loaded ok."), realname.c_str());
wxLogTrace(wxT("dll"),
wxT("LoadLibrary(%s): loaded ok."), realname.c_str());
}
else
{
wxLogTrace(_T("dll"),
_T("LoadLibrary(%s): failed to load."), realname.c_str());
wxLogTrace(wxT("dll"),
wxT("LoadLibrary(%s): failed to load."), realname.c_str());
// we have created entry just above
if ( !entry->UnrefLib() )
{
// ... so UnrefLib() is supposed to delete it
wxFAIL_MSG( _T("Currently linked library is not loaded?") );
wxFAIL_MSG( wxT("Currently linked library is not loaded?") );
}
entry = NULL;
@@ -309,13 +309,13 @@ bool wxPluginManager::UnloadLibrary(const wxString& libname)
if ( !entry )
{
wxLogDebug(_T("Attempt to unload library '%s' which is not loaded."),
wxLogDebug(wxT("Attempt to unload library '%s' which is not loaded."),
libname.c_str());
return false;
}
wxLogTrace(_T("dll"), _T("UnloadLibrary(%s)"), realname.c_str());
wxLogTrace(wxT("dll"), wxT("UnloadLibrary(%s)"), realname.c_str());
if ( !entry->UnrefLib() )
{
@@ -341,7 +341,7 @@ bool wxPluginManager::Load(const wxString &libname, int flags)
void wxPluginManager::Unload()
{
wxCHECK_RET( m_entry, _T("unloading an invalid wxPluginManager?") );
wxCHECK_RET( m_entry, wxT("unloading an invalid wxPluginManager?") );
for ( wxDLManifest::iterator i = ms_manifest->begin();
i != ms_manifest->end();