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

replaced T() makro with wxT() due to namespace probs, _T() exists, too

Browse Source 
fixed compilation problems, mainly in html code
compiles and links fine on Solaris, runs with samples and Mahogany


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Karsten Ballüder
1999-10-08 14:35:56 +00:00
parent b4a2ab728b
commit 223d09f6b5
336 changed files with 3755 additions and 3776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/msw/ole/automtn.cpp
View File

@@ -427,7 +427,7 @@ WXIDISPATCH* wxAutomationObject::GetDispatchProperty(const wxString& property, i
wxVariant retVariant;
if (Invoke(property, DISPATCH_PROPERTYGET, retVariant, noArgs, args))
{
if (retVariant.GetType() == T("void*"))
if (retVariant.GetType() == wxT("void*"))
{
return (WXIDISPATCH*) retVariant.GetVoidPtr();
}
@@ -467,19 +467,19 @@ bool wxAutomationObject::GetInstance(const wxString& classId) const
if (FAILED(CLSIDFromProgID((BSTR) unicodeName, &clsId)))
{
wxLogWarning(T("Cannot obtain CLSID from ProgID"));
wxLogWarning(wxT("Cannot obtain CLSID from ProgID"));
return FALSE;
}
if (FAILED(GetActiveObject(clsId, NULL, &pUnk)))
{
wxLogWarning(T("Cannot find an active object"));
wxLogWarning(wxT("Cannot find an active object"));
return FALSE;
}
if (pUnk->QueryInterface(IID_IDispatch, (LPVOID*) &m_dispatchPtr) != S_OK)
{
wxLogWarning(T("Cannot find IDispatch interface"));
wxLogWarning(wxT("Cannot find IDispatch interface"));
return FALSE;
}
@@ -499,14 +499,14 @@ bool wxAutomationObject::CreateInstance(const wxString& classId) const
if (FAILED(CLSIDFromProgID((BSTR) unicodeName, &clsId)))
{
wxLogWarning(T("Cannot obtain CLSID from ProgID"));
wxLogWarning(wxT("Cannot obtain CLSID from ProgID"));
return FALSE;
}
// start a new copy of Excel, grab the IDispatch interface
if (FAILED(CoCreateInstance(clsId, NULL, CLSCTX_LOCAL_SERVER, IID_IDispatch, (void**)&m_dispatchPtr)))
{
wxLogWarning(T("Cannot start an instance of this class."));
wxLogWarning(wxT("Cannot start an instance of this class."));
return FALSE;
}
@@ -525,17 +525,17 @@ bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
wxString type(variant.GetType());
if (type == T("long"))
if (type == wxT("long"))
{
oleVariant.vt = VT_I4;
oleVariant.lVal = variant.GetLong() ;
}
else if (type == T("double"))
else if (type == wxT("double"))
{
oleVariant.vt = VT_R8;
oleVariant.dblVal = variant.GetDouble();
}
else if (type == T("bool"))
else if (type == wxT("bool"))
{
oleVariant.vt = VT_BOOL;
// 'bool' required for VC++ 4 apparently
@@ -545,13 +545,13 @@ bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
oleVariant.boolVal = variant.GetBool();
#endif
}
else if (type == T("string"))
else if (type == wxT("string"))
{
wxString str( variant.GetString() );
oleVariant.vt = VT_BSTR;
oleVariant.bstrVal = ConvertStringToOle(str);
}
else if (type == T("date"))
else if (type == wxT("date"))
{
wxDate date( variant.GetDate() );
oleVariant.vt = VT_DATE;
@@ -560,7 +560,7 @@ bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
0, 0, 0, oleVariant.date))
return FALSE;
}
else if (type == T("time"))
else if (type == wxT("time"))
{
wxTime time( variant.GetTime() );
oleVariant.vt = VT_DATE;
@@ -569,12 +569,12 @@ bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
time.GetHour(), time.GetMinute(), time.GetSecond(), oleVariant.date))
return FALSE;
}
else if (type == T("void*"))
else if (type == wxT("void*"))
{
oleVariant.vt = VT_DISPATCH;
oleVariant.pdispVal = (IDispatch*) variant.GetVoidPtr();
}
else if (type == T("list") || type == T("stringlist"))
else if (type == wxT("list") || type == wxT("stringlist"))
{
oleVariant.vt = VT_VARIANT | VT_ARRAY;
@@ -728,7 +728,7 @@ bool ConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
}
default:
{
wxLogError(T("wxAutomationObject::ConvertOleToVariant: Unknown variant value type"));
wxLogError(wxT("wxAutomationObject::ConvertOleToVariant: Unknown variant value type"));
return FALSE;
}
}
@@ -1061,7 +1061,7 @@ static void ReleaseVariant(VARIANTARG *pvarg)
}
else
{
wxLogWarning(T("ReleaseVariant: Array contains non-variant type"));
wxLogWarning(wxT("ReleaseVariant: Array contains non-variant type"));
}
// Free the array itself.
@@ -1088,7 +1088,7 @@ static void ReleaseVariant(VARIANTARG *pvarg)
break;
default:
wxLogWarning(T("ReleaseVariant: Unknown type"));
wxLogWarning(wxT("ReleaseVariant: Unknown type"));
break;
}
}