Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extracted private GetTimeZone() to public wxGetTimeZone() function.

Browse Source 
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
2011-11-27 19:50:19 +00:00
parent b0ec002323
commit 59068d79f7
30 changed files with 4541 additions and 4356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Makefile.in
View File

@@ -439,6 +439,7 @@ ALL_BASE_HEADERS = \
wx/textfile.h \ wx/textfile.h \
wx/thread.h \ wx/thread.h \
wx/thrimpl.cpp \ wx/thrimpl.cpp \
wx/time.h \
wx/timer.h \ wx/timer.h \
wx/tls.h \ wx/tls.h \
wx/tokenzr.h \ wx/tokenzr.h \
@@ -618,6 +619,7 @@ ALL_PORTS_BASE_HEADERS = \
wx/textfile.h \ wx/textfile.h \
wx/thread.h \ wx/thread.h \
wx/thrimpl.cpp \ wx/thrimpl.cpp \
wx/time.h \
wx/timer.h \ wx/timer.h \
wx/tls.h \ wx/tls.h \
wx/tokenzr.h \ wx/tokenzr.h \
@@ -785,6 +787,7 @@ ALL_BASE_SOURCES = \
src/common/tarstrm.cpp \ src/common/tarstrm.cpp \
src/common/textbuf.cpp \ src/common/textbuf.cpp \
src/common/textfile.cpp \ src/common/textfile.cpp \
src/common/time.cpp \
src/common/timercmn.cpp \ src/common/timercmn.cpp \
src/common/timerimpl.cpp \ src/common/timerimpl.cpp \
src/common/tokenzr.cpp \ src/common/tokenzr.cpp \
@@ -984,6 +987,7 @@ MONODLL_OBJECTS = \
monodll_tarstrm.o \ monodll_tarstrm.o \
monodll_textbuf.o \ monodll_textbuf.o \
monodll_textfile.o \ monodll_textfile.o \
monodll_common_time.o \
monodll_timercmn.o \ monodll_timercmn.o \
monodll_timerimpl.o \ monodll_timerimpl.o \
monodll_tokenzr.o \ monodll_tokenzr.o \
@@ -1117,6 +1121,7 @@ MONOLIB_OBJECTS = \
monolib_tarstrm.o \ monolib_tarstrm.o \
monolib_textbuf.o \ monolib_textbuf.o \
monolib_textfile.o \ monolib_textfile.o \
monolib_common_time.o \
monolib_timercmn.o \ monolib_timercmn.o \
monolib_timerimpl.o \ monolib_timerimpl.o \
monolib_tokenzr.o \ monolib_tokenzr.o \
@@ -1245,6 +1250,7 @@ BASEDLL_OBJECTS = \
basedll_tarstrm.o \ basedll_tarstrm.o \
basedll_textbuf.o \ basedll_textbuf.o \
basedll_textfile.o \ basedll_textfile.o \
basedll_common_time.o \
basedll_timercmn.o \ basedll_timercmn.o \
basedll_timerimpl.o \ basedll_timerimpl.o \
basedll_tokenzr.o \ basedll_tokenzr.o \
@@ -1356,6 +1362,7 @@ BASELIB_OBJECTS = \
baselib_tarstrm.o \ baselib_tarstrm.o \
baselib_textbuf.o \ baselib_textbuf.o \
baselib_textfile.o \ baselib_textfile.o \
baselib_common_time.o \
baselib_timercmn.o \ baselib_timercmn.o \
baselib_timerimpl.o \ baselib_timerimpl.o \
baselib_tokenzr.o \ baselib_tokenzr.o \
@@ -4419,7 +4426,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS = \
monodll_fswatcher.o \ monodll_fswatcher.o \
$(__BASE_WINCE_SRC_OBJECTS) $(__BASE_WINCE_SRC_OBJECTS)
@COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_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_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS =
@COND_PLATFORM_WIN32_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 \ @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 \ monolib_fswatcher.o \
$(__BASE_WINCE_SRC_OBJECTS_1) $(__BASE_WINCE_SRC_OBJECTS_1)
@COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_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_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 =
@COND_PLATFORM_WIN32_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 \ @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 \ basedll_fswatcher.o \
$(__BASE_WINCE_SRC_OBJECTS_2) $(__BASE_WINCE_SRC_OBJECTS_2)
@COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_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_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 =
@COND_PLATFORM_WIN32_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 \ @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 \ baselib_fswatcher.o \
$(__BASE_WINCE_SRC_OBJECTS_3) $(__BASE_WINCE_SRC_OBJECTS_3)
@COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_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_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 =
@COND_PLATFORM_WIN32_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 \ @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) monodll_textfile.o: $(srcdir)/src/common/textfile.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/textfile.cpp $(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) monodll_timercmn.o: $(srcdir)/src/common/timercmn.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/timercmn.cpp $(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) monodll_fswatcher.o: $(srcdir)/src/msw/fswatcher.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/fswatcher.cpp $(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 $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/time.cpp
monodll_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(MONODLL_ODEP) 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) monolib_textfile.o: $(srcdir)/src/common/textfile.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/textfile.cpp $(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) monolib_timercmn.o: $(srcdir)/src/common/timercmn.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/timercmn.cpp $(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) monolib_fswatcher.o: $(srcdir)/src/msw/fswatcher.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/fswatcher.cpp $(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 $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/wince/time.cpp
monolib_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(MONOLIB_ODEP) 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) basedll_textfile.o: $(srcdir)/src/common/textfile.cpp $(BASEDLL_ODEP)
$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/textfile.cpp $(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) basedll_timercmn.o: $(srcdir)/src/common/timercmn.cpp $(BASEDLL_ODEP)
$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/timercmn.cpp $(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) basedll_fswatcher.o: $(srcdir)/src/msw/fswatcher.cpp $(BASEDLL_ODEP)
$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/fswatcher.cpp $(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 $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/wince/time.cpp
basedll_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(BASEDLL_ODEP) 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) baselib_textfile.o: $(srcdir)/src/common/textfile.cpp $(BASELIB_ODEP)
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/textfile.cpp $(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) baselib_timercmn.o: $(srcdir)/src/common/timercmn.cpp $(BASELIB_ODEP)
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/timercmn.cpp $(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) baselib_fswatcher.o: $(srcdir)/src/msw/fswatcher.cpp $(BASELIB_ODEP)
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/fswatcher.cpp $(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 $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/wince/time.cpp
baselib_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(BASELIB_ODEP) baselib_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(BASELIB_ODEP)

2
build/bakefiles/files.bkl
View File

@@ -382,6 +382,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/common/tarstrm.cpp src/common/tarstrm.cpp
src/common/textbuf.cpp src/common/textbuf.cpp
src/common/textfile.cpp src/common/textfile.cpp
src/common/time.cpp
src/common/timercmn.cpp src/common/timercmn.cpp
src/common/timerimpl.cpp src/common/timerimpl.cpp
src/common/tokenzr.cpp src/common/tokenzr.cpp
@@ -527,6 +528,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/textfile.h wx/textfile.h
wx/thread.h wx/thread.h
wx/thrimpl.cpp wx/thrimpl.cpp
wx/time.h
wx/timer.h wx/timer.h
wx/tls.h wx/tls.h
wx/tokenzr.h wx/tokenzr.h

1496
build/msw/makefile.bcc
View File

File diff suppressed because it is too large Load Diff

1496
build/msw/makefile.gcc
View File

File diff suppressed because it is too large Load Diff

1496
build/msw/makefile.vc
View File

File diff suppressed because it is too large Load Diff

1496
build/msw/makefile.wat
View File

File diff suppressed because it is too large Load Diff

272
build/msw/wx_adv.dsp
View File

@@ -272,22 +272,22 @@ SOURCE=..\..\src\common\gridcmn.cpp
SOURCE=..\..\src\common\hyperlnkcmn.cpp SOURCE=..\..\src\common\hyperlnkcmn.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\common\odcombocmn.cpp SOURCE=..\..\src\common\odcombocmn.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\common\richtooltipcmn.cpp SOURCE=..\..\src\common\richtooltipcmn.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\common\taskbarcmn.cpp SOURCE=..\..\src\common\taskbarcmn.cpp
# End Source File # End Source File
# End Group # End Group
# Begin Group "MSW Sources" # Begin Group "MSW Sources"
# PROP Default_Filter "" # PROP Default_Filter ""
# Begin Source File # Begin Source File
SOURCE=..\..\src\msw\aboutdlg.cpp SOURCE=..\..\src\msw\aboutdlg.cpp
@@ -463,12 +463,12 @@ SOURCE=..\..\src\msw\datectrl.cpp
!ELSEIF "$(CFG)" == "adv - Win32 Debug" !ELSEIF "$(CFG)" == "adv - Win32 Debug"
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\msw\datetimectrl.cpp SOURCE=..\..\src\msw\datetimectrl.cpp
!IF "$(CFG)" == "adv - Win32 DLL Universal Release" !IF "$(CFG)" == "adv - Win32 DLL Universal Release"
@@ -504,12 +504,12 @@ SOURCE=..\..\src\msw\datetimectrl.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\msw\hyperlink.cpp SOURCE=..\..\src\msw\hyperlink.cpp
!IF "$(CFG)" == "adv - Win32 DLL Universal Release" !IF "$(CFG)" == "adv - Win32 DLL Universal Release"
# PROP Exclude_From_Build 1 # PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug" !ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug"
# PROP Exclude_From_Build 1 # PROP Exclude_From_Build 1
@@ -541,24 +541,24 @@ SOURCE=..\..\src\msw\hyperlink.cpp
SOURCE=..\..\src\msw\joystick.cpp SOURCE=..\..\src\msw\joystick.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\msw\notifmsg.cpp SOURCE=..\..\src\msw\notifmsg.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\msw\richtooltip.cpp SOURCE=..\..\src\msw\richtooltip.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\msw\sound.cpp SOURCE=..\..\src\msw\sound.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\msw\taskbar.cpp SOURCE=..\..\src\msw\taskbar.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\msw\timectrl.cpp SOURCE=..\..\src\msw\timectrl.cpp
!IF "$(CFG)" == "adv - Win32 DLL Universal Release" !IF "$(CFG)" == "adv - Win32 DLL Universal Release"
@@ -594,12 +594,12 @@ SOURCE=..\..\src\msw\timectrl.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\msw\version.rc SOURCE=..\..\src\msw\version.rc
!IF "$(CFG)" == "adv - Win32 DLL Universal Release" !IF "$(CFG)" == "adv - Win32 DLL Universal Release"
!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug" !ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug"
!ELSEIF "$(CFG)" == "adv - Win32 DLL Release" !ELSEIF "$(CFG)" == "adv - Win32 DLL Release"
@@ -703,34 +703,34 @@ SOURCE=..\..\src\generic\notifmsgg.cpp
SOURCE=..\..\src\generic\odcombo.cpp SOURCE=..\..\src\generic\odcombo.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\generic\propdlg.cpp SOURCE=..\..\src\generic\propdlg.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\generic\richtooltip.cpp SOURCE=..\..\src\generic\richtooltip.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\generic\sashwin.cpp SOURCE=..\..\src\generic\sashwin.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\generic\splash.cpp SOURCE=..\..\src\generic\splash.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\generic\timectrl.cpp SOURCE=..\..\src\generic\timectrl.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\generic\tipdlg.cpp SOURCE=..\..\src\generic\tipdlg.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\generic\treelist.cpp SOURCE=..\..\src\generic\treelist.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\generic\wizard.cpp SOURCE=..\..\src\generic\wizard.cpp
@@ -897,22 +897,22 @@ SOURCE=..\..\include\wx\msw\calctrl.h
SOURCE=..\..\include\wx\msw\commandlinkbutton.h SOURCE=..\..\include\wx\msw\commandlinkbutton.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\msw\datectrl.h SOURCE=..\..\include\wx\msw\datectrl.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\msw\datetimectrl.h SOURCE=..\..\include\wx\msw\datetimectrl.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\msw\genrcdefs.h SOURCE=..\..\include\wx\msw\genrcdefs.h
!IF "$(CFG)" == "adv - Win32 DLL Universal Release" !IF "$(CFG)" == "adv - Win32 DLL Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
InputPath=..\..\include\wx\msw\genrcdefs.h InputPath=..\..\include\wx\msw\genrcdefs.h
"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw" "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw"
cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
@@ -1006,22 +1006,22 @@ SOURCE=..\..\include\wx\msw\notifmsg.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\msw\sound.h SOURCE=..\..\include\wx\msw\sound.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\msw\taskbar.h SOURCE=..\..\include\wx\msw\taskbar.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\msw\timectrl.h SOURCE=..\..\include\wx\msw\timectrl.h
# End Source File # End Source File
# End Group # End Group
# Begin Group "Generic Headers" # Begin Group "Generic Headers"
# PROP Default_Filter "" # PROP Default_Filter ""
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\generic\aboutdlgg.h SOURCE=..\..\include\wx\generic\aboutdlgg.h
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1092,22 +1092,22 @@ SOURCE=..\..\include\wx\generic\propdlg.h
SOURCE=..\..\include\wx\generic\sashwin.h SOURCE=..\..\include\wx\generic\sashwin.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\generic\splash.h SOURCE=..\..\include\wx\generic\splash.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\generic\timectrl.h SOURCE=..\..\include\wx\generic\timectrl.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\generic\wizard.h SOURCE=..\..\include\wx\generic\wizard.h
# End Source File # End Source File
# End Group # End Group
# Begin Group "Common Headers" # Begin Group "Common Headers"
# PROP Default_Filter "" # PROP Default_Filter ""
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\aboutdlg.h SOURCE=..\..\include\wx\aboutdlg.h
@@ -1140,22 +1140,22 @@ SOURCE=..\..\include\wx\dataview.h
SOURCE=..\..\include\wx\datectrl.h SOURCE=..\..\include\wx\datectrl.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\dateevt.h SOURCE=..\..\include\wx\dateevt.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\datetimectrl.h SOURCE=..\..\include\wx\datetimectrl.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\dcbuffer.h SOURCE=..\..\include\wx\dcbuffer.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\dvrenderers.h SOURCE=..\..\include\wx\dvrenderers.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\editlbox.h SOURCE=..\..\include\wx\editlbox.h
@@ -1184,42 +1184,42 @@ SOURCE=..\..\include\wx\notifmsg.h
SOURCE=..\..\include\wx\odcombo.h SOURCE=..\..\include\wx\odcombo.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\propdlg.h SOURCE=..\..\include\wx\propdlg.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\richtooltip.h SOURCE=..\..\include\wx\richtooltip.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\sashwin.h SOURCE=..\..\include\wx\sashwin.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\sound.h SOURCE=..\..\include\wx\sound.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\splash.h SOURCE=..\..\include\wx\splash.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\taskbar.h SOURCE=..\..\include\wx\taskbar.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\timectrl.h SOURCE=..\..\include\wx\timectrl.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\tipdlg.h SOURCE=..\..\include\wx\tipdlg.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\treelist.h SOURCE=..\..\include\wx\treelist.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\wizard.h SOURCE=..\..\include\wx\wizard.h

32
build/msw/wx_base.dsp
View File

@@ -531,6 +531,10 @@ SOURCE=..\..\src\common\textfile.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\common\time.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\timercmn.cpp SOURCE=..\..\src\common\timercmn.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1225,22 +1229,22 @@ SOURCE=..\..\include\wx\dynload.h
SOURCE=..\..\include\wx\encconv.h SOURCE=..\..\include\wx\encconv.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\event.h SOURCE=..\..\include\wx\event.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\eventfilter.h SOURCE=..\..\include\wx\eventfilter.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\evtloop.h SOURCE=..\..\include\wx\evtloop.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\except.h SOURCE=..\..\include\wx\except.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\features.h SOURCE=..\..\include\wx\features.h
@@ -1563,6 +1567,10 @@ SOURCE=..\..\include\wx\thread.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\time.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\timer.h SOURCE=..\..\include\wx\timer.h
# End Source File # End Source File
# Begin Source File # Begin Source File

312
build/msw/wx_core.dsp
View File

@@ -2028,22 +2028,22 @@ SOURCE=..\..\src\msw\nativewin.cpp
!ELSEIF "$(CFG)" == "core - Win32 Debug" !ELSEIF "$(CFG)" == "core - Win32 Debug"
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\msw\nonownedwnd.cpp SOURCE=..\..\src\msw\nonownedwnd.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\msw\notebook.cpp SOURCE=..\..\src\msw\notebook.cpp
!IF "$(CFG)" == "core - Win32 DLL Universal Release" !IF "$(CFG)" == "core - Win32 DLL Universal Release"
# PROP Exclude_From_Build 1 # PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
# PROP Exclude_From_Build 1 # PROP Exclude_From_Build 1
@@ -5003,42 +5003,42 @@ SOURCE=..\..\include\wx\msw\control.h
SOURCE=..\..\include\wx\msw\ctrlsub.h SOURCE=..\..\include\wx\msw\ctrlsub.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\msw\cursor.h SOURCE=..\..\include\wx\msw\cursor.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\msw\custombgwin.h SOURCE=..\..\include\wx\msw\custombgwin.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\msw\ole\dataform.h SOURCE=..\..\include\wx\msw\ole\dataform.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\msw\ole\dataobj.h SOURCE=..\..\include\wx\msw\ole\dataobj.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\msw\ole\dataobj2.h SOURCE=..\..\include\wx\msw\ole\dataobj2.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\msw\datectrl.h SOURCE=..\..\include\wx\msw\datectrl.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\msw\datetimectrl.h SOURCE=..\..\include\wx\msw\datetimectrl.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\msw\dc.h SOURCE=..\..\include\wx\msw\dc.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\msw\dcclient.h SOURCE=..\..\include\wx\msw\dcclient.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\msw\dcmemory.h SOURCE=..\..\include\wx\msw\dcmemory.h
@@ -5278,22 +5278,22 @@ SOURCE=..\..\include\wx\msw\missing.h
SOURCE=..\..\include\wx\msw\msgdlg.h SOURCE=..\..\include\wx\msw\msgdlg.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\msw\msvcrt.h SOURCE=..\..\include\wx\msw\msvcrt.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\msw\nonownedwnd.h SOURCE=..\..\include\wx\msw\nonownedwnd.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\msw\notebook.h SOURCE=..\..\include\wx\msw\notebook.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\msw\notifmsg.h SOURCE=..\..\include\wx\msw\notifmsg.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\msw\ole\oleutils.h SOURCE=..\..\include\wx\msw\ole\oleutils.h
@@ -5406,22 +5406,22 @@ SOURCE=..\..\include\wx\msw\textctrl.h
SOURCE=..\..\include\wx\msw\textentry.h SOURCE=..\..\include\wx\msw\textentry.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\msw\tglbtn.h SOURCE=..\..\include\wx\msw\tglbtn.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\msw\timectrl.h SOURCE=..\..\include\wx\msw\timectrl.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\msw\toolbar.h SOURCE=..\..\include\wx\msw\toolbar.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\msw\tooltip.h SOURCE=..\..\include\wx\msw\tooltip.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\msw\toplevel.h SOURCE=..\..\include\wx\msw\toplevel.h
@@ -5506,22 +5506,22 @@ SOURCE=..\..\include\wx\generic\colrdlgg.h
SOURCE=..\..\include\wx\generic\combo.h SOURCE=..\..\include\wx\generic\combo.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\generic\ctrlsub.h SOURCE=..\..\include\wx\generic\ctrlsub.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\generic\custombgwin.h SOURCE=..\..\include\wx\generic\custombgwin.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\generic\dataview.h SOURCE=..\..\include\wx\generic\dataview.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\generic\datectrl.h SOURCE=..\..\include\wx\generic\datectrl.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\generic\dcpsg.h SOURCE=..\..\include\wx\generic\dcpsg.h
@@ -5694,22 +5694,22 @@ SOURCE=..\..\include\wx\generic\stattextg.h
SOURCE=..\..\include\wx\generic\statusbr.h SOURCE=..\..\include\wx\generic\statusbr.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\generic\textdlgg.h SOURCE=..\..\include\wx\generic\textdlgg.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\generic\timectrl.h SOURCE=..\..\include\wx\generic\timectrl.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\generic\treectlg.h SOURCE=..\..\include\wx\generic\treectlg.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\generic\wizard.h SOURCE=..\..\include\wx\generic\wizard.h
# End Source File # End Source File
# End Group # End Group
# Begin Group "wxUniv Headers" # Begin Group "wxUniv Headers"
@@ -5754,22 +5754,22 @@ SOURCE=..\..\include\wx\univ\colschem.h
SOURCE=..\..\include\wx\univ\combobox.h SOURCE=..\..\include\wx\univ\combobox.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\univ\control.h SOURCE=..\..\include\wx\univ\control.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\univ\custombgwin.h SOURCE=..\..\include\wx\univ\custombgwin.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\univ\dialog.h SOURCE=..\..\include\wx\univ\dialog.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\univ\frame.h SOURCE=..\..\include\wx\univ\frame.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\univ\gauge.h SOURCE=..\..\include\wx\univ\gauge.h
@@ -6162,42 +6162,42 @@ SOURCE=..\..\include\wx\cshelp.h
SOURCE=..\..\include\wx\ctrlsub.h SOURCE=..\..\include\wx\ctrlsub.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\cursor.h SOURCE=..\..\include\wx\cursor.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\custombgwin.h SOURCE=..\..\include\wx\custombgwin.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\dataobj.h SOURCE=..\..\include\wx\dataobj.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\dataview.h SOURCE=..\..\include\wx\dataview.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\datectrl.h SOURCE=..\..\include\wx\datectrl.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\dateevt.h SOURCE=..\..\include\wx\dateevt.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\datetimectrl.h SOURCE=..\..\include\wx\datetimectrl.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\dc.h SOURCE=..\..\include\wx\dc.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\dcbuffer.h SOURCE=..\..\include\wx\dcbuffer.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\dcclient.h SOURCE=..\..\include\wx\dcclient.h
@@ -6798,22 +6798,22 @@ SOURCE=..\..\include\wx\richtext\richtextsymboldlg.h
SOURCE=..\..\include\wx\richtext\richtextuicustomization.h SOURCE=..\..\include\wx\richtext\richtextuicustomization.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\richtext\richtextxml.h SOURCE=..\..\include\wx\richtext\richtextxml.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\richtooltip.h SOURCE=..\..\include\wx\richtooltip.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\sashwin.h SOURCE=..\..\include\wx\sashwin.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\scopeguard.h SOURCE=..\..\include\wx\scopeguard.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\scrolbar.h SOURCE=..\..\include\wx\scrolbar.h
@@ -6922,22 +6922,22 @@ SOURCE=..\..\include\wx\textentry.h
SOURCE=..\..\include\wx\textwrapper.h SOURCE=..\..\include\wx\textwrapper.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\tglbtn.h SOURCE=..\..\include\wx\tglbtn.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\timectrl.h SOURCE=..\..\include\wx\timectrl.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\tipdlg.h SOURCE=..\..\include\wx\tipdlg.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\tipwin.h SOURCE=..\..\include\wx\tipwin.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\ribbon\toolbar.h SOURCE=..\..\include\wx\ribbon\toolbar.h
@@ -7278,22 +7278,22 @@ SOURCE=..\..\include\wx\xrc\xh_sttxt.h
SOURCE=..\..\include\wx\xrc\xh_text.h SOURCE=..\..\include\wx\xrc\xh_text.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\xrc\xh_tglbtn.h SOURCE=..\..\include\wx\xrc\xh_tglbtn.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\xrc\xh_timectrl.h SOURCE=..\..\include\wx\xrc\xh_timectrl.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\xrc\xh_toolb.h SOURCE=..\..\include\wx\xrc\xh_toolb.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\xrc\xh_toolbk.h SOURCE=..\..\include\wx\xrc\xh_toolbk.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\xrc\xh_tree.h SOURCE=..\..\include\wx\xrc\xh_tree.h

264
build/msw/wx_vc7_adv.vcproj
View File

@@ -595,21 +595,21 @@
RelativePath="..\..\src\common\gridcmn.cpp"> RelativePath="..\..\src\common\gridcmn.cpp">
</File> </File>
<File <File
RelativePath="..\..\src\common\hyperlnkcmn.cpp"> RelativePath="..\..\src\common\hyperlnkcmn.cpp">
</File> </File>
<File <File
RelativePath="..\..\src\common\odcombocmn.cpp"> RelativePath="..\..\src\common\odcombocmn.cpp">
</File> </File>
<File <File
RelativePath="..\..\src\common\richtooltipcmn.cpp"> RelativePath="..\..\src\common\richtooltipcmn.cpp">
</File> </File>
<File <File
RelativePath="..\..\src\common\taskbarcmn.cpp"> RelativePath="..\..\src\common\taskbarcmn.cpp">
</File> </File>
</Filter> </Filter>
<Filter <Filter
Name="MSW Sources" Name="MSW Sources"
UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}"> UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}">
<File <File
RelativePath="..\..\src\msw\aboutdlg.cpp"> RelativePath="..\..\src\msw\aboutdlg.cpp">
</File> </File>
@@ -683,12 +683,12 @@
ExcludedFromBuild="TRUE"/> ExcludedFromBuild="TRUE"/>
<FileConfiguration <FileConfiguration
Name="DLL Universal Debug|Win32" Name="DLL Universal Debug|Win32"
ExcludedFromBuild="TRUE"/> ExcludedFromBuild="TRUE"/>
<FileConfiguration <FileConfiguration
Name="DLL Universal Release|Win32" Name="DLL Universal Release|Win32"
ExcludedFromBuild="TRUE"/> ExcludedFromBuild="TRUE"/>
</File> </File>
<File <File
RelativePath="..\..\src\msw\datetimectrl.cpp"> RelativePath="..\..\src\msw\datetimectrl.cpp">
<FileConfiguration <FileConfiguration
Name="Universal Debug|Win32" Name="Universal Debug|Win32"
@@ -704,12 +704,12 @@
ExcludedFromBuild="TRUE"/> ExcludedFromBuild="TRUE"/>
</File> </File>
<File <File
RelativePath="..\..\src\msw\hyperlink.cpp"> RelativePath="..\..\src\msw\hyperlink.cpp">
<FileConfiguration <FileConfiguration
Name="Universal Debug|Win32" Name="Universal Debug|Win32"
ExcludedFromBuild="TRUE"/> ExcludedFromBuild="TRUE"/>
<FileConfiguration <FileConfiguration
Name="Universal Release|Win32" Name="Universal Release|Win32"
ExcludedFromBuild="TRUE"/> ExcludedFromBuild="TRUE"/>
<FileConfiguration <FileConfiguration
Name="DLL Universal Debug|Win32" Name="DLL Universal Debug|Win32"
@@ -719,12 +719,12 @@
ExcludedFromBuild="TRUE"/> ExcludedFromBuild="TRUE"/>
</File> </File>
<File <File
RelativePath="..\..\src\msw\joystick.cpp"> RelativePath="..\..\src\msw\joystick.cpp">
</File> </File>
<File <File
RelativePath="..\..\src\msw\notifmsg.cpp"> RelativePath="..\..\src\msw\notifmsg.cpp">
</File> </File>
<File <File
RelativePath="..\..\src\msw\richtooltip.cpp"> RelativePath="..\..\src\msw\richtooltip.cpp">
<FileConfiguration <FileConfiguration
Name="Debug|Win32"> Name="Debug|Win32">
@@ -776,12 +776,12 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\msw\sound.cpp"> RelativePath="..\..\src\msw\sound.cpp">
</File> </File>
<File <File
RelativePath="..\..\src\msw\taskbar.cpp"> RelativePath="..\..\src\msw\taskbar.cpp">
</File> </File>
<File <File
RelativePath="..\..\src\msw\timectrl.cpp"> RelativePath="..\..\src\msw\timectrl.cpp">
<FileConfiguration <FileConfiguration
Name="Debug|Win32"> Name="Debug|Win32">
@@ -821,12 +821,12 @@
ExcludedFromBuild="TRUE"/> ExcludedFromBuild="TRUE"/>
</File> </File>
<File <File
RelativePath="..\..\src\msw\version.rc"> RelativePath="..\..\src\msw\version.rc">
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Debug|Win32"
ExcludedFromBuild="TRUE"/> ExcludedFromBuild="TRUE"/>
<FileConfiguration <FileConfiguration
Name="Release|Win32" Name="Release|Win32"
ExcludedFromBuild="TRUE"/> ExcludedFromBuild="TRUE"/>
<FileConfiguration <FileConfiguration
Name="Universal Debug|Win32" Name="Universal Debug|Win32"
@@ -891,12 +891,12 @@
RelativePath="..\..\src\generic\notifmsgg.cpp"> RelativePath="..\..\src\generic\notifmsgg.cpp">
</File> </File>
<File <File
RelativePath="..\..\src\generic\odcombo.cpp"> RelativePath="..\..\src\generic\odcombo.cpp">
</File> </File>
<File <File
RelativePath="..\..\src\generic\propdlg.cpp"> RelativePath="..\..\src\generic\propdlg.cpp">
</File> </File>
<File <File
RelativePath="..\..\src\generic\richtooltip.cpp"> RelativePath="..\..\src\generic\richtooltip.cpp">
<FileConfiguration <FileConfiguration
Name="Debug|Win32"> Name="Debug|Win32">
@@ -948,12 +948,12 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\generic\sashwin.cpp"> RelativePath="..\..\src\generic\sashwin.cpp">
</File> </File>
<File <File
RelativePath="..\..\src\generic\splash.cpp"> RelativePath="..\..\src\generic\splash.cpp">
</File> </File>
<File <File
RelativePath="..\..\src\generic\timectrl.cpp"> RelativePath="..\..\src\generic\timectrl.cpp">
<FileConfiguration <FileConfiguration
Name="Debug|Win32"> Name="Debug|Win32">
@@ -1005,12 +1005,12 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\generic\tipdlg.cpp"> RelativePath="..\..\src\generic\tipdlg.cpp">
</File> </File>
<File <File
RelativePath="..\..\src\generic\treelist.cpp"> RelativePath="..\..\src\generic\treelist.cpp">
</File> </File>
<File <File
RelativePath="..\..\src\generic\wizard.cpp"> RelativePath="..\..\src\generic\wizard.cpp">
</File> </File>
</Filter> </Filter>
@@ -1114,21 +1114,21 @@
RelativePath="..\..\include\wx\msw\calctrl.h"> RelativePath="..\..\include\wx\msw\calctrl.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\commandlinkbutton.h"> RelativePath="..\..\include\wx\msw\commandlinkbutton.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\datectrl.h"> RelativePath="..\..\include\wx\msw\datectrl.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\datetimectrl.h"> RelativePath="..\..\include\wx\msw\datetimectrl.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\genrcdefs.h"> RelativePath="..\..\include\wx\msw\genrcdefs.h">
<FileConfiguration <FileConfiguration
Name="Debug|Win32"> Name="Debug|Win32">
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;" CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"
Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"/> AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"/>
@@ -1206,21 +1206,21 @@
<File <File
RelativePath="..\..\include\wx\msw\notifmsg.h"> RelativePath="..\..\include\wx\msw\notifmsg.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\sound.h"> RelativePath="..\..\include\wx\msw\sound.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\taskbar.h"> RelativePath="..\..\include\wx\msw\taskbar.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\timectrl.h"> RelativePath="..\..\include\wx\msw\timectrl.h">
</File> </File>
</Filter> </Filter>
<Filter <Filter
Name="Generic Headers" Name="Generic Headers"
UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}"> UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}">
<File <File
RelativePath="..\..\include\wx\generic\aboutdlgg.h"> RelativePath="..\..\include\wx\generic\aboutdlgg.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\animate.h"> RelativePath="..\..\include\wx\generic\animate.h">
@@ -1271,21 +1271,21 @@
RelativePath="..\..\include\wx\generic\propdlg.h"> RelativePath="..\..\include\wx\generic\propdlg.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\sashwin.h"> RelativePath="..\..\include\wx\generic\sashwin.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\splash.h"> RelativePath="..\..\include\wx\generic\splash.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\timectrl.h"> RelativePath="..\..\include\wx\generic\timectrl.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\wizard.h"> RelativePath="..\..\include\wx\generic\wizard.h">
</File> </File>
</Filter> </Filter>
<Filter <Filter
Name="Common Headers" Name="Common Headers"
UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}"> UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}">
<File <File
RelativePath="..\..\include\wx\aboutdlg.h"> RelativePath="..\..\include\wx\aboutdlg.h">
</File> </File>
@@ -1308,21 +1308,21 @@
RelativePath="..\..\include\wx\dataview.h"> RelativePath="..\..\include\wx\dataview.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\datectrl.h"> RelativePath="..\..\include\wx\datectrl.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\dateevt.h"> RelativePath="..\..\include\wx\dateevt.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\datetimectrl.h"> RelativePath="..\..\include\wx\datetimectrl.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\dcbuffer.h"> RelativePath="..\..\include\wx\dcbuffer.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\dvrenderers.h"> RelativePath="..\..\include\wx\dvrenderers.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\editlbox.h"> RelativePath="..\..\include\wx\editlbox.h">
</File> </File>
<File <File
@@ -1341,36 +1341,36 @@
RelativePath="..\..\include\wx\notifmsg.h"> RelativePath="..\..\include\wx\notifmsg.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\odcombo.h"> RelativePath="..\..\include\wx\odcombo.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\propdlg.h"> RelativePath="..\..\include\wx\propdlg.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\richtooltip.h"> RelativePath="..\..\include\wx\richtooltip.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\sashwin.h"> RelativePath="..\..\include\wx\sashwin.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\sound.h"> RelativePath="..\..\include\wx\sound.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\splash.h"> RelativePath="..\..\include\wx\splash.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\taskbar.h"> RelativePath="..\..\include\wx\taskbar.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\timectrl.h"> RelativePath="..\..\include\wx\timectrl.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\tipdlg.h"> RelativePath="..\..\include\wx\tipdlg.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\treelist.h"> RelativePath="..\..\include\wx\treelist.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\wizard.h"> RelativePath="..\..\include\wx\wizard.h">
</File> </File>
</Filter> </Filter>

