create the DIBs in correct (and not down up) line order

[wxWidgets.git] / include / wx / time.h

diff --git a/include/wx/time.h b/include/wx/time.h
index d2c87ec77a274570f8901faa5c8c770ff62d4327..7b4e53f2335e1e4c1a9deff9c9ad19c15ccf83ab 100644 (file)
--- a/include/wx/time.h
+++ b/include/wx/time.h
@@ -6,7 +6,7 @@
 // Modified by: 18.12.99 by VZ to use the new wxDateTime class
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -21,7 +21,7 @@
 #include "wx/datetime.h"
 #include "wx/date.h"
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "time.h"
 #endif
 
@@ -47,7 +47,7 @@ public:
     wxTime() : m_time(wxDateTime::Now()) { }
     wxTime(clockTy s) : m_time((time_t)(s - wxTIME_EPOCH_DIFF)) { }
     void operator=(const wxTime& t) { m_time = t.m_time; }
-    wxTime(const wxTime& t) { *this = t; }
+    wxTime(const wxTime& t) : wxObject() { *this = t; }
     wxTime(hourTy h, minuteTy m, secondTy s = 0, bool WXUNUSED(dst) = FALSE)
         : m_time(h, m, s) { }
 
@@ -123,17 +123,16 @@ public:
             { _T("%H:%M:%S"),    _T("%H:%M")    }   // wx24h
         };
 
-        static wxChar s_bufTime[128];
+        wxStrncpy(ms_bufTime, m_time.Format(formats[ms_Format][ms_Precision]),
+                  WXSIZEOF(ms_bufTime));
 
-        wxStrncpy(s_bufTime, m_time.Format(formats[ms_Format][ms_Precision]),
-                  WXSIZEOF(s_bufTime));
-
-        return s_bufTime;
+        return ms_bufTime;
     }
 
 private:
     static tFormat      ms_Format;
     static tPrecision   ms_Precision;
+    static wxChar       ms_bufTime[128];
 
 #if 0 // old wxTime members unused any more
     clockTy    sec;        /* seconds since 1/1/1901 */