From e7ebb5dababe511c10954b6b483cc8e242c342c6 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Fri, 5 Sep 2008 15:33:44 +0000 Subject: [PATCH] adding common implementation file for search control git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 16 ++++++++++++++++ build/bakefiles/files.bkl | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index 9ab8a2099e..9165cfb045 100644 --- a/Makefile.in +++ b/Makefile.in @@ -11729,6 +11729,7 @@ COND_PLATFORM_MACOSX_1___MAC_LOWLEVEL_SRC_OBJECTS = \ monodll_slider_osx.o \ monodll_spinbutt_osx.o \ monodll_spinctrl_osx.o \ + monodll_srchctrl_osx.o \ monodll_statbox_osx.o \ monodll_statline_osx.o \ monodll_stattext_osx.o \ @@ -11851,6 +11852,7 @@ COND_PLATFORM_MACOSX_1___MAC_LOWLEVEL_SRC_OBJECTS_0 = \ monolib_slider_osx.o \ monolib_spinbutt_osx.o \ monolib_spinctrl_osx.o \ + monolib_srchctrl_osx.o \ monolib_statbox_osx.o \ monolib_statline_osx.o \ monolib_stattext_osx.o \ @@ -11973,6 +11975,7 @@ COND_PLATFORM_MACOSX_1___MAC_LOWLEVEL_SRC_OBJECTS_8 = \ coredll_slider_osx.o \ coredll_spinbutt_osx.o \ coredll_spinctrl_osx.o \ + coredll_srchctrl_osx.o \ coredll_statbox_osx.o \ coredll_statline_osx.o \ coredll_stattext_osx.o \ @@ -12022,6 +12025,7 @@ COND_PLATFORM_MACOSX_1___MAC_LOWLEVEL_SRC_OBJECTS_9 = \ corelib_slider_osx.o \ corelib_spinbutt_osx.o \ corelib_spinctrl_osx.o \ + corelib_srchctrl_osx.o \ corelib_statbox_osx.o \ corelib_statline_osx.o \ corelib_stattext_osx.o \ @@ -16231,6 +16235,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp + @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp @@ -20797,6 +20804,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp + @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp @@ -25879,6 +25889,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(COREDLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp + @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(COREDLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp @@ -29026,6 +29039,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(CORELIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp + @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(CORELIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index ede7c13912..d36787b995 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -2183,7 +2183,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/osx/slider_osx.cpp src/osx/spinbutt_osx.cpp src/osx/spinctrl_osx.cpp - + src/osx/srchctrl_osx.cpp src/osx/statbox_osx.cpp src/osx/statline_osx.cpp src/osx/stattext_osx.cpp -- 2.45.2