30
build/msw/wx_vc7_base.vcproj
View File

@@ -838,6 +838,9 @@
RelativePath="..\..\src\common\textfile.cpp"> RelativePath="..\..\src\common\textfile.cpp">
</File> </File>
<File <File
RelativePath="..\..\src\common\time.cpp">
</File>
<File
RelativePath="..\..\src\common\timercmn.cpp"> RelativePath="..\..\src\common\timercmn.cpp">
</File> </File>
<File <File
@@ -1342,21 +1345,21 @@
RelativePath="..\..\include\wx\dynload.h"> RelativePath="..\..\include\wx\dynload.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\encconv.h"> RelativePath="..\..\include\wx\encconv.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\event.h"> RelativePath="..\..\include\wx\event.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\eventfilter.h"> RelativePath="..\..\include\wx\eventfilter.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\evtloop.h"> RelativePath="..\..\include\wx\evtloop.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\except.h"> RelativePath="..\..\include\wx\except.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\features.h"> RelativePath="..\..\include\wx\features.h">
</File> </File>
<File <File
@@ -1597,6 +1600,9 @@
RelativePath="..\..\include\wx\thread.h"> RelativePath="..\..\include\wx\thread.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\time.h">
</File>
<File
RelativePath="..\..\include\wx\timer.h"> RelativePath="..\..\include\wx\timer.h">
</File> </File>
<File <File

