Use __WINDOWS__ for OS kind checks and reserve __WXMSW__ for GUI toolkit.

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

diff --git a/include/wx/datetime.h b/include/wx/datetime.h
index e8c1ac31207bf6aaada5af532cce2a2f4ca3887c..1115e00f07ee0196097346aee544edfdb0021c56 100644 (file)
--- a/include/wx/datetime.h
+++ b/include/wx/datetime.h
@@ -31,7 +31,7 @@
 class WXDLLIMPEXP_FWD_BASE wxDateTime;
 class WXDLLIMPEXP_FWD_BASE wxTimeSpan;
 class WXDLLIMPEXP_FWD_BASE wxDateSpan;
 class WXDLLIMPEXP_FWD_BASE wxDateTime;
 class WXDLLIMPEXP_FWD_BASE wxTimeSpan;
 class WXDLLIMPEXP_FWD_BASE wxDateSpan;

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

 struct _SYSTEMTIME;
 #endif
 
 struct _SYSTEMTIME;
 #endif
 


@@ -606,7 +606,7 @@ public:
                       wxDateTime_t minute = 0,
                       wxDateTime_t second = 0,
                       wxDateTime_t millisec = 0);
                       wxDateTime_t minute = 0,
                       wxDateTime_t second = 0,
                       wxDateTime_t millisec = 0);

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

     wxDateTime(const struct _SYSTEMTIME& st)
     {
         SetFromMSWSysTime(st);
     wxDateTime(const struct _SYSTEMTIME& st)
     {
         SetFromMSWSysTime(st);


@@ -928,7 +928,7 @@ public:
 
     // SYSTEMTIME format
     // ------------------------------------------------------------------------
 
     // SYSTEMTIME format
     // ------------------------------------------------------------------------

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

     // convert SYSTEMTIME to wxDateTime
     wxDateTime& SetFromMSWSysTime(const struct _SYSTEMTIME& st);
 
     // convert SYSTEMTIME to wxDateTime
     wxDateTime& SetFromMSWSysTime(const struct _SYSTEMTIME& st);
 


@@ -938,7 +938,7 @@ public:
     // same as above but only take date part into account, time is always zero
     wxDateTime& SetFromMSWSysDate(const struct _SYSTEMTIME& st);
     void GetAsMSWSysDate(struct _SYSTEMTIME* st) const;
     // same as above but only take date part into account, time is always zero
     wxDateTime& SetFromMSWSysDate(const struct _SYSTEMTIME& st);
     void GetAsMSWSysDate(struct _SYSTEMTIME* st) const;

-#endif // __WXMSW__
+#endif // __WINDOWS__

 
     // comparison (see also functions below for operator versions)
     // ------------------------------------------------------------------------
 
     // comparison (see also functions below for operator versions)
     // ------------------------------------------------------------------------