Use __WINDOWS__ for OS kind checks and reserve __WXMSW__ for GUI toolkit.
This change prepares the way for using wxGTK under Windows as this would still define __WINDOWS__ but use __WXGTK__ instead of __WXMSW__. Closes #14064. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -63,7 +63,7 @@
|
||||
#if !defined(wxUSE_DATETIME) || wxUSE_DATETIME
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#ifdef __WXMSW__
|
||||
#ifdef __WINDOWS__
|
||||
#include "wx/msw/wrapwin.h"
|
||||
#endif
|
||||
#include "wx/string.h"
|
||||
@@ -2198,7 +2198,7 @@ WXDLLIMPEXP_BASE void wxPrevWDay(wxDateTime::WeekDay& wd)
|
||||
: (wxDateTime::WeekDay)(wd - 1);
|
||||
}
|
||||
|
||||
#ifdef __WXMSW__
|
||||
#ifdef __WINDOWS__
|
||||
|
||||
wxDateTime& wxDateTime::SetFromMSWSysTime(const SYSTEMTIME& st)
|
||||
{
|
||||
@@ -2246,6 +2246,6 @@ void wxDateTime::GetAsMSWSysDate(SYSTEMTIME* st) const
|
||||
st->wMilliseconds = 0;
|
||||
}
|
||||
|
||||
#endif // __WXMSW__
|
||||
#endif // __WINDOWS__
|
||||
|
||||
#endif // wxUSE_DATETIME
|
||||
|
||||
Reference in New Issue
Block a user