312
build/msw/wx_vc7_core.vcproj
View File

@@ -1889,21 +1889,21 @@
ExcludedFromBuild="TRUE"/> ExcludedFromBuild="TRUE"/>
<FileConfiguration <FileConfiguration
Name="DLL Universal Debug|Win32" Name="DLL Universal Debug|Win32"
ExcludedFromBuild="TRUE"/> ExcludedFromBuild="TRUE"/>
<FileConfiguration <FileConfiguration
Name="DLL Universal Release|Win32" Name="DLL Universal Release|Win32"
ExcludedFromBuild="TRUE"/> ExcludedFromBuild="TRUE"/>
</File> </File>
<File <File
RelativePath="..\..\src\msw\nonownedwnd.cpp"> RelativePath="..\..\src\msw\nonownedwnd.cpp">
</File> </File>
<File <File
RelativePath="..\..\src\msw\notebook.cpp"> RelativePath="..\..\src\msw\notebook.cpp">
<FileConfiguration <FileConfiguration
Name="Debug|Win32"> Name="Debug|Win32">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
ObjectFile="vc_mswud\core\msw_notebook.obj"/> ObjectFile="vc_mswud\core\msw_notebook.obj"/>
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release|Win32"> Name="Release|Win32">
@@ -4313,36 +4313,36 @@
RelativePath="..\..\include\wx\msw\control.h"> RelativePath="..\..\include\wx\msw\control.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\ctrlsub.h"> RelativePath="..\..\include\wx\msw\ctrlsub.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\cursor.h"> RelativePath="..\..\include\wx\msw\cursor.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\custombgwin.h"> RelativePath="..\..\include\wx\msw\custombgwin.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\ole\dataform.h"> RelativePath="..\..\include\wx\msw\ole\dataform.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\ole\dataobj.h"> RelativePath="..\..\include\wx\msw\ole\dataobj.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\ole\dataobj2.h"> RelativePath="..\..\include\wx\msw\ole\dataobj2.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\datectrl.h"> RelativePath="..\..\include\wx\msw\datectrl.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\datetimectrl.h"> RelativePath="..\..\include\wx\msw\datetimectrl.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\dc.h"> RelativePath="..\..\include\wx\msw\dc.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\dcclient.h"> RelativePath="..\..\include\wx\msw\dcclient.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\dcmemory.h"> RelativePath="..\..\include\wx\msw\dcmemory.h">
</File> </File>
<File <File
@@ -4529,21 +4529,21 @@
RelativePath="..\..\include\wx\msw\missing.h"> RelativePath="..\..\include\wx\msw\missing.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\msgdlg.h"> RelativePath="..\..\include\wx\msw\msgdlg.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\msvcrt.h"> RelativePath="..\..\include\wx\msw\msvcrt.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\nonownedwnd.h"> RelativePath="..\..\include\wx\msw\nonownedwnd.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\notebook.h"> RelativePath="..\..\include\wx\msw\notebook.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\notifmsg.h"> RelativePath="..\..\include\wx\msw\notifmsg.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\ole\oleutils.h"> RelativePath="..\..\include\wx\msw\ole\oleutils.h">
</File> </File>
<File <File
@@ -4625,21 +4625,21 @@
RelativePath="..\..\include\wx\msw\textctrl.h"> RelativePath="..\..\include\wx\msw\textctrl.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\textentry.h"> RelativePath="..\..\include\wx\msw\textentry.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\tglbtn.h"> RelativePath="..\..\include\wx\msw\tglbtn.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\timectrl.h"> RelativePath="..\..\include\wx\msw\timectrl.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\toolbar.h"> RelativePath="..\..\include\wx\msw\toolbar.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\tooltip.h"> RelativePath="..\..\include\wx\msw\tooltip.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\toplevel.h"> RelativePath="..\..\include\wx\msw\toplevel.h">
</File> </File>
<File <File
@@ -4701,21 +4701,21 @@
RelativePath="..\..\include\wx\generic\colrdlgg.h"> RelativePath="..\..\include\wx\generic\colrdlgg.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\combo.h"> RelativePath="..\..\include\wx\generic\combo.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\ctrlsub.h"> RelativePath="..\..\include\wx\generic\ctrlsub.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\custombgwin.h"> RelativePath="..\..\include\wx\generic\custombgwin.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\dataview.h"> RelativePath="..\..\include\wx\generic\dataview.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\datectrl.h"> RelativePath="..\..\include\wx\generic\datectrl.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\dcpsg.h"> RelativePath="..\..\include\wx\generic\dcpsg.h">
</File> </File>
<File <File
@@ -4842,21 +4842,21 @@
RelativePath="..\..\include\wx\generic\stattextg.h"> RelativePath="..\..\include\wx\generic\stattextg.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\statusbr.h"> RelativePath="..\..\include\wx\generic\statusbr.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\textdlgg.h"> RelativePath="..\..\include\wx\generic\textdlgg.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\timectrl.h"> RelativePath="..\..\include\wx\generic\timectrl.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\treectlg.h"> RelativePath="..\..\include\wx\generic\treectlg.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\wizard.h"> RelativePath="..\..\include\wx\generic\wizard.h">
</File> </File>
</Filter> </Filter>
<Filter <Filter
Name="wxUniv Headers" Name="wxUniv Headers"
UniqueIdentifier="{46168D7C-2783-50F3-AE9D-A740D5FF0B44}"> UniqueIdentifier="{46168D7C-2783-50F3-AE9D-A740D5FF0B44}">
@@ -4888,21 +4888,21 @@
RelativePath="..\..\include\wx\univ\colschem.h"> RelativePath="..\..\include\wx\univ\colschem.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\univ\combobox.h"> RelativePath="..\..\include\wx\univ\combobox.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\univ\control.h"> RelativePath="..\..\include\wx\univ\control.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\univ\custombgwin.h"> RelativePath="..\..\include\wx\univ\custombgwin.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\univ\dialog.h"> RelativePath="..\..\include\wx\univ\dialog.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\univ\frame.h"> RelativePath="..\..\include\wx\univ\frame.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\univ\gauge.h"> RelativePath="..\..\include\wx\univ\gauge.h">
</File> </File>
<File <File
@@ -5196,36 +5196,36 @@
RelativePath="..\..\include\wx\cshelp.h"> RelativePath="..\..\include\wx\cshelp.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\ctrlsub.h"> RelativePath="..\..\include\wx\ctrlsub.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\cursor.h"> RelativePath="..\..\include\wx\cursor.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\custombgwin.h"> RelativePath="..\..\include\wx\custombgwin.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\dataobj.h"> RelativePath="..\..\include\wx\dataobj.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\dataview.h"> RelativePath="..\..\include\wx\dataview.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\datectrl.h"> RelativePath="..\..\include\wx\datectrl.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\dateevt.h"> RelativePath="..\..\include\wx\dateevt.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\datetimectrl.h"> RelativePath="..\..\include\wx\datetimectrl.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\dc.h"> RelativePath="..\..\include\wx\dc.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\dcbuffer.h"> RelativePath="..\..\include\wx\dcbuffer.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\dcclient.h"> RelativePath="..\..\include\wx\dcclient.h">
</File> </File>
<File <File
@@ -5673,21 +5673,21 @@
RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h"> RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\richtext\richtextuicustomization.h"> RelativePath="..\..\include\wx\richtext\richtextuicustomization.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\richtext\richtextxml.h"> RelativePath="..\..\include\wx\richtext\richtextxml.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\richtooltip.h"> RelativePath="..\..\include\wx\richtooltip.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\sashwin.h"> RelativePath="..\..\include\wx\sashwin.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\scopeguard.h"> RelativePath="..\..\include\wx\scopeguard.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\scrolbar.h"> RelativePath="..\..\include\wx\scrolbar.h">
</File> </File>
<File <File
@@ -5766,21 +5766,21 @@
RelativePath="..\..\include\wx\textentry.h"> RelativePath="..\..\include\wx\textentry.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\textwrapper.h"> RelativePath="..\..\include\wx\textwrapper.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\tglbtn.h"> RelativePath="..\..\include\wx\tglbtn.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\timectrl.h"> RelativePath="..\..\include\wx\timectrl.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\tipdlg.h"> RelativePath="..\..\include\wx\tipdlg.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\tipwin.h"> RelativePath="..\..\include\wx\tipwin.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\ribbon\toolbar.h"> RelativePath="..\..\include\wx\ribbon\toolbar.h">
</File> </File>
<File <File
@@ -6033,21 +6033,21 @@
RelativePath="..\..\include\wx\xrc\xh_sttxt.h"> RelativePath="..\..\include\wx\xrc\xh_sttxt.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_text.h"> RelativePath="..\..\include\wx\xrc\xh_text.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"> RelativePath="..\..\include\wx\xrc\xh_tglbtn.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_timectrl.h"> RelativePath="..\..\include\wx\xrc\xh_timectrl.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_toolb.h"> RelativePath="..\..\include\wx\xrc\xh_toolb.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_toolbk.h"> RelativePath="..\..\include\wx\xrc\xh_toolbk.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_tree.h"> RelativePath="..\..\include\wx\xrc\xh_tree.h">
</File> </File>
<File <File

