From 2da724cb54050dce7783e0e8f783832ece3c0129 Mon Sep 17 00:00:00 2001 From: Michael Wetherell Date: Mon, 5 Jun 2006 14:16:46 +0000 Subject: [PATCH] Add missing picker files for gtk1 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 102 +++++++++++++++++++++++++++----------- build/bakefiles/files.bkl | 20 +++++--- 2 files changed, 87 insertions(+), 35 deletions(-) diff --git a/Makefile.in b/Makefile.in index 091d9e8e6e..b9602e4a83 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1828,9 +1828,12 @@ COND_TOOLKIT_COCOA_GUI_HDR = \ wx/generic/tabg.h @COND_TOOLKIT_COCOA@GUI_HDR = $(COND_TOOLKIT_COCOA_GUI_HDR) COND_TOOLKIT_GTK_TOOLKIT_VERSION__GUI_HDR = \ + wx/generic/clrpickerg.h \ wx/generic/colrdlgg.h \ wx/generic/dirdlgg.h \ wx/generic/fdrepdlg.h \ + wx/generic/filepickerg.h \ + wx/generic/fontpickerg.h \ wx/generic/listctrl.h \ wx/generic/statusbr.h \ wx/generic/tabg.h \ @@ -2086,14 +2089,14 @@ COND_TOOLKIT_MAC_GUI_HDR = \ wx/mac/carbon/uma.h \ wx/mac/carbon/window.h \ wx/generic/caret.h \ + wx/generic/clrpickerg.h \ wx/generic/fdrepdlg.h \ + wx/generic/filepickerg.h \ wx/generic/fontdlgg.h \ + wx/generic/fontpickerg.h \ wx/generic/listctrl.h \ wx/generic/statusbr.h \ wx/generic/tabg.h \ - wx/generic/clrpickerg.h \ - wx/generic/filepickerg.h \ - wx/generic/fontpickerg.h \ wx/html/webkit.h @COND_TOOLKIT_MAC@GUI_HDR = $(COND_TOOLKIT_MAC_GUI_HDR) COND_TOOLKIT_MOTIF_GUI_HDR = \ @@ -3814,10 +3817,13 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS = \ @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS) COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS = \ monodll_accel.o \ + monodll_clrpickerg.o \ monodll_colrdlgg.o \ monodll_dirdlgg.o \ monodll_fdrepdlg.o \ monodll_filedlgg.o \ + monodll_filepickerg.o \ + monodll_fontpickerg.o \ monodll_imaglist.o \ monodll_listctrl.o \ monodll_msgdlgg.o \ @@ -3990,15 +3996,15 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS = \ monodll_toplevel.o \ monodll_window.o \ monodll_caret.o \ + monodll_clrpickerg.o \ monodll_fdrepdlg.o \ + monodll_filepickerg.o \ monodll_fontdlgg.o \ + monodll_fontpickerg.o \ monodll_listctrl.o \ monodll_prntdlgg.o \ monodll_statusbr.o \ monodll_tabg.o \ - monodll_clrpickerg.o \ - monodll_fontpickerg.o \ - monodll_filepickerg.o \ $(__MAC_OSX_SRC_OBJECTS) @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MAC___GUI_SRC_OBJECTS) COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS = \ @@ -4070,8 +4076,8 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS = \ @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS) COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \ monodll_clrpickerg.o \ - monodll_fontpickerg.o \ monodll_filepickerg.o \ + monodll_fontpickerg.o \ monodll_statusbr.o \ monodll_prntdlgg.o \ monodll_accel.o \ @@ -4209,8 +4215,8 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS = \ @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS) COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS = \ monodll_clrpickerg.o \ - monodll_fontpickerg.o \ monodll_filepickerg.o \ + monodll_fontpickerg.o \ monodll_statusbr.o \ monodll_prntdlgg.o \ monodll_accel.o \ @@ -5488,10 +5494,13 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 = \ @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1) COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_1 = \ monolib_accel.o \ + monolib_clrpickerg.o \ monolib_colrdlgg.o \ monolib_dirdlgg.o \ monolib_fdrepdlg.o \ monolib_filedlgg.o \ + monolib_filepickerg.o \ + monolib_fontpickerg.o \ monolib_imaglist.o \ monolib_listctrl.o \ monolib_msgdlgg.o \ @@ -5664,15 +5673,15 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1 = \ monolib_toplevel.o \ monolib_window.o \ monolib_caret.o \ + monolib_clrpickerg.o \ monolib_fdrepdlg.o \ + monolib_filepickerg.o \ monolib_fontdlgg.o \ + monolib_fontpickerg.o \ monolib_listctrl.o \ monolib_prntdlgg.o \ monolib_statusbr.o \ monolib_tabg.o \ - monolib_clrpickerg.o \ - monolib_fontpickerg.o \ - monolib_filepickerg.o \ $(__MAC_OSX_SRC_OBJECTS_1) @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1) COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 = \ @@ -5744,8 +5753,8 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 = \ @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1) COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \ monolib_clrpickerg.o \ - monolib_fontpickerg.o \ monolib_filepickerg.o \ + monolib_fontpickerg.o \ monolib_statusbr.o \ monolib_prntdlgg.o \ monolib_accel.o \ @@ -5883,8 +5892,8 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1 = \ @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1) COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 = \ monolib_clrpickerg.o \ - monolib_fontpickerg.o \ monolib_filepickerg.o \ + monolib_fontpickerg.o \ monolib_statusbr.o \ monolib_prntdlgg.o \ monolib_accel.o \ @@ -7391,10 +7400,13 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 = \ @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2) COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_2 = \ coredll_accel.o \ + coredll_clrpickerg.o \ coredll_colrdlgg.o \ coredll_dirdlgg.o \ coredll_fdrepdlg.o \ coredll_filedlgg.o \ + coredll_filepickerg.o \ + coredll_fontpickerg.o \ coredll_imaglist.o \ coredll_listctrl.o \ coredll_msgdlgg.o \ @@ -7567,15 +7579,15 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2 = \ coredll_toplevel.o \ coredll_window.o \ coredll_caret.o \ + coredll_clrpickerg.o \ coredll_fdrepdlg.o \ + coredll_filepickerg.o \ coredll_fontdlgg.o \ + coredll_fontpickerg.o \ coredll_listctrl.o \ coredll_prntdlgg.o \ coredll_statusbr.o \ coredll_tabg.o \ - coredll_clrpickerg.o \ - coredll_fontpickerg.o \ - coredll_filepickerg.o \ $(__MAC_OSX_SRC_OBJECTS_2) @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2) COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 = \ @@ -7647,8 +7659,8 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 = \ @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2) COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \ coredll_clrpickerg.o \ - coredll_fontpickerg.o \ coredll_filepickerg.o \ + coredll_fontpickerg.o \ coredll_statusbr.o \ coredll_prntdlgg.o \ coredll_accel.o \ @@ -7786,8 +7798,8 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2 = \ @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2) COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 = \ coredll_clrpickerg.o \ - coredll_fontpickerg.o \ coredll_filepickerg.o \ + coredll_fontpickerg.o \ coredll_statusbr.o \ coredll_prntdlgg.o \ coredll_accel.o \ @@ -8762,10 +8774,13 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 = \ @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3) COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_3 = \ corelib_accel.o \ + corelib_clrpickerg.o \ corelib_colrdlgg.o \ corelib_dirdlgg.o \ corelib_fdrepdlg.o \ corelib_filedlgg.o \ + corelib_filepickerg.o \ + corelib_fontpickerg.o \ corelib_imaglist.o \ corelib_listctrl.o \ corelib_msgdlgg.o \ @@ -8938,15 +8953,15 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3 = \ corelib_toplevel.o \ corelib_window.o \ corelib_caret.o \ + corelib_clrpickerg.o \ corelib_fdrepdlg.o \ + corelib_filepickerg.o \ corelib_fontdlgg.o \ + corelib_fontpickerg.o \ corelib_listctrl.o \ corelib_prntdlgg.o \ corelib_statusbr.o \ corelib_tabg.o \ - corelib_clrpickerg.o \ - corelib_fontpickerg.o \ - corelib_filepickerg.o \ $(__MAC_OSX_SRC_OBJECTS_3) @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3) COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 = \ @@ -9018,8 +9033,8 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 = \ @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3) COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \ corelib_clrpickerg.o \ - corelib_fontpickerg.o \ corelib_filepickerg.o \ + corelib_fontpickerg.o \ corelib_statusbr.o \ corelib_prntdlgg.o \ corelib_accel.o \ @@ -9157,8 +9172,8 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3 = \ @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3) COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 = \ corelib_clrpickerg.o \ - corelib_fontpickerg.o \ corelib_filepickerg.o \ + corelib_fontpickerg.o \ corelib_statusbr.o \ corelib_prntdlgg.o \ corelib_accel.o \ @@ -13572,6 +13587,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp @@ -13635,6 +13653,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp @@ -13653,6 +13674,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp @@ -17481,6 +17505,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp @@ -17544,6 +17571,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp @@ -17562,6 +17592,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp @@ -21801,6 +21834,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp @@ -21864,6 +21900,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp @@ -21882,6 +21921,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp @@ -24666,6 +24708,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp @@ -24729,6 +24774,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp @@ -24747,6 +24795,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp @@ -28439,11 +28490,6 @@ debian-dist: debian-native-dist debian-msw-dirs MSW_DIST rm -rf $(DISTDIR)/wxPython/contrib/iewin find $(DISTDIR)/wxPython \( -name "mac" -o -name "msw" \) -print0 | xargs -0 rm -rf - # copy back some *.bkl files we removed above - mkdir -p $(DISTDIR)/build/bakefiles/wxpresets/presets - cp $(WXDIR)/build/bakefiles/wxpresets/presets/*.bkl \ - $(DISTDIR)/build/bakefiles/wxpresets/presets - rm -rf $(DEBIAN_SOURCE_DIR) mv $(DISTDIR) $(DEBIAN_SOURCE_DIR) diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 9c1cbac67b..27b6905493 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -1115,10 +1115,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/accel.cpp + src/generic/clrpickerg.cpp src/generic/colrdlgg.cpp src/generic/dirdlgg.cpp src/generic/fdrepdlg.cpp src/generic/filedlgg.cpp + src/generic/filepickerg.cpp + src/generic/fontpickerg.cpp src/generic/imaglist.cpp src/generic/listctrl.cpp src/generic/msgdlgg.cpp @@ -1161,9 +1164,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/gtk1/utilsres.cpp + wx/generic/clrpickerg.h wx/generic/colrdlgg.h wx/generic/dirdlgg.h wx/generic/fdrepdlg.h + wx/generic/filepickerg.h + wx/generic/fontpickerg.h wx/generic/listctrl.h wx/generic/statusbr.h wx/generic/tabg.h @@ -1503,8 +1509,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/clrpickerg.cpp - src/generic/fontpickerg.cpp src/generic/filepickerg.cpp + src/generic/fontpickerg.cpp src/generic/statusbr.cpp src/generic/prntdlgg.cpp src/msw/accel.cpp @@ -2062,15 +2068,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/mac/carbon/window.cpp src/generic/caret.cpp + src/generic/clrpickerg.cpp src/generic/fdrepdlg.cpp + src/generic/filepickerg.cpp src/generic/fontdlgg.cpp + src/generic/fontpickerg.cpp src/generic/listctrl.cpp src/generic/prntdlgg.cpp src/generic/statusbr.cpp src/generic/tabg.cpp - src/generic/clrpickerg.cpp - src/generic/fontpickerg.cpp - src/generic/filepickerg.cpp @@ -2242,14 +2248,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/mac/carbon/window.h wx/generic/caret.h + wx/generic/clrpickerg.h wx/generic/fdrepdlg.h + wx/generic/filepickerg.h wx/generic/fontdlgg.h + wx/generic/fontpickerg.h wx/generic/listctrl.h wx/generic/statusbr.h wx/generic/tabg.h - wx/generic/clrpickerg.h - wx/generic/filepickerg.h - wx/generic/fontpickerg.h wx/html/webkit.h -- 2.45.2