some warnings suppressed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -371,7 +371,7 @@ void wxPropertyValue::Copy(wxPropertyValue& copyFrom)
|
|||||||
case wxPropertyValueStringPtr:
|
case wxPropertyValueStringPtr:
|
||||||
{
|
{
|
||||||
wxChar** s = copyFrom.StringValuePtr();
|
wxChar** s = copyFrom.StringValuePtr();
|
||||||
(*this) = s;
|
(*this) = s != 0;
|
||||||
return ;
|
return ;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1024,7 +1024,7 @@ void wxPropertyValidatorRegistry::ClearRegistry(void)
|
|||||||
{
|
{
|
||||||
BeginFind();
|
BeginFind();
|
||||||
wxNode *node;
|
wxNode *node;
|
||||||
while ((node = Next()))
|
while ((node = Next()) != NULL)
|
||||||
{
|
{
|
||||||
delete (wxPropertyValidator *)node->Data();
|
delete (wxPropertyValidator *)node->Data();
|
||||||
}
|
}
|
||||||
|
@@ -80,9 +80,6 @@ static int rgMonthDays[13] =
|
|||||||
static BOOL OleDateFromTm(WORD wYear, WORD wMonth, WORD wDay,
|
static BOOL OleDateFromTm(WORD wYear, WORD wMonth, WORD wDay,
|
||||||
WORD wHour, WORD wMinute, WORD wSecond, DATE& dtDest);
|
WORD wHour, WORD wMinute, WORD wSecond, DATE& dtDest);
|
||||||
static BOOL TmFromOleDate(DATE dtSrc, struct tm& tmDest);
|
static BOOL TmFromOleDate(DATE dtSrc, struct tm& tmDest);
|
||||||
static void TmConvertToStandardFormat(struct tm& tmSrc);
|
|
||||||
static double DoubleFromDate(DATE dt);
|
|
||||||
static DATE DateFromDouble(double dbl);
|
|
||||||
|
|
||||||
static void ClearVariant(VARIANTARG *pvarg) ;
|
static void ClearVariant(VARIANTARG *pvarg) ;
|
||||||
static void ReleaseVariant(VARIANTARG *pvarg) ;
|
static void ReleaseVariant(VARIANTARG *pvarg) ;
|
||||||
@@ -493,7 +490,6 @@ bool wxAutomationObject::CreateInstance(const wxString& classId) const
|
|||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
CLSID clsId;
|
CLSID clsId;
|
||||||
IUnknown * pUnk = NULL;
|
|
||||||
|
|
||||||
BasicString unicodeName((const char*) classId);
|
BasicString unicodeName((const char*) classId);
|
||||||
|
|
||||||
@@ -753,7 +749,7 @@ static wxString ConvertStringFromOle(BSTR bStr)
|
|||||||
{
|
{
|
||||||
int len = SysStringLen(bStr) + 1;
|
int len = SysStringLen(bStr) + 1;
|
||||||
char *buf = new char[len];
|
char *buf = new char[len];
|
||||||
int i = wcstombs( buf, bStr, len);
|
(void)wcstombs( buf, bStr, len);
|
||||||
|
|
||||||
wxString str(buf);
|
wxString str(buf);
|
||||||
delete[] buf;
|
delete[] buf;
|
||||||
@@ -969,6 +965,8 @@ DoTime:
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// this function is not used
|
||||||
|
#if 0
|
||||||
void TmConvertToStandardFormat(struct tm& tmSrc)
|
void TmConvertToStandardFormat(struct tm& tmSrc)
|
||||||
{
|
{
|
||||||
// Convert afx internal tm to format expected by runtimes (_tcsftime, etc)
|
// Convert afx internal tm to format expected by runtimes (_tcsftime, etc)
|
||||||
@@ -1001,6 +999,7 @@ DATE DateFromDouble(double dbl)
|
|||||||
double temp = floor(dbl); // dbl is now whole part
|
double temp = floor(dbl); // dbl is now whole part
|
||||||
return temp + (temp - dbl);
|
return temp + (temp - dbl);
|
||||||
}
|
}
|
||||||
|
#endif // 0
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ClearVariant
|
* ClearVariant
|
||||||
|
Reference in New Issue
Block a user