48
build/msw/wx_vc7_xrc.vcproj
View File

@@ -934,21 +934,21 @@
RelativePath="..\..\include\wx\xrc\xh_sttxt.h"> RelativePath="..\..\include\wx\xrc\xh_sttxt.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_text.h"> RelativePath="..\..\include\wx\xrc\xh_text.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"> RelativePath="..\..\include\wx\xrc\xh_tglbtn.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_timectrl.h"> RelativePath="..\..\include\wx\xrc\xh_timectrl.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_toolb.h"> RelativePath="..\..\include\wx\xrc\xh_toolb.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_toolbk.h"> RelativePath="..\..\include\wx\xrc\xh_toolbk.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_tree.h"> RelativePath="..\..\include\wx\xrc\xh_tree.h">
</File> </File>
<File <File
@@ -1128,21 +1128,21 @@
RelativePath="..\..\src\xrc\xh_sttxt.cpp"> RelativePath="..\..\src\xrc\xh_sttxt.cpp">
</File> </File>
<File <File
RelativePath="..\..\src\xrc\xh_text.cpp"> RelativePath="..\..\src\xrc\xh_text.cpp">
</File> </File>
<File <File
RelativePath="..\..\src\xrc\xh_tglbtn.cpp"> RelativePath="..\..\src\xrc\xh_tglbtn.cpp">
</File> </File>
<File <File
RelativePath="..\..\src\xrc\xh_timectrl.cpp"> RelativePath="..\..\src\xrc\xh_timectrl.cpp">
</File> </File>
<File <File
RelativePath="..\..\src\xrc\xh_toolb.cpp"> RelativePath="..\..\src\xrc\xh_toolb.cpp">
</File> </File>
<File <File
RelativePath="..\..\src\xrc\xh_toolbk.cpp"> RelativePath="..\..\src\xrc\xh_toolbk.cpp">
</File> </File>
<File <File
RelativePath="..\..\src\xrc\xh_tree.cpp"> RelativePath="..\..\src\xrc\xh_tree.cpp">
</File> </File>
<File <File

