From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 15 Jul 1999 23:34:18 +0000 (+0000)
Subject: some warnings suppressed
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b21624e7e0b39e4cb640d48b54b3c535f2ad8625?ds=inline

some warnings suppressed


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/generic/prop.cpp b/src/generic/prop.cpp
index 2e913449ef..00e5364606 100644
--- a/src/generic/prop.cpp
+++ b/src/generic/prop.cpp
@@ -371,7 +371,7 @@ void wxPropertyValue::Copy(wxPropertyValue& copyFrom)
     case wxPropertyValueStringPtr:
     {
       wxChar** s = copyFrom.StringValuePtr();
-      (*this) = s;
+      (*this) = s != 0;
       return ;
     }
       
@@ -1024,7 +1024,7 @@ void wxPropertyValidatorRegistry::ClearRegistry(void)
 {
   BeginFind();
   wxNode *node;
-  while ((node = Next()))
+  while ((node = Next()) != NULL)
   {
     delete (wxPropertyValidator *)node->Data();
   }
diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp
index 934efa6354..f8bac3d400 100644
--- a/src/msw/ole/automtn.cpp
+++ b/src/msw/ole/automtn.cpp
@@ -80,9 +80,6 @@ static int rgMonthDays[13] =
 static BOOL OleDateFromTm(WORD wYear, WORD wMonth, WORD wDay,
 	WORD wHour, WORD wMinute, WORD wSecond, DATE& dtDest);
 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 ReleaseVariant(VARIANTARG *pvarg) ;
@@ -493,7 +490,6 @@ bool wxAutomationObject::CreateInstance(const wxString& classId) const
 		return FALSE;
 
 	CLSID clsId;
-	IUnknown * pUnk = NULL;
 
 	BasicString unicodeName((const char*) classId);
 	
@@ -753,7 +749,7 @@ static wxString ConvertStringFromOle(BSTR bStr)
 {
 	int len = SysStringLen(bStr) + 1;
 	char    *buf = new char[len];
-	int i = wcstombs( buf, bStr, len);
+	(void)wcstombs( buf, bStr, len);
 
 	wxString str(buf);
 	delete[] buf;
@@ -969,6 +965,8 @@ DoTime:
 	return TRUE;
 }
 
+// this function is not used
+#if 0
 void TmConvertToStandardFormat(struct tm& tmSrc)
 {
 	// 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
 	return temp + (temp - dbl);
 }
+#endif // 0
 
 /*
  *  ClearVariant