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:
@@ -34,7 +34,7 @@
|
||||
#if !defined(wxUSE_DATETIME) || wxUSE_DATETIME
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#ifdef __WXMSW__
|
||||
#ifdef __WINDOWS__
|
||||
#include "wx/msw/wrapwin.h"
|
||||
#endif
|
||||
#include "wx/string.h"
|
||||
@@ -326,7 +326,7 @@ wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const
|
||||
time_t time = GetTicks();
|
||||
|
||||
if ( (time != (time_t)-1) && !wxStrstr(format, wxT("%l"))
|
||||
#ifdef __WXMSW__
|
||||
#ifdef __WINDOWS__
|
||||
&& !wxStrstr(format, wxT("%z"))
|
||||
#endif
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user