272
build/msw/wx_vc8_adv.vcproj
View File

@@ -829,22 +829,22 @@
<File <File
RelativePath="..\..\src\common\hyperlnkcmn.cpp" RelativePath="..\..\src\common\hyperlnkcmn.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\common\odcombocmn.cpp" RelativePath="..\..\src\common\odcombocmn.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\common\richtooltipcmn.cpp" RelativePath="..\..\src\common\richtooltipcmn.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\common\taskbarcmn.cpp" RelativePath="..\..\src\common\taskbarcmn.cpp"
> >
</File> </File>
</Filter> </Filter>
<Filter <Filter
Name="MSW Sources" Name="MSW Sources"
UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}" UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}"
> >
<File <File
@@ -946,12 +946,12 @@
Name="DLL Universal Debug|Win32" Name="DLL Universal Debug|Win32"
ExcludedFromBuild="true" ExcludedFromBuild="true"
/> />
<FileConfiguration <FileConfiguration
Name="DLL Universal Release|Win32" Name="DLL Universal Release|Win32"
ExcludedFromBuild="true" ExcludedFromBuild="true"
/> />
</File> </File>
<File <File
RelativePath="..\..\src\msw\datetimectrl.cpp" RelativePath="..\..\src\msw\datetimectrl.cpp"
> >
<FileConfiguration <FileConfiguration
@@ -972,12 +972,12 @@
/> />
</File> </File>
<File <File
RelativePath="..\..\src\msw\hyperlink.cpp" RelativePath="..\..\src\msw\hyperlink.cpp"
> >
<FileConfiguration <FileConfiguration
Name="Universal Debug|Win32" Name="Universal Debug|Win32"
ExcludedFromBuild="true" ExcludedFromBuild="true"
/> />
<FileConfiguration <FileConfiguration
Name="Universal Release|Win32" Name="Universal Release|Win32"
ExcludedFromBuild="true" ExcludedFromBuild="true"
@@ -994,12 +994,12 @@
<File <File
RelativePath="..\..\src\msw\joystick.cpp" RelativePath="..\..\src\msw\joystick.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\msw\notifmsg.cpp" RelativePath="..\..\src\msw\notifmsg.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\msw\richtooltip.cpp" RelativePath="..\..\src\msw\richtooltip.cpp"
> >
<FileConfiguration <FileConfiguration
@@ -1068,14 +1068,14 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\msw\sound.cpp" RelativePath="..\..\src\msw\sound.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\msw\taskbar.cpp" RelativePath="..\..\src\msw\taskbar.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\msw\timectrl.cpp" RelativePath="..\..\src\msw\timectrl.cpp"
> >
<FileConfiguration <FileConfiguration
@@ -1128,12 +1128,12 @@
/> />
</File> </File>
<File <File
RelativePath="..\..\src\msw\version.rc" RelativePath="..\..\src\msw\version.rc"
> >
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Debug|Win32"
ExcludedFromBuild="true" ExcludedFromBuild="true"
/> />
<FileConfiguration <FileConfiguration
Name="Release|Win32" Name="Release|Win32"
ExcludedFromBuild="true" ExcludedFromBuild="true"
@@ -1223,12 +1223,12 @@
<File <File
RelativePath="..\..\src\generic\odcombo.cpp" RelativePath="..\..\src\generic\odcombo.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\generic\propdlg.cpp" RelativePath="..\..\src\generic\propdlg.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\generic\richtooltip.cpp" RelativePath="..\..\src\generic\richtooltip.cpp"
> >
<FileConfiguration <FileConfiguration
@@ -1297,14 +1297,14 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\generic\sashwin.cpp" RelativePath="..\..\src\generic\sashwin.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\generic\splash.cpp" RelativePath="..\..\src\generic\splash.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\generic\timectrl.cpp" RelativePath="..\..\src\generic\timectrl.cpp"
> >
<FileConfiguration <FileConfiguration
@@ -1373,12 +1373,12 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\generic\tipdlg.cpp" RelativePath="..\..\src\generic\tipdlg.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\generic\treelist.cpp" RelativePath="..\..\src\generic\treelist.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\generic\wizard.cpp" RelativePath="..\..\src\generic\wizard.cpp"
@@ -1517,22 +1517,22 @@
<File <File
RelativePath="..\..\include\wx\msw\commandlinkbutton.h" RelativePath="..\..\include\wx\msw\commandlinkbutton.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\datectrl.h" RelativePath="..\..\include\wx\msw\datectrl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\datetimectrl.h" RelativePath="..\..\include\wx\msw\datetimectrl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\genrcdefs.h" RelativePath="..\..\include\wx\msw\genrcdefs.h"
> >
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Debug|Win32"
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;" CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"
@@ -1632,22 +1632,22 @@
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\sound.h" RelativePath="..\..\include\wx\msw\sound.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\taskbar.h" RelativePath="..\..\include\wx\msw\taskbar.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\timectrl.h" RelativePath="..\..\include\wx\msw\timectrl.h"
> >
</File> </File>
</Filter> </Filter>
<Filter <Filter
Name="Generic Headers" Name="Generic Headers"
UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}" UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}"
> >
<File <File
RelativePath="..\..\include\wx\generic\aboutdlgg.h" RelativePath="..\..\include\wx\generic\aboutdlgg.h"
> >
</File> </File>
@@ -1718,22 +1718,22 @@
<File <File
RelativePath="..\..\include\wx\generic\sashwin.h" RelativePath="..\..\include\wx\generic\sashwin.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\splash.h" RelativePath="..\..\include\wx\generic\splash.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\timectrl.h" RelativePath="..\..\include\wx\generic\timectrl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\wizard.h" RelativePath="..\..\include\wx\generic\wizard.h"
> >
</File> </File>
</Filter> </Filter>
<Filter <Filter
Name="Common Headers" Name="Common Headers"
UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}" UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}"
> >
<File <File
@@ -1767,22 +1767,22 @@
<File <File
RelativePath="..\..\include\wx\datectrl.h" RelativePath="..\..\include\wx\datectrl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\dateevt.h" RelativePath="..\..\include\wx\dateevt.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\datetimectrl.h" RelativePath="..\..\include\wx\datetimectrl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\dcbuffer.h" RelativePath="..\..\include\wx\dcbuffer.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\dvrenderers.h" RelativePath="..\..\include\wx\dvrenderers.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\editlbox.h" RelativePath="..\..\include\wx\editlbox.h"
@@ -1811,42 +1811,42 @@
<File <File
RelativePath="..\..\include\wx\odcombo.h" RelativePath="..\..\include\wx\odcombo.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\propdlg.h" RelativePath="..\..\include\wx\propdlg.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\richtooltip.h" RelativePath="..\..\include\wx\richtooltip.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\sashwin.h" RelativePath="..\..\include\wx\sashwin.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\sound.h" RelativePath="..\..\include\wx\sound.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\splash.h" RelativePath="..\..\include\wx\splash.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\taskbar.h" RelativePath="..\..\include\wx\taskbar.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\timectrl.h" RelativePath="..\..\include\wx\timectrl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\tipdlg.h" RelativePath="..\..\include\wx\tipdlg.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\treelist.h" RelativePath="..\..\include\wx\treelist.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\wizard.h" RelativePath="..\..\include\wx\wizard.h"

32
build/msw/wx_vc8_base.vcproj
View File

@@ -1151,6 +1151,10 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\common\time.cpp"
>
</File>
<File
RelativePath="..\..\src\common\timercmn.cpp" RelativePath="..\..\src\common\timercmn.cpp"
> >
</File> </File>
@@ -1812,22 +1816,22 @@
<File <File
RelativePath="..\..\include\wx\encconv.h" RelativePath="..\..\include\wx\encconv.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\event.h" RelativePath="..\..\include\wx\event.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\eventfilter.h" RelativePath="..\..\include\wx\eventfilter.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\evtloop.h" RelativePath="..\..\include\wx\evtloop.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\except.h" RelativePath="..\..\include\wx\except.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\features.h" RelativePath="..\..\include\wx\features.h"
@@ -2150,6 +2154,10 @@
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\time.h"
>
</File>
<File
RelativePath="..\..\include\wx\timer.h" RelativePath="..\..\include\wx\timer.h"
> >
</File> </File>

