[CVS HEAD] Compile error in include/wx/datetime.h

[Tim Stahlhut]

FYI:

I compile wxWidgets using 3.4.5 MinGW, but I use a custom 4.1.2 MinGW to
compile my client code. 

I was getting about the same error, this patch fixed it.

Tim S

Index: include/wx/datetime.h
===================================================================
RCS file: /pack/cvsroots/wxwidgets/wxWidgets/include/wx/datetime.h,v
retrieving revision 1.81
diff -b --unified -r1.81 datetime.h
--- include/wx/datetime.h	2007/01/31 03:40:52	1.81
+++ include/wx/datetime.h	2007/04/02 05:14:14
@@ -455,7 +455,7 @@
         // get the week day
         WeekDay GetWeekDay() // not const because wday may be changed
         {
-            if ( wday == Inv_WeekDay )
+            if ( (WeekDay)wday == Inv_WeekDay )
                 ComputeWeekDay();

             return (WeekDay)wday;


Note, I then got a similar error that the following patch fixed.

Index: include/wx/msw/ole/dataform.h
===================================================================
RCS file: /pack/cvsroots/wxwidgets/wxWidgets/include/wx/msw/ole/dataform.h,v
retrieving revision 1.7
diff -b --unified -r1.7 dataform.h
--- include/wx/msw/ole/dataform.h	2004/08/16 12:45:40	1.7
+++ include/wx/msw/ole/dataform.h	2007/04/02 05:19:52
@@ -58,7 +58,7 @@
     void SetId(const wxChar *format);

     // returns true if the format is one of those defined in wxDataFormatId
-    bool IsStandard() const { return m_format > 0 && m_format < wxDF_PRIVATE; }
+    bool IsStandard() const { return m_format > 0 && m_format < (NativeFormat)wxDF_PRIVATE; }

 private:
     NativeFormat m_format;