New scrolling code.

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

diff --git a/include/wx/time.h b/include/wx/time.h
index a0137da9320c29f8b903dae358e2052d1cd792d5..35cce7f6868e346a6514340539464c78cc6b56f8 100644 (file)
--- a/include/wx/time.h
+++ b/include/wx/time.h
@@ -14,7 +14,7 @@
 
 #include "wx/object.h"
 
-#ifdef wxUSE_TIMEDATE
+#if wxUSE_TIMEDATE
 
 #ifdef __GNUG__
 #pragma interface "time.h"
@@ -56,7 +56,7 @@ public:
 
     // Convert to string
 #ifndef __SALFORDC__
-    operator char *   (void);
+    operator wxChar * (void);
     operator wxDate() const;
 #endif
 
@@ -94,7 +94,7 @@ public:
     wxTime Min(const wxTime&) const;
     static void SetFormat(const tFormat lFormat = wx12h,
                   const tPrecision lPrecision = wxStdMinSec);
-    char *FormatTime() const;
+    wxChar *FormatTime() const;
 /*
     virtual int compare(const Object&) const;
     virtual void deepenShallowCopy();       // {}