312
build/msw/wx_vc8_core.vcproj
View File

@@ -2554,22 +2554,22 @@
Name="DLL Universal Debug|Win32" Name="DLL Universal Debug|Win32"
ExcludedFromBuild="true" ExcludedFromBuild="true"
/> />
<FileConfiguration <FileConfiguration
Name="DLL Universal Release|Win32" Name="DLL Universal Release|Win32"
ExcludedFromBuild="true" ExcludedFromBuild="true"
/> />
</File> </File>
<File <File
RelativePath="..\..\src\msw\nonownedwnd.cpp" RelativePath="..\..\src\msw\nonownedwnd.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\msw\notebook.cpp" RelativePath="..\..\src\msw\notebook.cpp"
> >
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Debug|Win32"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
ObjectFile="vc_mswud\core\msw_notebook.obj" ObjectFile="vc_mswud\core\msw_notebook.obj"
/> />
@@ -5782,42 +5782,42 @@
<File <File
RelativePath="..\..\include\wx\msw\ctrlsub.h" RelativePath="..\..\include\wx\msw\ctrlsub.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\cursor.h" RelativePath="..\..\include\wx\msw\cursor.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\custombgwin.h" RelativePath="..\..\include\wx\msw\custombgwin.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\ole\dataform.h" RelativePath="..\..\include\wx\msw\ole\dataform.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\ole\dataobj.h" RelativePath="..\..\include\wx\msw\ole\dataobj.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\ole\dataobj2.h" RelativePath="..\..\include\wx\msw\ole\dataobj2.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\datectrl.h" RelativePath="..\..\include\wx\msw\datectrl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\datetimectrl.h" RelativePath="..\..\include\wx\msw\datetimectrl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\dc.h" RelativePath="..\..\include\wx\msw\dc.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\dcclient.h" RelativePath="..\..\include\wx\msw\dcclient.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\dcmemory.h" RelativePath="..\..\include\wx\msw\dcmemory.h"
@@ -6062,22 +6062,22 @@
<File <File
RelativePath="..\..\include\wx\msw\msgdlg.h" RelativePath="..\..\include\wx\msw\msgdlg.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\msvcrt.h" RelativePath="..\..\include\wx\msw\msvcrt.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\nonownedwnd.h" RelativePath="..\..\include\wx\msw\nonownedwnd.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\notebook.h" RelativePath="..\..\include\wx\msw\notebook.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\notifmsg.h" RelativePath="..\..\include\wx\msw\notifmsg.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\ole\oleutils.h" RelativePath="..\..\include\wx\msw\ole\oleutils.h"
@@ -6190,22 +6190,22 @@
<File <File
RelativePath="..\..\include\wx\msw\textentry.h" RelativePath="..\..\include\wx\msw\textentry.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\tglbtn.h" RelativePath="..\..\include\wx\msw\tglbtn.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\timectrl.h" RelativePath="..\..\include\wx\msw\timectrl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\toolbar.h" RelativePath="..\..\include\wx\msw\toolbar.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\tooltip.h" RelativePath="..\..\include\wx\msw\tooltip.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\toplevel.h" RelativePath="..\..\include\wx\msw\toplevel.h"
@@ -6291,22 +6291,22 @@
<File <File
RelativePath="..\..\include\wx\generic\combo.h" RelativePath="..\..\include\wx\generic\combo.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\ctrlsub.h" RelativePath="..\..\include\wx\generic\ctrlsub.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\custombgwin.h" RelativePath="..\..\include\wx\generic\custombgwin.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\dataview.h" RelativePath="..\..\include\wx\generic\dataview.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\datectrl.h" RelativePath="..\..\include\wx\generic\datectrl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\dcpsg.h" RelativePath="..\..\include\wx\generic\dcpsg.h"
@@ -6479,22 +6479,22 @@
<File <File
RelativePath="..\..\include\wx\generic\statusbr.h" RelativePath="..\..\include\wx\generic\statusbr.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\textdlgg.h" RelativePath="..\..\include\wx\generic\textdlgg.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\timectrl.h" RelativePath="..\..\include\wx\generic\timectrl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\treectlg.h" RelativePath="..\..\include\wx\generic\treectlg.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\wizard.h" RelativePath="..\..\include\wx\generic\wizard.h"
> >
</File> </File>
</Filter> </Filter>
<Filter <Filter
@@ -6540,22 +6540,22 @@
<File <File
RelativePath="..\..\include\wx\univ\combobox.h" RelativePath="..\..\include\wx\univ\combobox.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\univ\control.h" RelativePath="..\..\include\wx\univ\control.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\univ\custombgwin.h" RelativePath="..\..\include\wx\univ\custombgwin.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\univ\dialog.h" RelativePath="..\..\include\wx\univ\dialog.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\univ\frame.h" RelativePath="..\..\include\wx\univ\frame.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\univ\gauge.h" RelativePath="..\..\include\wx\univ\gauge.h"
@@ -6950,42 +6950,42 @@
<File <File
RelativePath="..\..\include\wx\ctrlsub.h" RelativePath="..\..\include\wx\ctrlsub.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\cursor.h" RelativePath="..\..\include\wx\cursor.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\custombgwin.h" RelativePath="..\..\include\wx\custombgwin.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\dataobj.h" RelativePath="..\..\include\wx\dataobj.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\dataview.h" RelativePath="..\..\include\wx\dataview.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\datectrl.h" RelativePath="..\..\include\wx\datectrl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\dateevt.h" RelativePath="..\..\include\wx\dateevt.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\datetimectrl.h" RelativePath="..\..\include\wx\datetimectrl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\dc.h" RelativePath="..\..\include\wx\dc.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\dcbuffer.h" RelativePath="..\..\include\wx\dcbuffer.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\dcclient.h" RelativePath="..\..\include\wx\dcclient.h"
@@ -7586,22 +7586,22 @@
<File <File
RelativePath="..\..\include\wx\richtext\richtextuicustomization.h" RelativePath="..\..\include\wx\richtext\richtextuicustomization.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\richtext\richtextxml.h" RelativePath="..\..\include\wx\richtext\richtextxml.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\richtooltip.h" RelativePath="..\..\include\wx\richtooltip.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\sashwin.h" RelativePath="..\..\include\wx\sashwin.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\scopeguard.h" RelativePath="..\..\include\wx\scopeguard.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\scrolbar.h" RelativePath="..\..\include\wx\scrolbar.h"
@@ -7710,22 +7710,22 @@
<File <File
RelativePath="..\..\include\wx\textwrapper.h" RelativePath="..\..\include\wx\textwrapper.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\tglbtn.h" RelativePath="..\..\include\wx\tglbtn.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\timectrl.h" RelativePath="..\..\include\wx\timectrl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\tipdlg.h" RelativePath="..\..\include\wx\tipdlg.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\tipwin.h" RelativePath="..\..\include\wx\tipwin.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\ribbon\toolbar.h" RelativePath="..\..\include\wx\ribbon\toolbar.h"
@@ -8066,22 +8066,22 @@
<File <File
RelativePath="..\..\include\wx\xrc\xh_text.h" RelativePath="..\..\include\wx\xrc\xh_text.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_tglbtn.h" RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_timectrl.h" RelativePath="..\..\include\wx\xrc\xh_timectrl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_toolb.h" RelativePath="..\..\include\wx\xrc\xh_toolb.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_toolbk.h" RelativePath="..\..\include\wx\xrc\xh_toolbk.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_tree.h" RelativePath="..\..\include\wx\xrc\xh_tree.h"

48
build/msw/wx_vc8_xrc.vcproj
View File

@@ -1269,22 +1269,22 @@
<File <File
RelativePath="..\..\include\wx\xrc\xh_text.h" RelativePath="..\..\include\wx\xrc\xh_text.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_tglbtn.h" RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_timectrl.h" RelativePath="..\..\include\wx\xrc\xh_timectrl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_toolb.h" RelativePath="..\..\include\wx\xrc\xh_toolb.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_toolbk.h" RelativePath="..\..\include\wx\xrc\xh_toolbk.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_tree.h" RelativePath="..\..\include\wx\xrc\xh_tree.h"
@@ -1527,22 +1527,22 @@
<File <File
RelativePath="..\..\src\xrc\xh_text.cpp" RelativePath="..\..\src\xrc\xh_text.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\xrc\xh_tglbtn.cpp" RelativePath="..\..\src\xrc\xh_tglbtn.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\xrc\xh_timectrl.cpp" RelativePath="..\..\src\xrc\xh_timectrl.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\xrc\xh_toolb.cpp" RelativePath="..\..\src\xrc\xh_toolb.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\xrc\xh_toolbk.cpp" RelativePath="..\..\src\xrc\xh_toolbk.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\xrc\xh_tree.cpp" RelativePath="..\..\src\xrc\xh_tree.cpp"

272
build/msw/wx_vc9_adv.vcproj
View File

