Updated OS/2 sources with fixes to wxControl and wxSpinCtrl

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

diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp
index 7fed200c42e61491233913e09bcd7f617c72af90..b50431a1344f0872f4293df72b01c1d9ab80db40 100644 (file)
--- a/src/common/datetime.cpp
+++ b/src/common/datetime.cpp
@@ -1637,7 +1637,12 @@ wxDateTime::wxDateTime_t wxDateTime::GetWeekOfMonth(wxDateTime::WeekFlags flags,
     Tm tm = GetTm(tz);
     wxDateTime dtMonthStart = wxDateTime(1, tm.mon, tm.year);
     size_t nWeek = GetWeekOfYear(flags) - dtMonthStart.GetWeekOfYear(flags) + 1;
     Tm tm = GetTm(tz);
     wxDateTime dtMonthStart = wxDateTime(1, tm.mon, tm.year);
     size_t nWeek = GetWeekOfYear(flags) - dtMonthStart.GetWeekOfYear(flags) + 1;

+#ifdef __VMS__ // nWeek is unsigned so avoid the warning
+   int nweek2 = (int) nWeek;
+   if ( nweek2 < 0 )
+#else

     if ( nWeek < 0 )
     if ( nWeek < 0 )

+#endif

     {
         // this may happen for January when Jan, 1 is the last week of the
         // previous year
     {
         // this may happen for January when Jan, 1 is the last week of the
         // previous year


@@ -3346,7 +3351,7 @@ wxString wxTimeSpan::Format(const wxChar *format) const
     wxCHECK_MSG( format, _T(""), _T("NULL format in wxTimeSpan::Format") );
 
     wxString str;
     wxCHECK_MSG( format, _T(""), _T("NULL format in wxTimeSpan::Format") );
 
     wxString str;

-    str.Alloc(strlen(format));
+    str.Alloc(wxStrlen(format));

 
     for ( const wxChar *pch = format; pch; pch++ )
     {
 
     for ( const wxChar *pch = format; pch; pch++ )
     {