Extracted private GetTimeZone() to public wxGetTimeZone() function.
Created new wx/time.h header for this function, more time-related functions will be added to it later. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
35
Makefile.in
35
Makefile.in
@@ -439,6 +439,7 @@ ALL_BASE_HEADERS = \
|
||||
wx/textfile.h \
|
||||
wx/thread.h \
|
||||
wx/thrimpl.cpp \
|
||||
wx/time.h \
|
||||
wx/timer.h \
|
||||
wx/tls.h \
|
||||
wx/tokenzr.h \
|
||||
@@ -618,6 +619,7 @@ ALL_PORTS_BASE_HEADERS = \
|
||||
wx/textfile.h \
|
||||
wx/thread.h \
|
||||
wx/thrimpl.cpp \
|
||||
wx/time.h \
|
||||
wx/timer.h \
|
||||
wx/tls.h \
|
||||
wx/tokenzr.h \
|
||||
@@ -785,6 +787,7 @@ ALL_BASE_SOURCES = \
|
||||
src/common/tarstrm.cpp \
|
||||
src/common/textbuf.cpp \
|
||||
src/common/textfile.cpp \
|
||||
src/common/time.cpp \
|
||||
src/common/timercmn.cpp \
|
||||
src/common/timerimpl.cpp \
|
||||
src/common/tokenzr.cpp \
|
||||
@@ -984,6 +987,7 @@ MONODLL_OBJECTS = \
|
||||
monodll_tarstrm.o \
|
||||
monodll_textbuf.o \
|
||||
monodll_textfile.o \
|
||||
monodll_common_time.o \
|
||||
monodll_timercmn.o \
|
||||
monodll_timerimpl.o \
|
||||
monodll_tokenzr.o \
|
||||
@@ -1117,6 +1121,7 @@ MONOLIB_OBJECTS = \
|
||||
monolib_tarstrm.o \
|
||||
monolib_textbuf.o \
|
||||
monolib_textfile.o \
|
||||
monolib_common_time.o \
|
||||
monolib_timercmn.o \
|
||||
monolib_timerimpl.o \
|
||||
monolib_tokenzr.o \
|
||||
@@ -1245,6 +1250,7 @@ BASEDLL_OBJECTS = \
|
||||
basedll_tarstrm.o \
|
||||
basedll_textbuf.o \
|
||||
basedll_textfile.o \
|
||||
basedll_common_time.o \
|
||||
basedll_timercmn.o \
|
||||
basedll_timerimpl.o \
|
||||
basedll_tokenzr.o \
|
||||
@@ -1356,6 +1362,7 @@ BASELIB_OBJECTS = \
|
||||
baselib_tarstrm.o \
|
||||
baselib_textbuf.o \
|
||||
baselib_textfile.o \
|
||||
baselib_common_time.o \
|
||||
baselib_timercmn.o \
|
||||
baselib_timerimpl.o \
|
||||
baselib_tokenzr.o \
|
||||
@@ -4419,7 +4426,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS = \
|
||||
monodll_fswatcher.o \
|
||||
$(__BASE_WINCE_SRC_OBJECTS)
|
||||
@COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS)
|
||||
@COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS = monodll_time.o
|
||||
@COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS = monodll_wince_time.o
|
||||
@COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS =
|
||||
@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \
|
||||
@COND_PLATFORM_WIN32_1@ = monodll_msw_evtloop.o monodll_msw_main.o \
|
||||
@@ -6377,7 +6384,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 = \
|
||||
monolib_fswatcher.o \
|
||||
$(__BASE_WINCE_SRC_OBJECTS_1)
|
||||
@COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1)
|
||||
@COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS_1 = monolib_time.o
|
||||
@COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS_1 = monolib_wince_time.o
|
||||
@COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 =
|
||||
@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \
|
||||
@COND_PLATFORM_WIN32_1@ = monolib_msw_evtloop.o monolib_msw_main.o \
|
||||
@@ -8388,7 +8395,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 = \
|
||||
basedll_fswatcher.o \
|
||||
$(__BASE_WINCE_SRC_OBJECTS_2)
|
||||
@COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2)
|
||||
@COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS_2 = basedll_time.o
|
||||
@COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS_2 = basedll_wince_time.o
|
||||
@COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 =
|
||||
@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 \
|
||||
@COND_PLATFORM_WIN32_1@ = basedll_evtloop.o basedll_main.o basedll_mslu.o \
|
||||
@@ -8488,7 +8495,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 = \
|
||||
baselib_fswatcher.o \
|
||||
$(__BASE_WINCE_SRC_OBJECTS_3)
|
||||
@COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3)
|
||||
@COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS_3 = baselib_time.o
|
||||
@COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS_3 = baselib_wince_time.o
|
||||
@COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 =
|
||||
@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 \
|
||||
@COND_PLATFORM_WIN32_1@ = baselib_evtloop.o baselib_main.o baselib_mslu.o \
|
||||
@@ -15877,6 +15884,9 @@ monodll_textbuf.o: $(srcdir)/src/common/textbuf.cpp $(MONODLL_ODEP)
|
||||
monodll_textfile.o: $(srcdir)/src/common/textfile.cpp $(MONODLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/textfile.cpp
|
||||
|
||||
monodll_common_time.o: $(srcdir)/src/common/time.cpp $(MONODLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/time.cpp
|
||||
|
||||
monodll_timercmn.o: $(srcdir)/src/common/timercmn.cpp $(MONODLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/timercmn.cpp
|
||||
|
||||
@@ -15994,7 +16004,7 @@ monodll_msw_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp $(MONODLL_ODEP)
|
||||
monodll_fswatcher.o: $(srcdir)/src/msw/fswatcher.cpp $(MONODLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/fswatcher.cpp
|
||||
|
||||
monodll_time.o: $(srcdir)/src/msw/wince/time.cpp $(MONODLL_ODEP)
|
||||
monodll_wince_time.o: $(srcdir)/src/msw/wince/time.cpp $(MONODLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/time.cpp
|
||||
|
||||
monodll_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(MONODLL_ODEP)
|
||||
@@ -21262,6 +21272,9 @@ monolib_textbuf.o: $(srcdir)/src/common/textbuf.cpp $(MONOLIB_ODEP)
|
||||
monolib_textfile.o: $(srcdir)/src/common/textfile.cpp $(MONOLIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/textfile.cpp
|
||||
|
||||
monolib_common_time.o: $(srcdir)/src/common/time.cpp $(MONOLIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/time.cpp
|
||||
|
||||
monolib_timercmn.o: $(srcdir)/src/common/timercmn.cpp $(MONOLIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/timercmn.cpp
|
||||
|
||||
@@ -21379,7 +21392,7 @@ monolib_msw_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp $(MONOLIB_ODEP)
|
||||
monolib_fswatcher.o: $(srcdir)/src/msw/fswatcher.cpp $(MONOLIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/fswatcher.cpp
|
||||
|
||||
monolib_time.o: $(srcdir)/src/msw/wince/time.cpp $(MONOLIB_ODEP)
|
||||
monolib_wince_time.o: $(srcdir)/src/msw/wince/time.cpp $(MONOLIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/wince/time.cpp
|
||||
|
||||
monolib_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(MONOLIB_ODEP)
|
||||
@@ -26647,6 +26660,9 @@ basedll_textbuf.o: $(srcdir)/src/common/textbuf.cpp $(BASEDLL_ODEP)
|
||||
basedll_textfile.o: $(srcdir)/src/common/textfile.cpp $(BASEDLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/textfile.cpp
|
||||
|
||||
basedll_common_time.o: $(srcdir)/src/common/time.cpp $(BASEDLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/time.cpp
|
||||
|
||||
basedll_timercmn.o: $(srcdir)/src/common/timercmn.cpp $(BASEDLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/timercmn.cpp
|
||||
|
||||
@@ -26764,7 +26780,7 @@ basedll_msw_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp $(BASEDLL_ODEP)
|
||||
basedll_fswatcher.o: $(srcdir)/src/msw/fswatcher.cpp $(BASEDLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/fswatcher.cpp
|
||||
|
||||
basedll_time.o: $(srcdir)/src/msw/wince/time.cpp $(BASEDLL_ODEP)
|
||||
basedll_wince_time.o: $(srcdir)/src/msw/wince/time.cpp $(BASEDLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/wince/time.cpp
|
||||
|
||||
basedll_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(BASEDLL_ODEP)
|
||||
@@ -27151,6 +27167,9 @@ baselib_textbuf.o: $(srcdir)/src/common/textbuf.cpp $(BASELIB_ODEP)
|
||||
baselib_textfile.o: $(srcdir)/src/common/textfile.cpp $(BASELIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/textfile.cpp
|
||||
|
||||
baselib_common_time.o: $(srcdir)/src/common/time.cpp $(BASELIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/time.cpp
|
||||
|
||||
baselib_timercmn.o: $(srcdir)/src/common/timercmn.cpp $(BASELIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/timercmn.cpp
|
||||
|
||||
@@ -27268,7 +27287,7 @@ baselib_msw_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp $(BASELIB_ODEP)
|
||||
baselib_fswatcher.o: $(srcdir)/src/msw/fswatcher.cpp $(BASELIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/fswatcher.cpp
|
||||
|
||||
baselib_time.o: $(srcdir)/src/msw/wince/time.cpp $(BASELIB_ODEP)
|
||||
baselib_wince_time.o: $(srcdir)/src/msw/wince/time.cpp $(BASELIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/wince/time.cpp
|
||||
|
||||
baselib_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(BASELIB_ODEP)
|
||||
|
||||
@@ -382,6 +382,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/common/tarstrm.cpp
|
||||
src/common/textbuf.cpp
|
||||
src/common/textfile.cpp
|
||||
src/common/time.cpp
|
||||
src/common/timercmn.cpp
|
||||
src/common/timerimpl.cpp
|
||||
src/common/tokenzr.cpp
|
||||
@@ -527,6 +528,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/textfile.h
|
||||
wx/thread.h
|
||||
wx/thrimpl.cpp
|
||||
wx/time.h
|
||||
wx/timer.h
|
||||
wx/tls.h
|
||||
wx/tokenzr.h
|
||||
|
||||
@@ -390,6 +390,7 @@ MONODLL_OBJECTS = \
|
||||
$(OBJS)\monodll_tarstrm.obj \
|
||||
$(OBJS)\monodll_textbuf.obj \
|
||||
$(OBJS)\monodll_textfile.obj \
|
||||
$(OBJS)\monodll_time.obj \
|
||||
$(OBJS)\monodll_timercmn.obj \
|
||||
$(OBJS)\monodll_timerimpl.obj \
|
||||
$(OBJS)\monodll_tokenzr.obj \
|
||||
@@ -538,6 +539,7 @@ MONOLIB_OBJECTS = \
|
||||
$(OBJS)\monolib_tarstrm.obj \
|
||||
$(OBJS)\monolib_textbuf.obj \
|
||||
$(OBJS)\monolib_textfile.obj \
|
||||
$(OBJS)\monolib_time.obj \
|
||||
$(OBJS)\monolib_timercmn.obj \
|
||||
$(OBJS)\monolib_timerimpl.obj \
|
||||
$(OBJS)\monolib_tokenzr.obj \
|
||||
@@ -684,6 +686,7 @@ BASEDLL_OBJECTS = \
|
||||
$(OBJS)\basedll_tarstrm.obj \
|
||||
$(OBJS)\basedll_textbuf.obj \
|
||||
$(OBJS)\basedll_textfile.obj \
|
||||
$(OBJS)\basedll_time.obj \
|
||||
$(OBJS)\basedll_timercmn.obj \
|
||||
$(OBJS)\basedll_timerimpl.obj \
|
||||
$(OBJS)\basedll_tokenzr.obj \
|
||||
@@ -814,6 +817,7 @@ BASELIB_OBJECTS = \
|
||||
$(OBJS)\baselib_tarstrm.obj \
|
||||
$(OBJS)\baselib_textbuf.obj \
|
||||
$(OBJS)\baselib_textfile.obj \
|
||||
$(OBJS)\baselib_time.obj \
|
||||
$(OBJS)\baselib_timercmn.obj \
|
||||
$(OBJS)\baselib_timerimpl.obj \
|
||||
$(OBJS)\baselib_tokenzr.obj \
|
||||
@@ -6246,6 +6250,9 @@ $(OBJS)\monodll_textbuf.obj: ..\..\src\common\textbuf.cpp
|
||||
$(OBJS)\monodll_textfile.obj: ..\..\src\common\textfile.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textfile.cpp
|
||||
|
||||
$(OBJS)\monodll_time.obj: ..\..\src\common\time.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\time.cpp
|
||||
|
||||
$(OBJS)\monodll_timercmn.obj: ..\..\src\common\timercmn.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\timercmn.cpp
|
||||
|
||||
@@ -8648,6 +8655,9 @@ $(OBJS)\monolib_textbuf.obj: ..\..\src\common\textbuf.cpp
|
||||
$(OBJS)\monolib_textfile.obj: ..\..\src\common\textfile.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textfile.cpp
|
||||
|
||||
$(OBJS)\monolib_time.obj: ..\..\src\common\time.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\time.cpp
|
||||
|
||||
$(OBJS)\monolib_timercmn.obj: ..\..\src\common\timercmn.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\timercmn.cpp
|
||||
|
||||
@@ -11050,6 +11060,9 @@ $(OBJS)\basedll_textbuf.obj: ..\..\src\common\textbuf.cpp
|
||||
$(OBJS)\basedll_textfile.obj: ..\..\src\common\textfile.cpp
|
||||
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\textfile.cpp
|
||||
|
||||
$(OBJS)\basedll_time.obj: ..\..\src\common\time.cpp
|
||||
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\time.cpp
|
||||
|
||||
$(OBJS)\basedll_timercmn.obj: ..\..\src\common\timercmn.cpp
|
||||
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\timercmn.cpp
|
||||
|
||||
@@ -11386,6 +11399,9 @@ $(OBJS)\baselib_textbuf.obj: ..\..\src\common\textbuf.cpp
|
||||
$(OBJS)\baselib_textfile.obj: ..\..\src\common\textfile.cpp
|
||||
$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\textfile.cpp
|
||||
|
||||
$(OBJS)\baselib_time.obj: ..\..\src\common\time.cpp
|
||||
$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\time.cpp
|
||||
|
||||
$(OBJS)\baselib_timercmn.obj: ..\..\src\common\timercmn.cpp
|
||||
$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\timercmn.cpp
|
||||
|
||||
|
||||
@@ -375,6 +375,7 @@ MONODLL_OBJECTS = \
|
||||
$(OBJS)\monodll_tarstrm.o \
|
||||
$(OBJS)\monodll_textbuf.o \
|
||||
$(OBJS)\monodll_textfile.o \
|
||||
$(OBJS)\monodll_time.o \
|
||||
$(OBJS)\monodll_timercmn.o \
|
||||
$(OBJS)\monodll_timerimpl.o \
|
||||
$(OBJS)\monodll_tokenzr.o \
|
||||
@@ -524,6 +525,7 @@ MONOLIB_OBJECTS = \
|
||||
$(OBJS)\monolib_tarstrm.o \
|
||||
$(OBJS)\monolib_textbuf.o \
|
||||
$(OBJS)\monolib_textfile.o \
|
||||
$(OBJS)\monolib_time.o \
|
||||
$(OBJS)\monolib_timercmn.o \
|
||||
$(OBJS)\monolib_timerimpl.o \
|
||||
$(OBJS)\monolib_tokenzr.o \
|
||||
@@ -671,6 +673,7 @@ BASEDLL_OBJECTS = \
|
||||
$(OBJS)\basedll_tarstrm.o \
|
||||
$(OBJS)\basedll_textbuf.o \
|
||||
$(OBJS)\basedll_textfile.o \
|
||||
$(OBJS)\basedll_time.o \
|
||||
$(OBJS)\basedll_timercmn.o \
|
||||
$(OBJS)\basedll_timerimpl.o \
|
||||
$(OBJS)\basedll_tokenzr.o \
|
||||
@@ -802,6 +805,7 @@ BASELIB_OBJECTS = \
|
||||
$(OBJS)\baselib_tarstrm.o \
|
||||
$(OBJS)\baselib_textbuf.o \
|
||||
$(OBJS)\baselib_textfile.o \
|
||||
$(OBJS)\baselib_time.o \
|
||||
$(OBJS)\baselib_timercmn.o \
|
||||
$(OBJS)\baselib_timerimpl.o \
|
||||
$(OBJS)\baselib_tokenzr.o \
|
||||
@@ -6414,6 +6418,9 @@ $(OBJS)\monodll_textbuf.o: ../../src/common/textbuf.cpp
|
||||
$(OBJS)\monodll_textfile.o: ../../src/common/textfile.cpp
|
||||
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
$(OBJS)\monodll_time.o: ../../src/common/time.cpp
|
||||
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
$(OBJS)\monodll_timercmn.o: ../../src/common/timercmn.cpp
|
||||
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
@@ -8816,6 +8823,9 @@ $(OBJS)\monolib_textbuf.o: ../../src/common/textbuf.cpp
|
||||
$(OBJS)\monolib_textfile.o: ../../src/common/textfile.cpp
|
||||
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
$(OBJS)\monolib_time.o: ../../src/common/time.cpp
|
||||
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
$(OBJS)\monolib_timercmn.o: ../../src/common/timercmn.cpp
|
||||
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
@@ -11218,6 +11228,9 @@ $(OBJS)\basedll_textbuf.o: ../../src/common/textbuf.cpp
|
||||
$(OBJS)\basedll_textfile.o: ../../src/common/textfile.cpp
|
||||
$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
$(OBJS)\basedll_time.o: ../../src/common/time.cpp
|
||||
$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
$(OBJS)\basedll_timercmn.o: ../../src/common/timercmn.cpp
|
||||
$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
@@ -11554,6 +11567,9 @@ $(OBJS)\baselib_textbuf.o: ../../src/common/textbuf.cpp
|
||||
$(OBJS)\baselib_textfile.o: ../../src/common/textfile.cpp
|
||||
$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
$(OBJS)\baselib_time.o: ../../src/common/time.cpp
|
||||
$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
$(OBJS)\baselib_timercmn.o: ../../src/common/timercmn.cpp
|
||||
$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
|
||||
@@ -393,6 +393,7 @@ MONODLL_OBJECTS = \
|
||||
$(OBJS)\monodll_tarstrm.obj \
|
||||
$(OBJS)\monodll_textbuf.obj \
|
||||
$(OBJS)\monodll_textfile.obj \
|
||||
$(OBJS)\monodll_time.obj \
|
||||
$(OBJS)\monodll_timercmn.obj \
|
||||
$(OBJS)\monodll_timerimpl.obj \
|
||||
$(OBJS)\monodll_tokenzr.obj \
|
||||
@@ -548,6 +549,7 @@ MONOLIB_OBJECTS = \
|
||||
$(OBJS)\monolib_tarstrm.obj \
|
||||
$(OBJS)\monolib_textbuf.obj \
|
||||
$(OBJS)\monolib_textfile.obj \
|
||||
$(OBJS)\monolib_time.obj \
|
||||
$(OBJS)\monolib_timercmn.obj \
|
||||
$(OBJS)\monolib_timerimpl.obj \
|
||||
$(OBJS)\monolib_tokenzr.obj \
|
||||
@@ -699,6 +701,7 @@ BASEDLL_OBJECTS = \
|
||||
$(OBJS)\basedll_tarstrm.obj \
|
||||
$(OBJS)\basedll_textbuf.obj \
|
||||
$(OBJS)\basedll_textfile.obj \
|
||||
$(OBJS)\basedll_time.obj \
|
||||
$(OBJS)\basedll_timercmn.obj \
|
||||
$(OBJS)\basedll_timerimpl.obj \
|
||||
$(OBJS)\basedll_tokenzr.obj \
|
||||
@@ -836,6 +839,7 @@ BASELIB_OBJECTS = \
|
||||
$(OBJS)\baselib_tarstrm.obj \
|
||||
$(OBJS)\baselib_textbuf.obj \
|
||||
$(OBJS)\baselib_textfile.obj \
|
||||
$(OBJS)\baselib_time.obj \
|
||||
$(OBJS)\baselib_timercmn.obj \
|
||||
$(OBJS)\baselib_timerimpl.obj \
|
||||
$(OBJS)\baselib_tokenzr.obj \
|
||||
@@ -6852,6 +6856,9 @@ $(OBJS)\monodll_textbuf.obj: ..\..\src\common\textbuf.cpp
|
||||
$(OBJS)\monodll_textfile.obj: ..\..\src\common\textfile.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textfile.cpp
|
||||
|
||||
$(OBJS)\monodll_time.obj: ..\..\src\common\time.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\time.cpp
|
||||
|
||||
$(OBJS)\monodll_timercmn.obj: ..\..\src\common\timercmn.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\timercmn.cpp
|
||||
|
||||
@@ -9254,6 +9261,9 @@ $(OBJS)\monolib_textbuf.obj: ..\..\src\common\textbuf.cpp
|
||||
$(OBJS)\monolib_textfile.obj: ..\..\src\common\textfile.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textfile.cpp
|
||||
|
||||
$(OBJS)\monolib_time.obj: ..\..\src\common\time.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\time.cpp
|
||||
|
||||
$(OBJS)\monolib_timercmn.obj: ..\..\src\common\timercmn.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\timercmn.cpp
|
||||
|
||||
@@ -11656,6 +11666,9 @@ $(OBJS)\basedll_textbuf.obj: ..\..\src\common\textbuf.cpp
|
||||
$(OBJS)\basedll_textfile.obj: ..\..\src\common\textfile.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\textfile.cpp
|
||||
|
||||
$(OBJS)\basedll_time.obj: ..\..\src\common\time.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\time.cpp
|
||||
|
||||
$(OBJS)\basedll_timercmn.obj: ..\..\src\common\timercmn.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\timercmn.cpp
|
||||
|
||||
@@ -11992,6 +12005,9 @@ $(OBJS)\baselib_textbuf.obj: ..\..\src\common\textbuf.cpp
|
||||
$(OBJS)\baselib_textfile.obj: ..\..\src\common\textfile.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\textfile.cpp
|
||||
|
||||
$(OBJS)\baselib_time.obj: ..\..\src\common\time.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\time.cpp
|
||||
|
||||
$(OBJS)\baselib_timercmn.obj: ..\..\src\common\timercmn.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\timercmn.cpp
|
||||
|
||||
|
||||
@@ -3911,6 +3911,7 @@ MONODLL_OBJECTS = &
|
||||
$(OBJS)\monodll_tarstrm.obj &
|
||||
$(OBJS)\monodll_textbuf.obj &
|
||||
$(OBJS)\monodll_textfile.obj &
|
||||
$(OBJS)\monodll_time.obj &
|
||||
$(OBJS)\monodll_timercmn.obj &
|
||||
$(OBJS)\monodll_timerimpl.obj &
|
||||
$(OBJS)\monodll_tokenzr.obj &
|
||||
@@ -4058,6 +4059,7 @@ MONOLIB_OBJECTS = &
|
||||
$(OBJS)\monolib_tarstrm.obj &
|
||||
$(OBJS)\monolib_textbuf.obj &
|
||||
$(OBJS)\monolib_textfile.obj &
|
||||
$(OBJS)\monolib_time.obj &
|
||||
$(OBJS)\monolib_timercmn.obj &
|
||||
$(OBJS)\monolib_timerimpl.obj &
|
||||
$(OBJS)\monolib_tokenzr.obj &
|
||||
@@ -4203,6 +4205,7 @@ BASEDLL_OBJECTS = &
|
||||
$(OBJS)\basedll_tarstrm.obj &
|
||||
$(OBJS)\basedll_textbuf.obj &
|
||||
$(OBJS)\basedll_textfile.obj &
|
||||
$(OBJS)\basedll_time.obj &
|
||||
$(OBJS)\basedll_timercmn.obj &
|
||||
$(OBJS)\basedll_timerimpl.obj &
|
||||
$(OBJS)\basedll_tokenzr.obj &
|
||||
@@ -4333,6 +4336,7 @@ BASELIB_OBJECTS = &
|
||||
$(OBJS)\baselib_tarstrm.obj &
|
||||
$(OBJS)\baselib_textbuf.obj &
|
||||
$(OBJS)\baselib_textfile.obj &
|
||||
$(OBJS)\baselib_time.obj &
|
||||
$(OBJS)\baselib_timercmn.obj &
|
||||
$(OBJS)\baselib_timerimpl.obj &
|
||||
$(OBJS)\baselib_tokenzr.obj &
|
||||
@@ -6685,6 +6689,9 @@ $(OBJS)\monodll_textbuf.obj : .AUTODEPEND ..\..\src\common\textbuf.cpp
|
||||
$(OBJS)\monodll_textfile.obj : .AUTODEPEND ..\..\src\common\textfile.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\monodll_time.obj : .AUTODEPEND ..\..\src\common\time.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\monodll_timercmn.obj : .AUTODEPEND ..\..\src\common\timercmn.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
@@ -9087,6 +9094,9 @@ $(OBJS)\monolib_textbuf.obj : .AUTODEPEND ..\..\src\common\textbuf.cpp
|
||||
$(OBJS)\monolib_textfile.obj : .AUTODEPEND ..\..\src\common\textfile.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\monolib_time.obj : .AUTODEPEND ..\..\src\common\time.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\monolib_timercmn.obj : .AUTODEPEND ..\..\src\common\timercmn.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
@@ -11489,6 +11499,9 @@ $(OBJS)\basedll_textbuf.obj : .AUTODEPEND ..\..\src\common\textbuf.cpp
|
||||
$(OBJS)\basedll_textfile.obj : .AUTODEPEND ..\..\src\common\textfile.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\basedll_time.obj : .AUTODEPEND ..\..\src\common\time.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\basedll_timercmn.obj : .AUTODEPEND ..\..\src\common\timercmn.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
|
||||
|
||||
@@ -11825,6 +11838,9 @@ $(OBJS)\baselib_textbuf.obj : .AUTODEPEND ..\..\src\common\textbuf.cpp
|
||||
$(OBJS)\baselib_textfile.obj : .AUTODEPEND ..\..\src\common\textfile.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\baselib_time.obj : .AUTODEPEND ..\..\src\common\time.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\baselib_timercmn.obj : .AUTODEPEND ..\..\src\common\timercmn.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
|
||||
|
||||
|
||||
@@ -531,6 +531,10 @@ SOURCE=..\..\src\common\textfile.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\src\common\time.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\src\common\timercmn.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
@@ -1563,6 +1567,10 @@ SOURCE=..\..\include\wx\thread.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\include\wx\time.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\include\wx\timer.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
@@ -837,6 +837,9 @@
|
||||
<File
|
||||
RelativePath="..\..\src\common\textfile.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\time.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\timercmn.cpp">
|
||||
</File>
|
||||
@@ -1596,6 +1599,9 @@
|
||||
<File
|
||||
RelativePath="..\..\include\wx\thread.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\time.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\timer.h">
|
||||
</File>
|
||||
|
||||
@@ -1150,6 +1150,10 @@
|
||||
RelativePath="..\..\src\common\textfile.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\time.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\timercmn.cpp"
|
||||
>
|
||||
@@ -2149,6 +2153,10 @@
|
||||
RelativePath="..\..\include\wx\thread.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\time.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\timer.h"
|
||||
>
|
||||
|
||||
@@ -1146,6 +1146,10 @@
|
||||
RelativePath="..\..\src\common\textfile.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\time.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\timercmn.cpp"
|
||||
>
|
||||
@@ -2145,6 +2149,10 @@
|
||||
RelativePath="..\..\include\wx\thread.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\time.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\timer.h"
|
||||
>
|
||||
|
||||
17
include/wx/time.h
Normal file
17
include/wx/time.h
Normal file
@@ -0,0 +1,17 @@
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// Name: wx/time.h
|
||||
// Purpose: Miscellaneous time-related functions.
|
||||
// Author: Vadim Zeitlin
|
||||
// Created: 2011-11-26
|
||||
// RCS-ID: $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $
|
||||
// Copyright: (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_TIME_H_
|
||||
#define _WX_TIME_H_
|
||||
|
||||
// Returns the difference between UTC and local time in seconds.
|
||||
WXDLLIMPEXP_BASE int wxGetTimeZone();
|
||||
|
||||
#endif // _WX_TIME_H_
|
||||
21
interface/wx/time.h
Normal file
21
interface/wx/time.h
Normal file
@@ -0,0 +1,21 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: wx/time.h
|
||||
// Purpose: Time-related functions.
|
||||
// Author: Vadim Zeitlin
|
||||
// Created: 2011-11-27
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
/** @addtogroup group_funcmacro_time */
|
||||
//@{
|
||||
|
||||
/**
|
||||
Returns the difference between UTC and local time in seconds.
|
||||
|
||||
@header{wx/time.h}
|
||||
*/
|
||||
int wxGetTimeZone();
|
||||
|
||||
//@}
|
||||
@@ -75,6 +75,7 @@
|
||||
#endif // WX_PRECOMP
|
||||
|
||||
#include "wx/thread.h"
|
||||
#include "wx/time.h"
|
||||
#include "wx/tokenzr.h"
|
||||
|
||||
#include <ctype.h>
|
||||
@@ -122,14 +123,6 @@ wxCUSTOM_TYPE_INFO(wxDateTime, wxToStringConverter<wxDateTime> , wxFromStringCon
|
||||
#include <values.h>
|
||||
#endif
|
||||
|
||||
#ifndef WX_GMTOFF_IN_TM
|
||||
// Define it for some systems which don't (always) use configure but are
|
||||
// known to have tm_gmtoff field.
|
||||
#if defined(__WXPALMOS__) || defined(__DARWIN__)
|
||||
#define WX_GMTOFF_IN_TM
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// NB: VC8 safe time functions could/should be used for wxMSW as well probably
|
||||
#if defined(__WXWINCE__) && defined(__VISUALC8__)
|
||||
|
||||
@@ -327,69 +320,6 @@ wxDateTime::wxDateTime_t GetNumOfDaysInMonth(int year, wxDateTime::Month month)
|
||||
return daysInMonth[wxDateTime::IsLeapYear(year)][month];
|
||||
}
|
||||
|
||||
// returns the time zone in the C sense, i.e. the difference UTC - local
|
||||
// (in seconds)
|
||||
// NOTE: not static because used by datetimefmt.cpp
|
||||
int GetTimeZone()
|
||||
{
|
||||
#ifdef WX_GMTOFF_IN_TM
|
||||
// set to true when the timezone is set
|
||||
static bool s_timezoneSet = false;
|
||||
static long gmtoffset = LONG_MAX; // invalid timezone
|
||||
|
||||
// ensure that the timezone variable is set by calling wxLocaltime_r
|
||||
if ( !s_timezoneSet )
|
||||
{
|
||||
// just call wxLocaltime_r() instead of figuring out whether this
|
||||
// system supports tzset(), _tzset() or something else
|
||||
time_t t = time(NULL);
|
||||
struct tm tm;
|
||||
|
||||
wxLocaltime_r(&t, &tm);
|
||||
s_timezoneSet = true;
|
||||
|
||||
// note that GMT offset is the opposite of time zone and so to return
|
||||
// consistent results in both WX_GMTOFF_IN_TM and !WX_GMTOFF_IN_TM
|
||||
// cases we have to negate it
|
||||
gmtoffset = -tm.tm_gmtoff;
|
||||
|
||||
// this function is supposed to return the same value whether DST is
|
||||
// enabled or not, so we need to use an additional offset if DST is on
|
||||
// as tm_gmtoff already does include it
|
||||
if ( tm.tm_isdst )
|
||||
gmtoffset += 3600;
|
||||
}
|
||||
return (int)gmtoffset;
|
||||
#elif defined(__DJGPP__) || defined(__WINE__)
|
||||
struct timeb tb;
|
||||
ftime(&tb);
|
||||
return tb.timezone*60;
|
||||
#elif defined(__VISUALC__)
|
||||
// We must initialize the time zone information before using it (this will
|
||||
// be done only once internally).
|
||||
_tzset();
|
||||
|
||||
// Starting with VC++ 8 timezone variable is deprecated and is not even
|
||||
// available in some standard library version so use the new function for
|
||||
// accessing it instead.
|
||||
#if wxCHECK_VISUALC_VERSION(8)
|
||||
long t;
|
||||
_get_timezone(&t);
|
||||
return t;
|
||||
#else // VC++ < 8
|
||||
return timezone;
|
||||
#endif
|
||||
#elif defined(WX_TIMEZONE) // If WX_TIMEZONE was defined by configure, use it.
|
||||
return WX_TIMEZONE;
|
||||
#elif defined(__BORLANDC__) || defined(__MINGW32__) || defined(__VISAGECPP__)
|
||||
return _timezone;
|
||||
#elif defined(__MWERKS__)
|
||||
return 28800;
|
||||
#else // unknown platform -- assume it has timezone
|
||||
return timezone;
|
||||
#endif // WX_GMTOFF_IN_TM/!WX_GMTOFF_IN_TM
|
||||
}
|
||||
|
||||
// return the integral part of the JDN for the midnight of the given date (to
|
||||
// get the real JDN you need to add 0.5, this is, in fact, JDN of the
|
||||
// noon of the previous day)
|
||||
@@ -615,7 +545,7 @@ wxDateTime::TimeZone::TimeZone(wxDateTime::TZ tz)
|
||||
case wxDateTime::Local:
|
||||
// get the offset from C RTL: it returns the difference GMT-local
|
||||
// while we want to have the offset _from_ GMT, hence the '-'
|
||||
m_offset = -GetTimeZone();
|
||||
m_offset = -wxGetTimeZone();
|
||||
break;
|
||||
|
||||
case wxDateTime::GMT_12:
|
||||
@@ -1272,7 +1202,7 @@ wxDateTime& wxDateTime::Set(const struct tm& tm)
|
||||
if ( tm2.tm_year == 70 && tm2.tm_mon == 0 && tm2.tm_mday == 1 )
|
||||
{
|
||||
return Set((time_t)(
|
||||
GetTimeZone() +
|
||||
wxGetTimeZone() +
|
||||
tm2.tm_hour * MIN_PER_HOUR * SEC_PER_MIN +
|
||||
tm2.tm_min * SEC_PER_MIN +
|
||||
tm2.tm_sec));
|
||||
@@ -1386,7 +1316,7 @@ wxDateTime& wxDateTime::Set(wxDateTime_t day,
|
||||
m_time *= SECONDS_PER_DAY * TIME_T_FACTOR;
|
||||
|
||||
// JDN corresponds to GMT, we take localtime
|
||||
Add(wxTimeSpan(hour, minute, second + GetTimeZone(), millisec));
|
||||
Add(wxTimeSpan(hour, minute, second + wxGetTimeZone(), millisec));
|
||||
}
|
||||
|
||||
return *this;
|
||||
@@ -1525,7 +1455,7 @@ wxDateTime::Tm wxDateTime::GetTm(const TimeZone& tz) const
|
||||
// use C RTL functions
|
||||
struct tm tmstruct;
|
||||
tm *tm;
|
||||
if ( tz.GetOffset() == -GetTimeZone() )
|
||||
if ( tz.GetOffset() == -wxGetTimeZone() )
|
||||
{
|
||||
// we are working with local time
|
||||
tm = wxLocaltime_r(&time, &tmstruct);
|
||||
@@ -2159,7 +2089,7 @@ int wxDateTime::IsDST(wxDateTime::Country country) const
|
||||
|
||||
wxDateTime& wxDateTime::MakeTimezone(const TimeZone& tz, bool noDST)
|
||||
{
|
||||
long secDiff = GetTimeZone() + tz.GetOffset();
|
||||
long secDiff = wxGetTimeZone() + tz.GetOffset();
|
||||
|
||||
// we need to know whether DST is or not in effect for this date unless
|
||||
// the test disabled by the caller
|
||||
@@ -2174,7 +2104,7 @@ wxDateTime& wxDateTime::MakeTimezone(const TimeZone& tz, bool noDST)
|
||||
|
||||
wxDateTime& wxDateTime::MakeFromTimezone(const TimeZone& tz, bool noDST)
|
||||
{
|
||||
long secDiff = GetTimeZone() + tz.GetOffset();
|
||||
long secDiff = wxGetTimeZone() + tz.GetOffset();
|
||||
|
||||
// we need to know whether DST is or not in effect for this date unless
|
||||
// the test disabled by the caller
|
||||
|
||||
@@ -57,6 +57,7 @@
|
||||
#endif
|
||||
|
||||
#include "wx/datetime.h"
|
||||
#include "wx/time.h"
|
||||
|
||||
// ============================================================================
|
||||
// implementation of wxDateTime
|
||||
@@ -68,8 +69,6 @@
|
||||
|
||||
extern void InitTm(struct tm& tm);
|
||||
|
||||
extern int GetTimeZone();
|
||||
|
||||
extern wxString CallStrftime(const wxString& format, const tm* tm);
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -329,7 +328,7 @@ wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const
|
||||
// use strftime()
|
||||
struct tm tmstruct;
|
||||
struct tm *tm;
|
||||
if ( tz.GetOffset() == -GetTimeZone() )
|
||||
if ( tz.GetOffset() == -wxGetTimeZone() )
|
||||
{
|
||||
// we are working with local time
|
||||
tm = wxLocaltime_r(&time, &tmstruct);
|
||||
|
||||
100
src/common/time.cpp
Normal file
100
src/common/time.cpp
Normal file
@@ -0,0 +1,100 @@
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// Name: src/common/time.cpp
|
||||
// Purpose: Implementation of time-related functions.
|
||||
// Author: Vadim Zeitlin
|
||||
// Created: 2011-11-26
|
||||
// RCS-ID: $Id: wxhead.cpp,v 1.11 2010-04-22 12:44:51 zeitlin Exp $
|
||||
// Copyright: (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
// ============================================================================
|
||||
// declarations
|
||||
// ============================================================================
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// headers
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// for compilers that support precompilation, includes "wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#ifdef __BORLANDC__
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
|
||||
#include "wx/time.h"
|
||||
|
||||
#ifndef WX_GMTOFF_IN_TM
|
||||
// Define it for some systems which don't (always) use configure but are
|
||||
// known to have tm_gmtoff field.
|
||||
#if defined(__WXPALMOS__) || defined(__DARWIN__)
|
||||
#define WX_GMTOFF_IN_TM
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// ============================================================================
|
||||
// implementation
|
||||
// ============================================================================
|
||||
|
||||
// returns the time zone in the C sense, i.e. the difference UTC - local
|
||||
// (in seconds)
|
||||
int wxGetTimeZone()
|
||||
{
|
||||
#ifdef WX_GMTOFF_IN_TM
|
||||
// set to true when the timezone is set
|
||||
static bool s_timezoneSet = false;
|
||||
static long gmtoffset = LONG_MAX; // invalid timezone
|
||||
|
||||
// ensure that the timezone variable is set by calling wxLocaltime_r
|
||||
if ( !s_timezoneSet )
|
||||
{
|
||||
// just call wxLocaltime_r() instead of figuring out whether this
|
||||
// system supports tzset(), _tzset() or something else
|
||||
time_t t = time(NULL);
|
||||
struct tm tm;
|
||||
|
||||
wxLocaltime_r(&t, &tm);
|
||||
s_timezoneSet = true;
|
||||
|
||||
// note that GMT offset is the opposite of time zone and so to return
|
||||
// consistent results in both WX_GMTOFF_IN_TM and !WX_GMTOFF_IN_TM
|
||||
// cases we have to negate it
|
||||
gmtoffset = -tm.tm_gmtoff;
|
||||
|
||||
// this function is supposed to return the same value whether DST is
|
||||
// enabled or not, so we need to use an additional offset if DST is on
|
||||
// as tm_gmtoff already does include it
|
||||
if ( tm.tm_isdst )
|
||||
gmtoffset += 3600;
|
||||
}
|
||||
return (int)gmtoffset;
|
||||
#elif defined(__DJGPP__) || defined(__WINE__)
|
||||
struct timeb tb;
|
||||
ftime(&tb);
|
||||
return tb.timezone*60;
|
||||
#elif defined(__VISUALC__)
|
||||
// We must initialize the time zone information before using it (this will
|
||||
// be done only once internally).
|
||||
_tzset();
|
||||
|
||||
// Starting with VC++ 8 timezone variable is deprecated and is not even
|
||||
// available in some standard library version so use the new function for
|
||||
// accessing it instead.
|
||||
#if wxCHECK_VISUALC_VERSION(8)
|
||||
long t;
|
||||
_get_timezone(&t);
|
||||
return t;
|
||||
#else // VC++ < 8
|
||||
return timezone;
|
||||
#endif
|
||||
#elif defined(WX_TIMEZONE) // If WX_TIMEZONE was defined by configure, use it.
|
||||
return WX_TIMEZONE;
|
||||
#elif defined(__BORLANDC__) || defined(__MINGW32__) || defined(__VISAGECPP__)
|
||||
return _timezone;
|
||||
#elif defined(__MWERKS__)
|
||||
return 28800;
|
||||
#else // unknown platform -- assume it has timezone
|
||||
return timezone;
|
||||
#endif // WX_GMTOFF_IN_TM/!WX_GMTOFF_IN_TM
|
||||
}
|
||||
@@ -306,6 +306,7 @@ wx/textbuf.h
|
||||
wx/textfile.h
|
||||
wx/thread.h
|
||||
wx/thrimpl.cpp
|
||||
wx/time.h
|
||||
wx/timer.h
|
||||
wx/tls.h
|
||||
wx/tokenzr.h
|
||||
|
||||
@@ -208,6 +208,7 @@ wx/textbuf.h
|
||||
wx/textfile.h
|
||||
wx/thread.h
|
||||
wx/thrimpl.cpp
|
||||
wx/time.h
|
||||
wx/timer.h
|
||||
wx/tls.h
|
||||
wx/tokenzr.h
|
||||
|
||||
@@ -232,6 +232,7 @@ wx/textbuf.h
|
||||
wx/textfile.h
|
||||
wx/thread.h
|
||||
wx/thrimpl.cpp
|
||||
wx/time.h
|
||||
wx/timer.h
|
||||
wx/tls.h
|
||||
wx/tokenzr.h
|
||||
|
||||
Reference in New Issue
Block a user