@@ -825,22 +825,22 @@
<File <File
RelativePath="..\..\src\common\hyperlnkcmn.cpp" RelativePath="..\..\src\common\hyperlnkcmn.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\common\odcombocmn.cpp" RelativePath="..\..\src\common\odcombocmn.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\common\richtooltipcmn.cpp" RelativePath="..\..\src\common\richtooltipcmn.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\common\taskbarcmn.cpp" RelativePath="..\..\src\common\taskbarcmn.cpp"
> >
</File> </File>
</Filter> </Filter>
<Filter <Filter
Name="MSW Sources" Name="MSW Sources"
UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}" UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}"
> >
<File <File
@@ -942,12 +942,12 @@
Name="DLL Universal Debug|Win32" Name="DLL Universal Debug|Win32"
ExcludedFromBuild="true" ExcludedFromBuild="true"
/> />
<FileConfiguration <FileConfiguration
Name="DLL Universal Release|Win32" Name="DLL Universal Release|Win32"
ExcludedFromBuild="true" ExcludedFromBuild="true"
/> />
</File> </File>
<File <File
RelativePath="..\..\src\msw\datetimectrl.cpp" RelativePath="..\..\src\msw\datetimectrl.cpp"
> >
<FileConfiguration <FileConfiguration
@@ -968,12 +968,12 @@
/> />
</File> </File>
<File <File
RelativePath="..\..\src\msw\hyperlink.cpp" RelativePath="..\..\src\msw\hyperlink.cpp"
> >
<FileConfiguration <FileConfiguration
Name="Universal Debug|Win32" Name="Universal Debug|Win32"
ExcludedFromBuild="true" ExcludedFromBuild="true"
/> />
<FileConfiguration <FileConfiguration
Name="Universal Release|Win32" Name="Universal Release|Win32"
ExcludedFromBuild="true" ExcludedFromBuild="true"
@@ -990,12 +990,12 @@
<File <File
RelativePath="..\..\src\msw\joystick.cpp" RelativePath="..\..\src\msw\joystick.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\msw\notifmsg.cpp" RelativePath="..\..\src\msw\notifmsg.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\msw\richtooltip.cpp" RelativePath="..\..\src\msw\richtooltip.cpp"
> >
<FileConfiguration <FileConfiguration
@@ -1064,14 +1064,14 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\msw\sound.cpp" RelativePath="..\..\src\msw\sound.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\msw\taskbar.cpp" RelativePath="..\..\src\msw\taskbar.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\msw\timectrl.cpp" RelativePath="..\..\src\msw\timectrl.cpp"
> >
<FileConfiguration <FileConfiguration
@@ -1124,12 +1124,12 @@
/> />
</File> </File>
<File <File
RelativePath="..\..\src\msw\version.rc" RelativePath="..\..\src\msw\version.rc"
> >
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Debug|Win32"
ExcludedFromBuild="true" ExcludedFromBuild="true"
/> />
<FileConfiguration <FileConfiguration
Name="Release|Win32" Name="Release|Win32"
ExcludedFromBuild="true" ExcludedFromBuild="true"
@@ -1219,12 +1219,12 @@
<File <File
RelativePath="..\..\src\generic\odcombo.cpp" RelativePath="..\..\src\generic\odcombo.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\generic\propdlg.cpp" RelativePath="..\..\src\generic\propdlg.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\generic\richtooltip.cpp" RelativePath="..\..\src\generic\richtooltip.cpp"
> >
<FileConfiguration <FileConfiguration
@@ -1293,14 +1293,14 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\generic\sashwin.cpp" RelativePath="..\..\src\generic\sashwin.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\generic\splash.cpp" RelativePath="..\..\src\generic\splash.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\generic\timectrl.cpp" RelativePath="..\..\src\generic\timectrl.cpp"
> >
<FileConfiguration <FileConfiguration
@@ -1369,12 +1369,12 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\generic\tipdlg.cpp" RelativePath="..\..\src\generic\tipdlg.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\generic\treelist.cpp" RelativePath="..\..\src\generic\treelist.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\generic\wizard.cpp" RelativePath="..\..\src\generic\wizard.cpp"
@@ -1513,22 +1513,22 @@
<File <File
RelativePath="..\..\include\wx\msw\commandlinkbutton.h" RelativePath="..\..\include\wx\msw\commandlinkbutton.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\datectrl.h" RelativePath="..\..\include\wx\msw\datectrl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\datetimectrl.h" RelativePath="..\..\include\wx\msw\datetimectrl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\genrcdefs.h" RelativePath="..\..\include\wx\msw\genrcdefs.h"
> >
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Debug|Win32"
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;" CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"
@@ -1628,22 +1628,22 @@
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\sound.h" RelativePath="..\..\include\wx\msw\sound.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\taskbar.h" RelativePath="..\..\include\wx\msw\taskbar.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\timectrl.h" RelativePath="..\..\include\wx\msw\timectrl.h"
> >
</File> </File>
</Filter> </Filter>
<Filter <Filter
Name="Generic Headers" Name="Generic Headers"
UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}" UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}"
> >
<File <File
RelativePath="..\..\include\wx\generic\aboutdlgg.h" RelativePath="..\..\include\wx\generic\aboutdlgg.h"
> >
</File> </File>
@@ -1714,22 +1714,22 @@
<File <File
RelativePath="..\..\include\wx\generic\sashwin.h" RelativePath="..\..\include\wx\generic\sashwin.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\splash.h" RelativePath="..\..\include\wx\generic\splash.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\timectrl.h" RelativePath="..\..\include\wx\generic\timectrl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\wizard.h" RelativePath="..\..\include\wx\generic\wizard.h"
> >
</File> </File>
</Filter> </Filter>
<Filter <Filter
Name="Common Headers" Name="Common Headers"
UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}" UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}"
> >
<File <File
@@ -1763,22 +1763,22 @@
<File <File
RelativePath="..\..\include\wx\datectrl.h" RelativePath="..\..\include\wx\datectrl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\dateevt.h" RelativePath="..\..\include\wx\dateevt.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\datetimectrl.h" RelativePath="..\..\include\wx\datetimectrl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\dcbuffer.h" RelativePath="..\..\include\wx\dcbuffer.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\dvrenderers.h" RelativePath="..\..\include\wx\dvrenderers.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\editlbox.h" RelativePath="..\..\include\wx\editlbox.h"
@@ -1807,42 +1807,42 @@
<File <File
RelativePath="..\..\include\wx\odcombo.h" RelativePath="..\..\include\wx\odcombo.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\propdlg.h" RelativePath="..\..\include\wx\propdlg.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\richtooltip.h" RelativePath="..\..\include\wx\richtooltip.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\sashwin.h" RelativePath="..\..\include\wx\sashwin.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\sound.h" RelativePath="..\..\include\wx\sound.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\splash.h" RelativePath="..\..\include\wx\splash.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\taskbar.h" RelativePath="..\..\include\wx\taskbar.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\timectrl.h" RelativePath="..\..\include\wx\timectrl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\tipdlg.h" RelativePath="..\..\include\wx\tipdlg.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\treelist.h" RelativePath="..\..\include\wx\treelist.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\wizard.h" RelativePath="..\..\include\wx\wizard.h"

32
build/msw/wx_vc9_base.vcproj
View File

@@ -1147,6 +1147,10 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\common\time.cpp"
>
</File>
<File
RelativePath="..\..\src\common\timercmn.cpp" RelativePath="..\..\src\common\timercmn.cpp"
> >
</File> </File>
@@ -1808,22 +1812,22 @@
<File <File
RelativePath="..\..\include\wx\encconv.h" RelativePath="..\..\include\wx\encconv.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\event.h" RelativePath="..\..\include\wx\event.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\eventfilter.h" RelativePath="..\..\include\wx\eventfilter.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\evtloop.h" RelativePath="..\..\include\wx\evtloop.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\except.h" RelativePath="..\..\include\wx\except.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\features.h" RelativePath="..\..\include\wx\features.h"
@@ -2146,6 +2150,10 @@
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\time.h"
>
</File>
<File
RelativePath="..\..\include\wx\timer.h" RelativePath="..\..\include\wx\timer.h"
> >
</File> </File>

312
build/msw/wx_vc9_core.vcproj
View File

@@ -2550,22 +2550,22 @@
Name="DLL Universal Debug|Win32" Name="DLL Universal Debug|Win32"
ExcludedFromBuild="true" ExcludedFromBuild="true"
/> />
<FileConfiguration <FileConfiguration
Name="DLL Universal Release|Win32" Name="DLL Universal Release|Win32"
ExcludedFromBuild="true" ExcludedFromBuild="true"
/> />
</File> </File>
<File <File
RelativePath="..\..\src\msw\nonownedwnd.cpp" RelativePath="..\..\src\msw\nonownedwnd.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\msw\notebook.cpp" RelativePath="..\..\src\msw\notebook.cpp"
> >
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Debug|Win32"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
ObjectFile="vc_mswud\core\msw_notebook.obj" ObjectFile="vc_mswud\core\msw_notebook.obj"
/> />
@@ -5778,42 +5778,42 @@
<File <File
RelativePath="..\..\include\wx\msw\ctrlsub.h" RelativePath="..\..\include\wx\msw\ctrlsub.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\cursor.h" RelativePath="..\..\include\wx\msw\cursor.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\custombgwin.h" RelativePath="..\..\include\wx\msw\custombgwin.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\ole\dataform.h" RelativePath="..\..\include\wx\msw\ole\dataform.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\ole\dataobj.h" RelativePath="..\..\include\wx\msw\ole\dataobj.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\ole\dataobj2.h" RelativePath="..\..\include\wx\msw\ole\dataobj2.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\datectrl.h" RelativePath="..\..\include\wx\msw\datectrl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\datetimectrl.h" RelativePath="..\..\include\wx\msw\datetimectrl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\dc.h" RelativePath="..\..\include\wx\msw\dc.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\dcclient.h" RelativePath="..\..\include\wx\msw\dcclient.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\dcmemory.h" RelativePath="..\..\include\wx\msw\dcmemory.h"
@@ -6058,22 +6058,22 @@
<File <File
RelativePath="..\..\include\wx\msw\msgdlg.h" RelativePath="..\..\include\wx\msw\msgdlg.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\msvcrt.h" RelativePath="..\..\include\wx\msw\msvcrt.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\nonownedwnd.h" RelativePath="..\..\include\wx\msw\nonownedwnd.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\notebook.h" RelativePath="..\..\include\wx\msw\notebook.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\notifmsg.h" RelativePath="..\..\include\wx\msw\notifmsg.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\ole\oleutils.h" RelativePath="..\..\include\wx\msw\ole\oleutils.h"
@@ -6186,22 +6186,22 @@
<File <File
RelativePath="..\..\include\wx\msw\textentry.h" RelativePath="..\..\include\wx\msw\textentry.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\tglbtn.h" RelativePath="..\..\include\wx\msw\tglbtn.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\timectrl.h" RelativePath="..\..\include\wx\msw\timectrl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\toolbar.h" RelativePath="..\..\include\wx\msw\toolbar.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\tooltip.h" RelativePath="..\..\include\wx\msw\tooltip.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\toplevel.h" RelativePath="..\..\include\wx\msw\toplevel.h"
@@ -6287,22 +6287,22 @@
<File <File
RelativePath="..\..\include\wx\generic\combo.h" RelativePath="..\..\include\wx\generic\combo.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\ctrlsub.h" RelativePath="..\..\include\wx\generic\ctrlsub.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\custombgwin.h" RelativePath="..\..\include\wx\generic\custombgwin.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\dataview.h" RelativePath="..\..\include\wx\generic\dataview.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\datectrl.h" RelativePath="..\..\include\wx\generic\datectrl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\dcpsg.h" RelativePath="..\..\include\wx\generic\dcpsg.h"
@@ -6475,22 +6475,22 @@
<File <File
RelativePath="..\..\include\wx\generic\statusbr.h" RelativePath="..\..\include\wx\generic\statusbr.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\textdlgg.h" RelativePath="..\..\include\wx\generic\textdlgg.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\timectrl.h" RelativePath="..\..\include\wx\generic\timectrl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\treectlg.h" RelativePath="..\..\include\wx\generic\treectlg.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\generic\wizard.h" RelativePath="..\..\include\wx\generic\wizard.h"
> >
</File> </File>
</Filter> </Filter>
<Filter <Filter
@@ -6536,22 +6536,22 @@
<File <File
RelativePath="..\..\include\wx\univ\combobox.h" RelativePath="..\..\include\wx\univ\combobox.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\univ\control.h" RelativePath="..\..\include\wx\univ\control.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\univ\custombgwin.h" RelativePath="..\..\include\wx\univ\custombgwin.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\univ\dialog.h" RelativePath="..\..\include\wx\univ\dialog.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\univ\frame.h" RelativePath="..\..\include\wx\univ\frame.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\univ\gauge.h" RelativePath="..\..\include\wx\univ\gauge.h"
@@ -6946,42 +6946,42 @@
<File <File
RelativePath="..\..\include\wx\ctrlsub.h" RelativePath="..\..\include\wx\ctrlsub.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\cursor.h" RelativePath="..\..\include\wx\cursor.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\custombgwin.h" RelativePath="..\..\include\wx\custombgwin.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\dataobj.h" RelativePath="..\..\include\wx\dataobj.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\dataview.h" RelativePath="..\..\include\wx\dataview.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\datectrl.h" RelativePath="..\..\include\wx\datectrl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\dateevt.h" RelativePath="..\..\include\wx\dateevt.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\datetimectrl.h" RelativePath="..\..\include\wx\datetimectrl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\dc.h" RelativePath="..\..\include\wx\dc.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\dcbuffer.h" RelativePath="..\..\include\wx\dcbuffer.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\dcclient.h" RelativePath="..\..\include\wx\dcclient.h"
@@ -7582,22 +7582,22 @@
<File <File
RelativePath="..\..\include\wx\richtext\richtextuicustomization.h" RelativePath="..\..\include\wx\richtext\richtextuicustomization.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\richtext\richtextxml.h" RelativePath="..\..\include\wx\richtext\richtextxml.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\richtooltip.h" RelativePath="..\..\include\wx\richtooltip.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\sashwin.h" RelativePath="..\..\include\wx\sashwin.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\scopeguard.h" RelativePath="..\..\include\wx\scopeguard.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\scrolbar.h" RelativePath="..\..\include\wx\scrolbar.h"
@@ -7706,22 +7706,22 @@
<File <File
RelativePath="..\..\include\wx\textwrapper.h" RelativePath="..\..\include\wx\textwrapper.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\tglbtn.h" RelativePath="..\..\include\wx\tglbtn.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\timectrl.h" RelativePath="..\..\include\wx\timectrl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\tipdlg.h" RelativePath="..\..\include\wx\tipdlg.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\tipwin.h" RelativePath="..\..\include\wx\tipwin.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\ribbon\toolbar.h" RelativePath="..\..\include\wx\ribbon\toolbar.h"
@@ -8062,22 +8062,22 @@
<File <File
RelativePath="..\..\include\wx\xrc\xh_text.h" RelativePath="..\..\include\wx\xrc\xh_text.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_tglbtn.h" RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_timectrl.h" RelativePath="..\..\include\wx\xrc\xh_timectrl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_toolb.h" RelativePath="..\..\include\wx\xrc\xh_toolb.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_toolbk.h" RelativePath="..\..\include\wx\xrc\xh_toolbk.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_tree.h" RelativePath="..\..\include\wx\xrc\xh_tree.h"

