From: Vadim Zeitlin Date: Mon, 23 Feb 2009 21:24:37 +0000 (+0000) Subject: remove non-existent wx/msw/datecontrols.h from files.bkl (it's a private file and... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5a0dca116dc3b2ba5df1e0904271b5b8826585f5?ds=inline remove non-existent wx/msw/datecontrols.h from files.bkl (it's a private file and shouldn't be installed) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/Makefile.in b/Makefile.in index be6f59d265..476703d7e4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -773,6 +773,7 @@ ALL_BASE_SOURCES = \ src/unix/timerunx.cpp \ src/os2/dir.cpp \ src/os2/mimetype.cpp \ + src/os2/snglinst.cpp \ src/os2/stdpaths.cpp \ src/os2/thread.cpp \ src/os2/utils.cpp \ @@ -3287,20 +3288,12 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_NATIVE_HDR = \ wx/gtk/dataview.h \ wx/gtk/hyperlink.h @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ADVANCED_PLATFORM_NATIVE_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_NATIVE_HDR) -COND_TOOLKIT_MSW_ADVANCED_PLATFORM_NATIVE_HDR = \ - wx/generic/animate.h \ - wx/msw/bmpcbox.h \ - wx/msw/calctrl.h \ - wx/msw/datecontrols.h \ - wx/msw/datectrl.h -@COND_TOOLKIT_MSW@ADVANCED_PLATFORM_NATIVE_HDR = $(COND_TOOLKIT_MSW_ADVANCED_PLATFORM_NATIVE_HDR) -COND_TOOLKIT_WINCE_ADVANCED_PLATFORM_NATIVE_HDR = \ - wx/generic/animate.h \ - wx/msw/bmpcbox.h \ - wx/msw/calctrl.h \ - wx/msw/datecontrols.h \ - wx/msw/datectrl.h -@COND_TOOLKIT_WINCE@ADVANCED_PLATFORM_NATIVE_HDR = $(COND_TOOLKIT_WINCE_ADVANCED_PLATFORM_NATIVE_HDR) +@COND_TOOLKIT_MSW@ADVANCED_PLATFORM_NATIVE_HDR = \ +@COND_TOOLKIT_MSW@ wx/generic/animate.h wx/msw/bmpcbox.h wx/msw/calctrl.h \ +@COND_TOOLKIT_MSW@ wx/msw/datectrl.h +@COND_TOOLKIT_WINCE@ADVANCED_PLATFORM_NATIVE_HDR = \ +@COND_TOOLKIT_WINCE@ wx/generic/animate.h wx/msw/bmpcbox.h wx/msw/calctrl.h \ +@COND_TOOLKIT_WINCE@ wx/msw/datectrl.h COND_WXUNIV_0_ADVANCED_HDR = \ wx/aboutdlg.h \ wx/animate.h \ @@ -3848,6 +3841,7 @@ COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS = \ monodll_timerunx.o \ monodll_os2_dir.o \ monodll_os2_mimetype.o \ + monodll_os2_snglinst.o \ monodll_os2_stdpaths.o \ monodll_os2_thread.o \ monodll_os2_utils.o \ @@ -5660,6 +5654,7 @@ COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ monolib_timerunx.o \ monolib_os2_dir.o \ monolib_os2_mimetype.o \ + monolib_os2_snglinst.o \ monolib_os2_stdpaths.o \ monolib_os2_thread.o \ monolib_os2_utils.o \ @@ -7509,6 +7504,7 @@ COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ basedll_timerunx.o \ basedll_os2_dir.o \ basedll_os2_mimetype.o \ + basedll_os2_snglinst.o \ basedll_os2_stdpaths.o \ basedll_os2_thread.o \ basedll_os2_utils.o \ @@ -7601,6 +7597,7 @@ COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ baselib_timerunx.o \ baselib_os2_dir.o \ baselib_os2_mimetype.o \ + baselib_os2_snglinst.o \ baselib_os2_stdpaths.o \ baselib_os2_thread.o \ baselib_os2_utils.o \ @@ -14283,6 +14280,9 @@ monodll_os2_dir.o: $(srcdir)/src/os2/dir.cpp $(MONODLL_ODEP) monodll_os2_mimetype.o: $(srcdir)/src/os2/mimetype.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/mimetype.cpp +monodll_os2_snglinst.o: $(srcdir)/src/os2/snglinst.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/snglinst.cpp + monodll_os2_stdpaths.o: $(srcdir)/src/os2/stdpaths.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/stdpaths.cpp @@ -18960,6 +18960,9 @@ monolib_os2_dir.o: $(srcdir)/src/os2/dir.cpp $(MONOLIB_ODEP) monolib_os2_mimetype.o: $(srcdir)/src/os2/mimetype.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/mimetype.cpp +monolib_os2_snglinst.o: $(srcdir)/src/os2/snglinst.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/snglinst.cpp + monolib_os2_stdpaths.o: $(srcdir)/src/os2/stdpaths.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/stdpaths.cpp @@ -23637,6 +23640,9 @@ basedll_os2_dir.o: $(srcdir)/src/os2/dir.cpp $(BASEDLL_ODEP) basedll_os2_mimetype.o: $(srcdir)/src/os2/mimetype.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/mimetype.cpp +basedll_os2_snglinst.o: $(srcdir)/src/os2/snglinst.cpp $(BASEDLL_ODEP) + $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/snglinst.cpp + basedll_os2_stdpaths.o: $(srcdir)/src/os2/stdpaths.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/stdpaths.cpp @@ -24093,6 +24099,9 @@ baselib_os2_dir.o: $(srcdir)/src/os2/dir.cpp $(BASELIB_ODEP) baselib_os2_mimetype.o: $(srcdir)/src/os2/mimetype.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/mimetype.cpp +baselib_os2_snglinst.o: $(srcdir)/src/os2/snglinst.cpp $(BASELIB_ODEP) + $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/snglinst.cpp + baselib_os2_stdpaths.o: $(srcdir)/src/os2/stdpaths.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/stdpaths.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 028f35933f..a367282382 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -2898,7 +2898,6 @@ src/osx/iphone/window.mm wx/generic/animate.h wx/msw/bmpcbox.h wx/msw/calctrl.h - wx/msw/datecontrols.h wx/msw/datectrl.h diff --git a/build/msw/wx_adv.dsp b/build/msw/wx_adv.dsp index da8d3a1283..0b1f7681f6 100644 --- a/build/msw/wx_adv.dsp +++ b/build/msw/wx_adv.dsp @@ -719,10 +719,6 @@ SOURCE=..\..\include\wx\msw\calctrl.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\datecontrols.h -# End Source File -# Begin Source File - SOURCE=..\..\include\wx\msw\datectrl.h # End Source File # Begin Source File diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index 245918092e..524e745dfc 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -4831,10 +4831,6 @@ SOURCE=..\..\include\wx\msw\ole\dataobj2.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\datecontrols.h -# End Source File -# Begin Source File - SOURCE=..\..\include\wx\msw\datectrl.h # End Source File # Begin Source File diff --git a/build/msw/wx_vc7_adv.vcproj b/build/msw/wx_vc7_adv.vcproj index d2827f86a5..96675af0f2 100644 --- a/build/msw/wx_vc7_adv.vcproj +++ b/build/msw/wx_vc7_adv.vcproj @@ -854,9 +854,6 @@ - - diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj index 786f4ec1e5..96b25ddd11 100644 --- a/build/msw/wx_vc7_core.vcproj +++ b/build/msw/wx_vc7_core.vcproj @@ -2859,9 +2859,6 @@ - - diff --git a/build/msw/wx_vc8_adv.vcproj b/build/msw/wx_vc8_adv.vcproj index 043530fa58..7197e94724 100644 --- a/build/msw/wx_vc8_adv.vcproj +++ b/build/msw/wx_vc8_adv.vcproj @@ -1170,10 +1170,6 @@ RelativePath="..\..\include\wx\msw\calctrl.h" > - - diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj index 9d142e47de..839e301968 100644 --- a/build/msw/wx_vc8_core.vcproj +++ b/build/msw/wx_vc8_core.vcproj @@ -3843,10 +3843,6 @@ RelativePath="..\..\include\wx\msw\ole\dataobj2.h" > - - diff --git a/build/msw/wx_vc9_adv.vcproj b/build/msw/wx_vc9_adv.vcproj index e1fd281ee0..8448b91c0b 100644 --- a/build/msw/wx_vc9_adv.vcproj +++ b/build/msw/wx_vc9_adv.vcproj @@ -1166,10 +1166,6 @@ RelativePath="..\..\include\wx\msw\calctrl.h" > - - diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj index d8b4318214..6d210cc44d 100644 --- a/build/msw/wx_vc9_core.vcproj +++ b/build/msw/wx_vc9_core.vcproj @@ -3839,10 +3839,6 @@ RelativePath="..\..\include\wx\msw\ole\dataobj2.h" > - -