Various small fixes

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

diff --git a/include/wx/date.h b/include/wx/date.h
index 2347dad44541b2ca033ed4d9a1b3d77ba6d2b3d4..49936f064de3e882fb57d81aef7b98c856f120ec 100644 (file)
--- a/include/wx/date.h
+++ b/include/wx/date.h
@@ -10,8 +10,8 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __WXDATEH__
-#define __WXDATEH__
+#ifndef _WX_DATE_H_
+#define _WX_DATE_H_

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


@@ -20,7 +20,7 @@
 #include "wx/object.h"
 #include "wx/string.h"
 
 #include "wx/object.h"
 #include "wx/string.h"
 

-#if USE_TIMEDATE
+#if wxUSE_TIMEDATE

 
 enum wxdate_format_type {wxMDY, wxDAY, wxMONTH, wxFULL, wxEUROPEAN};
 
 
 enum wxdate_format_type {wxMDY, wxDAY, wxMONTH, wxFULL, wxEUROPEAN};
 


@@ -47,43 +47,46 @@ class WXDLLEXPORT wxDate: public wxObject
 
  public:
   wxDate ();
 
  public:
   wxDate ();

-  wxDate (const long j);
-  wxDate (const int m, const int d, const int y);
+  wxDate (long j);
+  wxDate (int m, int d, int y);

   wxDate (const wxString& dat);
   wxDate (const wxDate &dt);
 
   wxDate (const wxString& dat);
   wxDate (const wxDate &dt);
 

+#ifndef __SALFORDC__

   operator wxString  (void);
   operator wxString  (void);

+#endif
+

   void operator =   (const wxDate& date);
   void operator =   (const wxString& date);
 
   void operator =   (const wxDate& date);
   void operator =   (const wxString& date);
 

-  wxDate operator +  (const long i);
-  wxDate operator +  (const int  i);
+  wxDate operator +  (long i);
+  wxDate operator +  (int  i);

 
 

-  wxDate operator -  (const long i);
-  wxDate operator -  (const int  i);
+  wxDate operator -  (long i);
+  wxDate operator -  (int  i);

 
   long operator -  (const wxDate &dt);
 
 
   long operator -  (const wxDate &dt);
 

-  wxDate &operator += (const long i);
-  wxDate &operator -= (const long i);
+  wxDate &operator += (long i);
+  wxDate &operator -= (long i);

 
   wxDate &operator ++ ();     // Prefix increment
   wxDate &operator ++ (int);  // Postfix increment
   wxDate &operator -- ();     // Prefix decrement
   wxDate &operator -- (int);  // Postfix decrement
 
 
   wxDate &operator ++ ();     // Prefix increment
   wxDate &operator ++ (int);  // Postfix increment
   wxDate &operator -- ();     // Prefix decrement
   wxDate &operator -- (int);  // Postfix decrement
 

-  friend bool operator <  (const wxDate &dt1, const wxDate &dt2);
-  friend bool operator <= (const wxDate &dt1, const wxDate &dt2);
-  friend bool operator >  (const wxDate &dt1, const wxDate &dt2);
-  friend bool operator >= (const wxDate &dt1, const wxDate &dt2);
-  friend bool operator == (const wxDate &dt1, const wxDate &dt2);
-  friend bool operator != (const wxDate &dt1, const wxDate &dt2);
+  friend bool WXDLLEXPORT operator <  (const wxDate &dt1, const wxDate &dt2);
+  friend bool WXDLLEXPORT operator <= (const wxDate &dt1, const wxDate &dt2);
+  friend bool WXDLLEXPORT operator >  (const wxDate &dt1, const wxDate &dt2);
+  friend bool WXDLLEXPORT operator >= (const wxDate &dt1, const wxDate &dt2);
+  friend bool WXDLLEXPORT operator == (const wxDate &dt1, const wxDate &dt2);
+  friend bool WXDLLEXPORT operator != (const wxDate &dt1, const wxDate &dt2);

 
 

-  friend ostream &operator << (ostream &os, const wxDate &dt);
+  friend ostream WXDLLEXPORT & operator << (ostream &os, const wxDate &dt);

 
 

-  wxString FormatDate     (const int type=-1) const;
-  void  SetFormat (const int format);
-  int   SetOption (const int option, const bool enable=TRUE);
+  wxString FormatDate     (int type=-1) const;
+  void  SetFormat (int format);
+  int   SetOption (int option, bool enable=TRUE);

 
   long  GetJulianDate() const;  // returns julian date
   int   GetDayOfYear()  const;  // returns relative date since Jan. 1
 
   long  GetJulianDate() const;  // returns julian date
   int   GetDayOfYear()  const;  // returns relative date since Jan. 1


@@ -123,9 +126,9 @@ class WXDLLEXPORT wxDate: public wxObject
 
   bool IsBetween(const wxDate& first, const wxDate& second) const;
 
 
   bool IsBetween(const wxDate& first, const wxDate& second) const;
 

-  wxDate Previous(const int dayOfWeek) const;
+  wxDate Previous(int dayOfWeek) const;

 };
 
 #endif
 #endif
 };
 
 #endif
 #endif

-    // __WXDATEH__
+    // _WX_DATE_H_