48
build/msw/wx_vc9_xrc.vcproj
View File

@@ -1265,22 +1265,22 @@
<File <File
RelativePath="..\..\include\wx\xrc\xh_text.h" RelativePath="..\..\include\wx\xrc\xh_text.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_tglbtn.h" RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_timectrl.h" RelativePath="..\..\include\wx\xrc\xh_timectrl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_toolb.h" RelativePath="..\..\include\wx\xrc\xh_toolb.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_toolbk.h" RelativePath="..\..\include\wx\xrc\xh_toolbk.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\xrc\xh_tree.h" RelativePath="..\..\include\wx\xrc\xh_tree.h"
@@ -1523,22 +1523,22 @@
<File <File
RelativePath="..\..\src\xrc\xh_text.cpp" RelativePath="..\..\src\xrc\xh_text.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\xrc\xh_tglbtn.cpp" RelativePath="..\..\src\xrc\xh_tglbtn.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\xrc\xh_timectrl.cpp" RelativePath="..\..\src\xrc\xh_timectrl.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\xrc\xh_toolb.cpp" RelativePath="..\..\src\xrc\xh_toolb.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\xrc\xh_toolbk.cpp" RelativePath="..\..\src\xrc\xh_toolbk.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\xrc\xh_tree.cpp" RelativePath="..\..\src\xrc\xh_tree.cpp"

48
build/msw/wx_xrc.dsp
View File

@@ -748,22 +748,22 @@ SOURCE=..\..\include\wx\xrc\xh_sttxt.h
SOURCE=..\..\include\wx\xrc\xh_text.h SOURCE=..\..\include\wx\xrc\xh_text.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\xrc\xh_tglbtn.h SOURCE=..\..\include\wx\xrc\xh_tglbtn.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\xrc\xh_timectrl.h SOURCE=..\..\include\wx\xrc\xh_timectrl.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\xrc\xh_toolb.h SOURCE=..\..\include\wx\xrc\xh_toolb.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\xrc\xh_toolbk.h SOURCE=..\..\include\wx\xrc\xh_toolbk.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\xrc\xh_tree.h SOURCE=..\..\include\wx\xrc\xh_tree.h
@@ -1004,22 +1004,22 @@ SOURCE=..\..\src\xrc\xh_sttxt.cpp
SOURCE=..\..\src\xrc\xh_text.cpp SOURCE=..\..\src\xrc\xh_text.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\xrc\xh_tglbtn.cpp SOURCE=..\..\src\xrc\xh_tglbtn.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\xrc\xh_timectrl.cpp SOURCE=..\..\src\xrc\xh_timectrl.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\xrc\xh_toolb.cpp SOURCE=..\..\src\xrc\xh_toolb.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\xrc\xh_toolbk.cpp SOURCE=..\..\src\xrc\xh_toolbk.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\xrc\xh_tree.cpp SOURCE=..\..\src\xrc\xh_tree.cpp

17
include/wx/time.h Normal file
View 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
View 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();
//@}

84
src/common/datetime.cpp
View File

@@ -75,6 +75,7 @@
#endif // WX_PRECOMP #endif // WX_PRECOMP
#include "wx/thread.h" #include "wx/thread.h"
#include "wx/time.h"
#include "wx/tokenzr.h" #include "wx/tokenzr.h"
#include <ctype.h> #include <ctype.h>
@@ -122,14 +123,6 @@ wxCUSTOM_TYPE_INFO(wxDateTime, wxToStringConverter<wxDateTime> , wxFromStringCon
#include <values.h> #include <values.h>
#endif #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 // NB: VC8 safe time functions could/should be used for wxMSW as well probably
#if defined(__WXWINCE__) && defined(__VISUALC8__) #if defined(__WXWINCE__) && defined(__VISUALC8__)
@@ -327,69 +320,6 @@ wxDateTime::wxDateTime_t GetNumOfDaysInMonth(int year, wxDateTime::Month month)
return daysInMonth[wxDateTime::IsLeapYear(year)][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 // 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 // get the real JDN you need to add 0.5, this is, in fact, JDN of the
// noon of the previous day) // noon of the previous day)
@@ -615,7 +545,7 @@ wxDateTime::TimeZone::TimeZone(wxDateTime::TZ tz)
case wxDateTime::Local: case wxDateTime::Local:
// get the offset from C RTL: it returns the difference GMT-local // get the offset from C RTL: it returns the difference GMT-local
// while we want to have the offset _from_ GMT, hence the '-' // while we want to have the offset _from_ GMT, hence the '-'
m_offset = -GetTimeZone(); m_offset = -wxGetTimeZone();
break; break;
case wxDateTime::GMT_12: 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 ) if ( tm2.tm_year == 70 && tm2.tm_mon == 0 && tm2.tm_mday == 1 )
{ {
return Set((time_t)( return Set((time_t)(
GetTimeZone() + wxGetTimeZone() +
tm2.tm_hour * MIN_PER_HOUR * SEC_PER_MIN + tm2.tm_hour * MIN_PER_HOUR * SEC_PER_MIN +
tm2.tm_min * SEC_PER_MIN + tm2.tm_min * SEC_PER_MIN +
tm2.tm_sec)); tm2.tm_sec));
@@ -1386,7 +1316,7 @@ wxDateTime& wxDateTime::Set(wxDateTime_t day,
m_time *= SECONDS_PER_DAY * TIME_T_FACTOR; m_time *= SECONDS_PER_DAY * TIME_T_FACTOR;
// JDN corresponds to GMT, we take localtime // JDN corresponds to GMT, we take localtime
Add(wxTimeSpan(hour, minute, second + GetTimeZone(), millisec)); Add(wxTimeSpan(hour, minute, second + wxGetTimeZone(), millisec));
} }
return *this; return *this;
@@ -1525,7 +1455,7 @@ wxDateTime::Tm wxDateTime::GetTm(const TimeZone& tz) const
// use C RTL functions // use C RTL functions
struct tm tmstruct; struct tm tmstruct;
tm *tm; tm *tm;
if ( tz.GetOffset() == -GetTimeZone() ) if ( tz.GetOffset() == -wxGetTimeZone() )
{ {
// we are working with local time // we are working with local time
tm = wxLocaltime_r(&time, &tmstruct); tm = wxLocaltime_r(&time, &tmstruct);
@@ -2159,7 +2089,7 @@ int wxDateTime::IsDST(wxDateTime::Country country) const
wxDateTime& wxDateTime::MakeTimezone(const TimeZone& tz, bool noDST) 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 // we need to know whether DST is or not in effect for this date unless
// the test disabled by the caller // 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) 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 // we need to know whether DST is or not in effect for this date unless
// the test disabled by the caller // the test disabled by the caller

5
src/common/datetimefmt.cpp
View File

@@ -57,6 +57,7 @@
#endif #endif
#include "wx/datetime.h" #include "wx/datetime.h"
#include "wx/time.h"
// ============================================================================ // ============================================================================
// implementation of wxDateTime // implementation of wxDateTime
@@ -68,8 +69,6 @@
extern void InitTm(struct tm& tm); extern void InitTm(struct tm& tm);
extern int GetTimeZone();
extern wxString CallStrftime(const wxString& format, const tm* tm); 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() // use strftime()
struct tm tmstruct; struct tm tmstruct;
struct tm *tm; struct tm *tm;
if ( tz.GetOffset() == -GetTimeZone() ) if ( tz.GetOffset() == -wxGetTimeZone() )
{ {
// we are working with local time // we are working with local time
tm = wxLocaltime_r(&time, &tmstruct); tm = wxLocaltime_r(&time, &tmstruct);

100
src/common/time.cpp Normal file
View 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
}

1
wxGTK.spec
View File

@@ -306,6 +306,7 @@ wx/textbuf.h
wx/textfile.h wx/textfile.h
wx/thread.h wx/thread.h
wx/thrimpl.cpp wx/thrimpl.cpp
wx/time.h
wx/timer.h wx/timer.h
wx/tls.h wx/tls.h
wx/tokenzr.h wx/tokenzr.h

1
wxMotif.spec
View File

@@ -208,6 +208,7 @@ wx/textbuf.h
wx/textfile.h wx/textfile.h
wx/thread.h wx/thread.h
wx/thrimpl.cpp wx/thrimpl.cpp
wx/time.h
wx/timer.h wx/timer.h
wx/tls.h wx/tls.h
wx/tokenzr.h wx/tokenzr.h

1
wxX11.spec
View File

@@ -232,6 +232,7 @@ wx/textbuf.h
wx/textfile.h wx/textfile.h
wx/thread.h wx/thread.h
wx/thrimpl.cpp wx/thrimpl.cpp
wx/time.h
wx/timer.h wx/timer.h
wx/tls.h wx/tls.h
wx/tokenzr.h wx/tokenzr.h