bitwise vs. logical operator

[wxWidgets.git] / wxPython / src / _datetime.i

diff --git a/wxPython/src/_datetime.i b/wxPython/src/_datetime.i
index 41786ff186fd7af78d9496516484836df40c392c..aba286b03521d770b8c1d9b3ba173c1b687fbde7 100644 (file)
--- a/wxPython/src/_datetime.i
+++ b/wxPython/src/_datetime.i
@@ -78,7 +78,7 @@ public:
         GMT_6, GMT_5, GMT_4, GMT_3, GMT_2, GMT_1,
         GMT0,
         GMT1, GMT2, GMT3, GMT4, GMT5, GMT6,
         GMT_6, GMT_5, GMT_4, GMT_3, GMT_2, GMT_1,
         GMT0,
         GMT1, GMT2, GMT3, GMT4, GMT5, GMT6,

-        GMT7, GMT8, GMT9, GMT10, GMT11, GMT12,
+        GMT7, GMT8, GMT9, GMT10, GMT11, GMT12, GMT13,

 
         // Europe
         WET = GMT0,                         // Western Europe Time
 
         // Europe
         WET = GMT0,                         // Western Europe Time


@@ -108,10 +108,14 @@ public:
         // Australia
 
         A_WST = GMT8,                       // Western Standard Time
         // Australia
 
         A_WST = GMT8,                       // Western Standard Time

-        A_CST = GMT12 + 1,                  // Central Standard Time (+9.5)
+        A_CST = GMT13 + 1,                  // Central Standard Time (+9.5)

         A_EST = GMT10,                      // Eastern Standard Time
         A_ESST = GMT11,                     // Eastern Summer Time
 
         A_EST = GMT10,                      // Eastern Standard Time
         A_ESST = GMT11,                     // Eastern Summer Time
 

+        // New Zealand
+        NZST = GMT12,                       // Standard Time
+        NZDT = GMT13,                       // Daylight Saving Time
+        

         // Universal Coordinated Time = the new and politically correct name
         // for GMT
         UTC = GMT0
         // Universal Coordinated Time = the new and politically correct name
         // for GMT
         UTC = GMT0


@@ -617,8 +621,10 @@ public:
 
         // is the date valid (True even for non initialized objects)?
     inline bool IsValid() const;
 
         // is the date valid (True even for non initialized objects)?
     inline bool IsValid() const;

-    %pythoncode { Ok = IsValid }
-    %pythoncode { def __nonzero__(self): return self.Ok() };
+    %pythoncode { IsOk = IsValid }
+    %pythoncode { Ok = IsOk }
+   
+    %pythoncode { def __nonzero__(self): return self.IsOk() };

 
     
         // get the number of seconds since the Unix epoch - returns (time_t)-1
 
     
         // get the number of seconds since the Unix epoch - returns (time_t)-1