From: Vadim Zeitlin Date: Fri, 15 Feb 2002 16:36:04 +0000 (+0000) Subject: made wxDateTimeDefault an object and not a reference to avoid (well, minimize) initia... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/56d0c5a6a73180f263ff39307a0718ebd6e235da made wxDateTimeDefault an object and not a reference to avoid (well, minimize) initialization order problems git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/datetime.h b/include/wx/datetime.h index 1dc31ef6d5..ad0755da66 100644 --- a/include/wx/datetime.h +++ b/include/wx/datetime.h @@ -115,7 +115,7 @@ class WXDLLEXPORT wxDateSpan; // wxInvalidDateTime) class WXDLLEXPORT wxDateTime; -WXDLLEXPORT_DATA(extern const wxDateTime&) wxDefaultDateTime; +WXDLLEXPORT_DATA(extern const wxDateTime) wxDefaultDateTime; #define wxInvalidDateTime wxDefaultDateTime // ---------------------------------------------------------------------------- diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp index 7dc3120194..418a72f51c 100644 --- a/src/common/datetime.cpp +++ b/src/common/datetime.cpp @@ -211,10 +211,7 @@ static const wxDateTime::wxDateTime_t gs_cumulatedDays[2][MONTHS_IN_YEAR] = // in the fine tradition of ANSI C we use our equivalent of (time_t)-1 to // indicate an invalid wxDateTime object - -static const wxDateTime gs_dtDefault; - -const wxDateTime& wxDefaultDateTime = gs_dtDefault; +const wxDateTime wxDefaultDateTime; wxDateTime::Country wxDateTime::ms_country = wxDateTime::Country_Unknown;