wxMotif::wxFont supports encodings too (and shares 99% of font code with wxGTK)

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

diff --git a/include/wx/time.h b/include/wx/time.h
index 45d51a675221d680a1ea83adac326ea590c9eea5..35cce7f6868e346a6514340539464c78cc6b56f8 100644 (file)
--- a/include/wx/time.h
+++ b/include/wx/time.h
@@ -14,7 +14,7 @@
 
 #include "wx/object.h"
 
 
 #include "wx/object.h"
 

-#ifdef wxUSE_TIMEDATE
+#if wxUSE_TIMEDATE

 
 #ifdef __GNUG__
 #pragma interface "time.h"
 
 #ifdef __GNUG__
 #pragma interface "time.h"


@@ -55,8 +55,11 @@ public:
     wxTime(const wxDate&, hourTy h =0, minuteTy m =0, secondTy s=0, bool dst =FALSE);
 
     // Convert to string
     wxTime(const wxDate&, hourTy h =0, minuteTy m =0, secondTy s=0, bool dst =FALSE);
 
     // Convert to string

-    operator char *   (void);
+#ifndef __SALFORDC__
+    operator wxChar * (void);

     operator wxDate() const;
     operator wxDate() const;

+#endif
+

     bool operator<(const wxTime& t) const     { return sec < t.sec; }
     bool operator<=(const wxTime& t) const    { return sec <= t.sec; }
     bool operator>(const wxTime& t) const     { return sec > t.sec; }
     bool operator<(const wxTime& t) const     { return sec < t.sec; }
     bool operator<=(const wxTime& t) const    { return sec <= t.sec; }
     bool operator>(const wxTime& t) const     { return sec > t.sec; }


@@ -91,7 +94,7 @@ public:
     wxTime Min(const wxTime&) const;
     static void SetFormat(const tFormat lFormat = wx12h,
                   const tPrecision lPrecision = wxStdMinSec);
     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();       // {}
 /*
     virtual int compare(const Object&) const;
     virtual void deepenShallowCopy();       // {}