Warning fixes found under hardest mode of OpenWatcom. Seems clean in Borland, MinGW...

[wxWidgets.git] / src / common / variant.cpp

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index d44908dd25561ab747aaf4701e94a9a05ebb887c..6004fee34e15615306226271f4947ab321dbafbb 100644 (file)
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -1017,7 +1017,7 @@ public:
         { m_value = wxDateTime(valptr->day, (wxDateTime::Month) (valptr->month - 1),valptr->year); }
     wxVariantDataDateTime(const TIMESTAMP_STRUCT* valptr)
         { m_value = wxDateTime(valptr->day, (wxDateTime::Month) (valptr->month - 1), valptr->year,
-                        valptr->hour, valptr->minute, valptr->second, valptr->fraction ); }
+                        valptr->hour, valptr->minute, valptr->second, (wxDateTime::wxDateTime_t)valptr->fraction ); }
 #endif //ODBC
 
     inline wxDateTime GetValue() const { return m_value; }
@@ -1722,7 +1722,8 @@ wxVariant wxVariant::operator[] (size_t idx) const
         wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
         wxASSERT_MSG( (idx < (size_t) data->GetValue().GetCount()), wxT("Invalid index for array") );
 
-        wxVariant variant( wxString( (const wxChar*) (data->GetValue().Item(idx)->GetData()) ));
+        wxString str( (const wxChar*) (data->GetValue().Item(idx)->GetData()) );
+        wxVariant variant( str );
         return variant;
     }
     return wxNullVariant;