From 24bbfc6292ab8e6072a33f57b2c370ffda5fa229 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Thu, 1 Jun 2006 13:18:10 +0000 Subject: [PATCH] Universal build fix. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 51 ++++++++++ build/bakefiles/files.bkl | 6 ++ build/msw/makefile.bcc | 108 ++++++++++++++-------- build/msw/makefile.gcc | 108 ++++++++++++++-------- build/msw/makefile.vc | 108 ++++++++++++++-------- build/msw/makefile.wat | 108 ++++++++++++++-------- build/msw/wx_core.dsp | 189 +++----------------------------------- include/wx/univ/setup0.h | 56 +++++------ 8 files changed, 387 insertions(+), 347 deletions(-) diff --git a/Makefile.in b/Makefile.in index 5a63d65ef9..c6e0ac1249 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2587,9 +2587,12 @@ COND_WXUNIV_1_ADVANCED_HDR = \ @COND_USE_GUI_1_WXUNIV_0@GUI_CORE_HEADERS = $(GUI_HDR) COND_USE_GUI_1_WXUNIV_1_GUI_CORE_HEADERS = \ wx/generic/accel.h \ + wx/generic/clrpickerg.h \ wx/generic/dirdlgg.h \ wx/generic/fdrepdlg.h \ + wx/generic/filepickerg.h \ wx/generic/fontdlgg.h \ + wx/generic/fontpickerg.h \ wx/generic/listctrl.h \ wx/generic/mdig.h \ wx/generic/statusbr.h \ @@ -3293,11 +3296,14 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ $(__LOWLEVEL_SRC_OBJECTS_1) \ monodll_accel.o \ + monodll_clrpickerg.o \ monodll_colrdlgg.o \ monodll_dirdlgg.o \ monodll_fdrepdlg.o \ monodll_filedlgg.o \ + monodll_filepickerg.o \ monodll_fontdlgg.o \ + monodll_fontpickerg.o \ monodll_imaglist.o \ monodll_listctrl.o \ monodll_mdig.o \ @@ -4958,11 +4964,14 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ $(__LOWLEVEL_SRC_OBJECTS_3) \ monolib_accel.o \ + monolib_clrpickerg.o \ monolib_colrdlgg.o \ monolib_dirdlgg.o \ monolib_fdrepdlg.o \ monolib_filedlgg.o \ + monolib_filepickerg.o \ monolib_fontdlgg.o \ + monolib_fontpickerg.o \ monolib_imaglist.o \ monolib_listctrl.o \ monolib_mdig.o \ @@ -6853,11 +6862,14 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ $(__LOWLEVEL_SRC_OBJECTS_5) \ coredll_accel.o \ + coredll_clrpickerg.o \ coredll_colrdlgg.o \ coredll_dirdlgg.o \ coredll_fdrepdlg.o \ coredll_filedlgg.o \ + coredll_filepickerg.o \ coredll_fontdlgg.o \ + coredll_fontpickerg.o \ coredll_imaglist.o \ coredll_listctrl.o \ coredll_mdig.o \ @@ -8216,11 +8228,14 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ $(__LOWLEVEL_SRC_OBJECTS_7) \ corelib_accel.o \ + corelib_clrpickerg.o \ corelib_colrdlgg.o \ corelib_dirdlgg.o \ corelib_fdrepdlg.o \ corelib_filedlgg.o \ + corelib_filepickerg.o \ corelib_fontdlgg.o \ + corelib_fontpickerg.o \ corelib_imaglist.o \ corelib_listctrl.o \ corelib_mdig.o \ @@ -13537,6 +13552,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp +@COND_USE_GUI_1_WXUNIV_1@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp @@ -13591,6 +13609,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp +@COND_USE_GUI_1_WXUNIV_1@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp + @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 @@ -13600,6 +13621,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp +@COND_USE_GUI_1_WXUNIV_1@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp @@ -17422,6 +17446,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp +@COND_USE_GUI_1_WXUNIV_1@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp @@ -17476,6 +17503,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp +@COND_USE_GUI_1_WXUNIV_1@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp + @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 @@ -17485,6 +17515,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp +@COND_USE_GUI_1_WXUNIV_1@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp @@ -21718,6 +21751,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp +@COND_USE_GUI_1_WXUNIV_1@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp @@ -21772,6 +21808,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp +@COND_USE_GUI_1_WXUNIV_1@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp + @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 @@ -21781,6 +21820,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp +@COND_USE_GUI_1_WXUNIV_1@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp @@ -24559,6 +24601,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp +@COND_USE_GUI_1_WXUNIV_1@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp @@ -24613,6 +24658,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp +@COND_USE_GUI_1_WXUNIV_1@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp + @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 @@ -24622,6 +24670,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp +@COND_USE_GUI_1_WXUNIV_1@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 0cd7e751eb..3311df6e32 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -2444,11 +2444,14 @@ 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/fontdlgg.cpp + src/generic/fontpickerg.cpp src/generic/imaglist.cpp src/generic/listctrl.cpp src/generic/mdig.cpp @@ -2493,9 +2496,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/generic/accel.h + wx/generic/clrpickerg.h wx/generic/dirdlgg.h wx/generic/fdrepdlg.h + wx/generic/filepickerg.h wx/generic/fontdlgg.h + wx/generic/fontpickerg.h wx/generic/listctrl.h wx/generic/mdig.h wx/generic/statusbr.h diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index ffd4283232..c7849e1afa 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -1430,11 +1430,14 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_automtn.obj \ $(OBJS)\monodll_uuid.obj \ $(OBJS)\monodll_accel.obj \ + $(OBJS)\monodll_clrpickerg.obj \ $(OBJS)\monodll_colrdlgg.obj \ $(OBJS)\monodll_dirdlgg.obj \ $(OBJS)\monodll_fdrepdlg.obj \ $(OBJS)\monodll_filedlgg.obj \ + $(OBJS)\monodll_filepickerg.obj \ $(OBJS)\monodll_fontdlgg.obj \ + $(OBJS)\monodll_fontpickerg.obj \ $(OBJS)\monodll_imaglist.obj \ $(OBJS)\monodll_listctrl.obj \ $(OBJS)\monodll_mdig.obj \ @@ -1999,11 +2002,14 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_automtn.obj \ $(OBJS)\monolib_uuid.obj \ $(OBJS)\monolib_accel.obj \ + $(OBJS)\monolib_clrpickerg.obj \ $(OBJS)\monolib_colrdlgg.obj \ $(OBJS)\monolib_dirdlgg.obj \ $(OBJS)\monolib_fdrepdlg.obj \ $(OBJS)\monolib_filedlgg.obj \ + $(OBJS)\monolib_filepickerg.obj \ $(OBJS)\monolib_fontdlgg.obj \ + $(OBJS)\monolib_fontpickerg.obj \ $(OBJS)\monolib_imaglist.obj \ $(OBJS)\monolib_listctrl.obj \ $(OBJS)\monolib_mdig.obj \ @@ -2496,11 +2502,14 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_automtn.obj \ $(OBJS)\coredll_uuid.obj \ $(OBJS)\coredll_accel.obj \ + $(OBJS)\coredll_clrpickerg.obj \ $(OBJS)\coredll_colrdlgg.obj \ $(OBJS)\coredll_dirdlgg.obj \ $(OBJS)\coredll_fdrepdlg.obj \ $(OBJS)\coredll_filedlgg.obj \ + $(OBJS)\coredll_filepickerg.obj \ $(OBJS)\coredll_fontdlgg.obj \ + $(OBJS)\coredll_fontpickerg.obj \ $(OBJS)\coredll_imaglist.obj \ $(OBJS)\coredll_listctrl.obj \ $(OBJS)\coredll_mdig.obj \ @@ -2920,11 +2929,14 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_automtn.obj \ $(OBJS)\corelib_uuid.obj \ $(OBJS)\corelib_accel.obj \ + $(OBJS)\corelib_clrpickerg.obj \ $(OBJS)\corelib_colrdlgg.obj \ $(OBJS)\corelib_dirdlgg.obj \ $(OBJS)\corelib_fdrepdlg.obj \ $(OBJS)\corelib_filedlgg.obj \ + $(OBJS)\corelib_filepickerg.obj \ $(OBJS)\corelib_fontdlgg.obj \ + $(OBJS)\corelib_fontpickerg.obj \ $(OBJS)\corelib_imaglist.obj \ $(OBJS)\corelib_listctrl.obj \ $(OBJS)\corelib_mdig.obj \ @@ -4457,15 +4469,6 @@ $(OBJS)\monodll_gsocket.obj: ..\..\src\msw\gsocket.cpp $(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** - -$(OBJS)\monodll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** - -$(OBJS)\monodll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** - $(OBJS)\monodll_colordlg.obj: ..\..\src\msw\colordlg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -5099,6 +5102,21 @@ $(OBJS)\monodll_uuid.obj: ..\..\src\msw\ole\uuid.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monodll_statusbr.obj: ..\..\src\generic\statusbr.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -6308,15 +6326,6 @@ $(OBJS)\monolib_gsocket.obj: ..\..\src\msw\gsocket.cpp $(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** - -$(OBJS)\monolib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** - -$(OBJS)\monolib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** - $(OBJS)\monolib_colordlg.obj: ..\..\src\msw\colordlg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -6950,6 +6959,21 @@ $(OBJS)\monolib_uuid.obj: ..\..\src\msw\ole\uuid.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monolib_statusbr.obj: ..\..\src\generic\statusbr.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -8477,15 +8501,6 @@ $(OBJS)\coredll_mslu.obj: ..\..\src\msw\mslu.cpp $(OBJS)\coredll_volume.obj: ..\..\src\msw\volume.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -$(OBJS)\coredll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** - -$(OBJS)\coredll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** - -$(OBJS)\coredll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** - $(OBJS)\coredll_colordlg.obj: ..\..\src\msw\colordlg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -8861,6 +8876,21 @@ $(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\coredll_statusbr.obj: ..\..\src\generic\statusbr.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -9690,15 +9720,6 @@ $(OBJS)\corelib_mslu.obj: ..\..\src\msw\mslu.cpp $(OBJS)\corelib_volume.obj: ..\..\src\msw\volume.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -$(OBJS)\corelib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** - -$(OBJS)\corelib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** - -$(OBJS)\corelib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** - $(OBJS)\corelib_colordlg.obj: ..\..\src\msw\colordlg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -10074,6 +10095,21 @@ $(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\corelib_statusbr.obj: ..\..\src\generic\statusbr.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 2fc0fc2041..92c1d64707 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1443,11 +1443,14 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_automtn.o \ $(OBJS)\monodll_uuid.o \ $(OBJS)\monodll_accel.o \ + $(OBJS)\monodll_clrpickerg.o \ $(OBJS)\monodll_colrdlgg.o \ $(OBJS)\monodll_dirdlgg.o \ $(OBJS)\monodll_fdrepdlg.o \ $(OBJS)\monodll_filedlgg.o \ + $(OBJS)\monodll_filepickerg.o \ $(OBJS)\monodll_fontdlgg.o \ + $(OBJS)\monodll_fontpickerg.o \ $(OBJS)\monodll_imaglist.o \ $(OBJS)\monodll_listctrl.o \ $(OBJS)\monodll_mdig.o \ @@ -2018,11 +2021,14 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_automtn.o \ $(OBJS)\monolib_uuid.o \ $(OBJS)\monolib_accel.o \ + $(OBJS)\monolib_clrpickerg.o \ $(OBJS)\monolib_colrdlgg.o \ $(OBJS)\monolib_dirdlgg.o \ $(OBJS)\monolib_fdrepdlg.o \ $(OBJS)\monolib_filedlgg.o \ + $(OBJS)\monolib_filepickerg.o \ $(OBJS)\monolib_fontdlgg.o \ + $(OBJS)\monolib_fontpickerg.o \ $(OBJS)\monolib_imaglist.o \ $(OBJS)\monolib_listctrl.o \ $(OBJS)\monolib_mdig.o \ @@ -2531,11 +2537,14 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_automtn.o \ $(OBJS)\coredll_uuid.o \ $(OBJS)\coredll_accel.o \ + $(OBJS)\coredll_clrpickerg.o \ $(OBJS)\coredll_colrdlgg.o \ $(OBJS)\coredll_dirdlgg.o \ $(OBJS)\coredll_fdrepdlg.o \ $(OBJS)\coredll_filedlgg.o \ + $(OBJS)\coredll_filepickerg.o \ $(OBJS)\coredll_fontdlgg.o \ + $(OBJS)\coredll_fontpickerg.o \ $(OBJS)\coredll_imaglist.o \ $(OBJS)\coredll_listctrl.o \ $(OBJS)\coredll_mdig.o \ @@ -2963,11 +2972,14 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_automtn.o \ $(OBJS)\corelib_uuid.o \ $(OBJS)\corelib_accel.o \ + $(OBJS)\corelib_clrpickerg.o \ $(OBJS)\corelib_colrdlgg.o \ $(OBJS)\corelib_dirdlgg.o \ $(OBJS)\corelib_fdrepdlg.o \ $(OBJS)\corelib_filedlgg.o \ + $(OBJS)\corelib_filepickerg.o \ $(OBJS)\corelib_fontdlgg.o \ + $(OBJS)\corelib_fontpickerg.o \ $(OBJS)\corelib_imaglist.o \ $(OBJS)\corelib_listctrl.o \ $(OBJS)\corelib_mdig.o \ @@ -4561,15 +4573,6 @@ $(OBJS)\monodll_gsocket.o: ../../src/msw/gsocket.cpp $(OBJS)\monodll_urlmsw.o: ../../src/msw/urlmsw.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monodll_clrpickerg.o: ../../src/generic/clrpickerg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_fontpickerg.o: ../../src/generic/fontpickerg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_filepickerg.o: ../../src/generic/filepickerg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\monodll_colordlg.o: ../../src/msw/colordlg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -5203,6 +5206,21 @@ $(OBJS)\monodll_uuid.o: ../../src/msw/ole/uuid.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_clrpickerg.o: ../../src/generic/clrpickerg.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_fontpickerg.o: ../../src/generic/fontpickerg.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_filepickerg.o: ../../src/generic/filepickerg.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) $(OBJS)\monodll_statusbr.o: ../../src/generic/statusbr.cpp @@ -6516,15 +6534,6 @@ $(OBJS)\monolib_gsocket.o: ../../src/msw/gsocket.cpp $(OBJS)\monolib_urlmsw.o: ../../src/msw/urlmsw.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monolib_clrpickerg.o: ../../src/generic/clrpickerg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_fontpickerg.o: ../../src/generic/fontpickerg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_filepickerg.o: ../../src/generic/filepickerg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\monolib_colordlg.o: ../../src/msw/colordlg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -7158,6 +7167,21 @@ $(OBJS)\monolib_uuid.o: ../../src/msw/ole/uuid.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_clrpickerg.o: ../../src/generic/clrpickerg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_fontpickerg.o: ../../src/generic/fontpickerg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_filepickerg.o: ../../src/generic/filepickerg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) $(OBJS)\monolib_statusbr.o: ../../src/generic/statusbr.cpp @@ -8789,15 +8813,6 @@ $(OBJS)\coredll_mslu.o: ../../src/msw/mslu.cpp $(OBJS)\coredll_volume.o: ../../src/msw/volume.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\coredll_clrpickerg.o: ../../src/generic/clrpickerg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_fontpickerg.o: ../../src/generic/fontpickerg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_filepickerg.o: ../../src/generic/filepickerg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\coredll_colordlg.o: ../../src/msw/colordlg.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -9173,6 +9188,21 @@ $(OBJS)\coredll_uuid.o: ../../src/msw/ole/uuid.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_clrpickerg.o: ../../src/generic/clrpickerg.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_fontpickerg.o: ../../src/generic/fontpickerg.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_filepickerg.o: ../../src/generic/filepickerg.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) $(OBJS)\coredll_statusbr.o: ../../src/generic/statusbr.cpp @@ -10106,15 +10136,6 @@ $(OBJS)\corelib_mslu.o: ../../src/msw/mslu.cpp $(OBJS)\corelib_volume.o: ../../src/msw/volume.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\corelib_clrpickerg.o: ../../src/generic/clrpickerg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_fontpickerg.o: ../../src/generic/fontpickerg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_filepickerg.o: ../../src/generic/filepickerg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\corelib_colordlg.o: ../../src/msw/colordlg.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -10490,6 +10511,21 @@ $(OBJS)\corelib_uuid.o: ../../src/msw/ole/uuid.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_clrpickerg.o: ../../src/generic/clrpickerg.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_fontpickerg.o: ../../src/generic/fontpickerg.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_filepickerg.o: ../../src/generic/filepickerg.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) $(OBJS)\corelib_statusbr.o: ../../src/generic/statusbr.cpp diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 8ba2aad2e4..e34be5971d 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -1589,11 +1589,14 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_automtn.obj \ $(OBJS)\monodll_uuid.obj \ $(OBJS)\monodll_accel.obj \ + $(OBJS)\monodll_clrpickerg.obj \ $(OBJS)\monodll_colrdlgg.obj \ $(OBJS)\monodll_dirdlgg.obj \ $(OBJS)\monodll_fdrepdlg.obj \ $(OBJS)\monodll_filedlgg.obj \ + $(OBJS)\monodll_filepickerg.obj \ $(OBJS)\monodll_fontdlgg.obj \ + $(OBJS)\monodll_fontpickerg.obj \ $(OBJS)\monodll_imaglist.obj \ $(OBJS)\monodll_listctrl.obj \ $(OBJS)\monodll_mdig.obj \ @@ -2164,11 +2167,14 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_automtn.obj \ $(OBJS)\monolib_uuid.obj \ $(OBJS)\monolib_accel.obj \ + $(OBJS)\monolib_clrpickerg.obj \ $(OBJS)\monolib_colrdlgg.obj \ $(OBJS)\monolib_dirdlgg.obj \ $(OBJS)\monolib_fdrepdlg.obj \ $(OBJS)\monolib_filedlgg.obj \ + $(OBJS)\monolib_filepickerg.obj \ $(OBJS)\monolib_fontdlgg.obj \ + $(OBJS)\monolib_fontpickerg.obj \ $(OBJS)\monolib_imaglist.obj \ $(OBJS)\monolib_listctrl.obj \ $(OBJS)\monolib_mdig.obj \ @@ -2691,11 +2697,14 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_automtn.obj \ $(OBJS)\coredll_uuid.obj \ $(OBJS)\coredll_accel.obj \ + $(OBJS)\coredll_clrpickerg.obj \ $(OBJS)\coredll_colrdlgg.obj \ $(OBJS)\coredll_dirdlgg.obj \ $(OBJS)\coredll_fdrepdlg.obj \ $(OBJS)\coredll_filedlgg.obj \ + $(OBJS)\coredll_filepickerg.obj \ $(OBJS)\coredll_fontdlgg.obj \ + $(OBJS)\coredll_fontpickerg.obj \ $(OBJS)\coredll_imaglist.obj \ $(OBJS)\coredll_listctrl.obj \ $(OBJS)\coredll_mdig.obj \ @@ -3121,11 +3130,14 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_automtn.obj \ $(OBJS)\corelib_uuid.obj \ $(OBJS)\corelib_accel.obj \ + $(OBJS)\corelib_clrpickerg.obj \ $(OBJS)\corelib_colrdlgg.obj \ $(OBJS)\corelib_dirdlgg.obj \ $(OBJS)\corelib_fdrepdlg.obj \ $(OBJS)\corelib_filedlgg.obj \ + $(OBJS)\corelib_filepickerg.obj \ $(OBJS)\corelib_fontdlgg.obj \ + $(OBJS)\corelib_fontpickerg.obj \ $(OBJS)\corelib_imaglist.obj \ $(OBJS)\corelib_listctrl.obj \ $(OBJS)\corelib_mdig.obj \ @@ -4766,15 +4778,6 @@ $(OBJS)\monodll_gsocket.obj: ..\..\src\msw\gsocket.cpp $(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** - -$(OBJS)\monodll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** - -$(OBJS)\monodll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** - $(OBJS)\monodll_colordlg.obj: ..\..\src\msw\colordlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -5408,6 +5411,21 @@ $(OBJS)\monodll_uuid.obj: ..\..\src\msw\ole\uuid.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monodll_statusbr.obj: ..\..\src\generic\statusbr.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -6617,15 +6635,6 @@ $(OBJS)\monolib_gsocket.obj: ..\..\src\msw\gsocket.cpp $(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** - -$(OBJS)\monolib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** - -$(OBJS)\monolib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** - $(OBJS)\monolib_colordlg.obj: ..\..\src\msw\colordlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -7259,6 +7268,21 @@ $(OBJS)\monolib_uuid.obj: ..\..\src\msw\ole\uuid.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monolib_statusbr.obj: ..\..\src\generic\statusbr.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -8786,15 +8810,6 @@ $(OBJS)\coredll_mslu.obj: ..\..\src\msw\mslu.cpp $(OBJS)\coredll_volume.obj: ..\..\src\msw\volume.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -$(OBJS)\coredll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** - -$(OBJS)\coredll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** - -$(OBJS)\coredll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** - $(OBJS)\coredll_colordlg.obj: ..\..\src\msw\colordlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -9170,6 +9185,21 @@ $(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\coredll_statusbr.obj: ..\..\src\generic\statusbr.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -9999,15 +10029,6 @@ $(OBJS)\corelib_mslu.obj: ..\..\src\msw\mslu.cpp $(OBJS)\corelib_volume.obj: ..\..\src\msw\volume.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -$(OBJS)\corelib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** - -$(OBJS)\corelib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** - -$(OBJS)\corelib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** - $(OBJS)\corelib_colordlg.obj: ..\..\src\msw\colordlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -10383,6 +10404,21 @@ $(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\corelib_statusbr.obj: ..\..\src\generic\statusbr.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index 4cf9c594fe..a39cab9d32 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -450,11 +450,14 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_automtn.obj & $(OBJS)\monodll_uuid.obj & $(OBJS)\monodll_accel.obj & + $(OBJS)\monodll_clrpickerg.obj & $(OBJS)\monodll_colrdlgg.obj & $(OBJS)\monodll_dirdlgg.obj & $(OBJS)\monodll_fdrepdlg.obj & $(OBJS)\monodll_filedlgg.obj & + $(OBJS)\monodll_filepickerg.obj & $(OBJS)\monodll_fontdlgg.obj & + $(OBJS)\monodll_fontpickerg.obj & $(OBJS)\monodll_imaglist.obj & $(OBJS)\monodll_listctrl.obj & $(OBJS)\monodll_mdig.obj & @@ -1029,11 +1032,14 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_automtn.obj & $(OBJS)\monolib_uuid.obj & $(OBJS)\monolib_accel.obj & + $(OBJS)\monolib_clrpickerg.obj & $(OBJS)\monolib_colrdlgg.obj & $(OBJS)\monolib_dirdlgg.obj & $(OBJS)\monolib_fdrepdlg.obj & $(OBJS)\monolib_filedlgg.obj & + $(OBJS)\monolib_filepickerg.obj & $(OBJS)\monolib_fontdlgg.obj & + $(OBJS)\monolib_fontpickerg.obj & $(OBJS)\monolib_imaglist.obj & $(OBJS)\monolib_listctrl.obj & $(OBJS)\monolib_mdig.obj & @@ -1549,11 +1555,14 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_automtn.obj & $(OBJS)\coredll_uuid.obj & $(OBJS)\coredll_accel.obj & + $(OBJS)\coredll_clrpickerg.obj & $(OBJS)\coredll_colrdlgg.obj & $(OBJS)\coredll_dirdlgg.obj & $(OBJS)\coredll_fdrepdlg.obj & $(OBJS)\coredll_filedlgg.obj & + $(OBJS)\coredll_filepickerg.obj & $(OBJS)\coredll_fontdlgg.obj & + $(OBJS)\coredll_fontpickerg.obj & $(OBJS)\coredll_imaglist.obj & $(OBJS)\coredll_listctrl.obj & $(OBJS)\coredll_mdig.obj & @@ -1983,11 +1992,14 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_automtn.obj & $(OBJS)\corelib_uuid.obj & $(OBJS)\corelib_accel.obj & + $(OBJS)\corelib_clrpickerg.obj & $(OBJS)\corelib_colrdlgg.obj & $(OBJS)\corelib_dirdlgg.obj & $(OBJS)\corelib_fdrepdlg.obj & $(OBJS)\corelib_filedlgg.obj & + $(OBJS)\corelib_filepickerg.obj & $(OBJS)\corelib_fontdlgg.obj & + $(OBJS)\corelib_fontpickerg.obj & $(OBJS)\corelib_imaglist.obj & $(OBJS)\corelib_listctrl.obj & $(OBJS)\corelib_mdig.obj & @@ -4761,15 +4773,6 @@ $(OBJS)\monodll_gsocket.obj : .AUTODEPEND ..\..\src\msw\gsocket.cpp $(OBJS)\monodll_urlmsw.obj : .AUTODEPEND ..\..\src\msw\urlmsw.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - $(OBJS)\monodll_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -5403,6 +5406,21 @@ $(OBJS)\monodll_uuid.obj : .AUTODEPEND ..\..\src\msw\ole\uuid.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monodll_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monodll_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\monodll_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp @@ -6716,15 +6734,6 @@ $(OBJS)\monolib_gsocket.obj : .AUTODEPEND ..\..\src\msw\gsocket.cpp $(OBJS)\monolib_urlmsw.obj : .AUTODEPEND ..\..\src\msw\urlmsw.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - $(OBJS)\monolib_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -7358,6 +7367,21 @@ $(OBJS)\monolib_uuid.obj : .AUTODEPEND ..\..\src\msw\ole\uuid.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monolib_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monolib_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\monolib_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp @@ -8989,15 +9013,6 @@ $(OBJS)\coredll_mslu.obj : .AUTODEPEND ..\..\src\msw\mslu.cpp $(OBJS)\coredll_volume.obj : .AUTODEPEND ..\..\src\msw\volume.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - $(OBJS)\coredll_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -9373,6 +9388,21 @@ $(OBJS)\coredll_uuid.obj : .AUTODEPEND ..\..\src\msw\ole\uuid.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\coredll_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\coredll_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\coredll_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\coredll_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp @@ -10306,15 +10336,6 @@ $(OBJS)\corelib_mslu.obj : .AUTODEPEND ..\..\src\msw\mslu.cpp $(OBJS)\corelib_volume.obj : .AUTODEPEND ..\..\src\msw\volume.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - $(OBJS)\corelib_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -10690,6 +10711,21 @@ $(OBJS)\corelib_uuid.obj : .AUTODEPEND ..\..\src\msw\ole\uuid.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\corelib_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\corelib_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\corelib_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\corelib_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index ade18463c9..6111fc2c82 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -4118,65 +4118,6 @@ SOURCE=..\..\src\generic\choicdgg.cpp # Begin Source File SOURCE=..\..\src\generic\clrpickerg.cpp - -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Debug" - - -!ENDIF - # End Source File # Begin Source File @@ -4449,65 +4390,6 @@ SOURCE=..\..\src\generic\filedlgg.cpp # Begin Source File SOURCE=..\..\src\generic\filepickerg.cpp - -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Debug" - - -!ENDIF - # End Source File # Begin Source File @@ -4575,65 +4457,6 @@ SOURCE=..\..\src\generic\fontdlgg.cpp # Begin Source File SOURCE=..\..\src\generic\fontpickerg.cpp - -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Debug" - - -!ENDIF - # End Source File # Begin Source File @@ -8338,6 +8161,10 @@ SOURCE=..\..\include\wx\generic\clrpicker.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\generic\clrpickerg.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\generic\colrdlgg.h # End Source File # Begin Source File @@ -8382,6 +8209,10 @@ SOURCE=..\..\include\wx\generic\filepicker.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\generic\filepickerg.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\generic\fontdlgg.h # End Source File # Begin Source File @@ -8390,6 +8221,10 @@ SOURCE=..\..\include\wx\generic\fontpicker.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\generic\fontpickerg.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\generic\grid.h # End Source File # Begin Source File diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h index 14f0dd6b8b..716ea560a9 100644 --- a/include/wx/univ/setup0.h +++ b/include/wx/univ/setup0.h @@ -586,32 +586,36 @@ // Default is 1 // // Recommended setting: 1 -#define wxUSE_BUTTON 1 // wxButton -#define wxUSE_BMPBUTTON 1 // wxBitmapButton -#define wxUSE_CALENDARCTRL 1 // wxCalendarCtrl -#define wxUSE_CHECKBOX 1 // wxCheckBox -#define wxUSE_CHECKLISTBOX 1 // wxCheckListBox -#define wxUSE_CHOICE 1 // wxChoice -#define wxUSE_COMBOBOX 1 // wxComboBox -#define wxUSE_DATAVIEWCTRL 1 // wxDataViewCtrl -#define wxUSE_DATEPICKCTRL 1 // wxDatePickerCtrl -#define wxUSE_GAUGE 1 // wxGauge -#define wxUSE_HYPERLINKCTRL 1 // wxHyperlinkCtrl -#define wxUSE_LISTBOX 1 // wxListBox -#define wxUSE_LISTCTRL 1 // wxListCtrl -#define wxUSE_RADIOBOX 1 // wxRadioBox -#define wxUSE_RADIOBTN 1 // wxRadioButton -#define wxUSE_SCROLLBAR 1 // wxScrollBar -#define wxUSE_SLIDER 1 // wxSlider -#define wxUSE_SPINBTN 1 // wxSpinButton -#define wxUSE_SPINCTRL 1 // wxSpinCtrl -#define wxUSE_STATBOX 1 // wxStaticBox -#define wxUSE_STATLINE 1 // wxStaticLine -#define wxUSE_STATTEXT 1 // wxStaticText -#define wxUSE_STATBMP 1 // wxStaticBitmap -#define wxUSE_TEXTCTRL 1 // wxTextCtrl -#define wxUSE_TOGGLEBTN 1 // wxToggleButton -#define wxUSE_TREECTRL 1 // wxTreeCtrl +#define wxUSE_BUTTON 1 // wxButton +#define wxUSE_BMPBUTTON 1 // wxBitmapButton +#define wxUSE_CALENDARCTRL 1 // wxCalendarCtrl +#define wxUSE_CHECKBOX 1 // wxCheckBox +#define wxUSE_CHECKLISTBOX 1 // wxCheckListBox +#define wxUSE_CHOICE 1 // wxChoice +#define wxUSE_COLOURPICKERCTRL 1 // wxColourPickerCtrl +#define wxUSE_COMBOBOX 1 // wxComboBox +#define wxUSE_DATAVIEWCTRL 1 // wxDataViewCtrl +#define wxUSE_DATEPICKCTRL 1 // wxDatePickerCtrl +#define wxUSE_DIRPICKERCTRL 1 // wxDirPickerCtrl +#define wxUSE_FILEPICKERCTRL 1 // wxFilePickerCtrl +#define wxUSE_FONTPICKERCTRL 1 // wxFontPickerCtrl +#define wxUSE_GAUGE 1 // wxGauge +#define wxUSE_HYPERLINKCTRL 1 // wxHyperlinkCtrl +#define wxUSE_LISTBOX 1 // wxListBox +#define wxUSE_LISTCTRL 1 // wxListCtrl +#define wxUSE_RADIOBOX 1 // wxRadioBox +#define wxUSE_RADIOBTN 1 // wxRadioButton +#define wxUSE_SCROLLBAR 1 // wxScrollBar +#define wxUSE_SLIDER 1 // wxSlider +#define wxUSE_SPINBTN 1 // wxSpinButton +#define wxUSE_SPINCTRL 1 // wxSpinCtrl +#define wxUSE_STATBOX 1 // wxStaticBox +#define wxUSE_STATLINE 1 // wxStaticLine +#define wxUSE_STATTEXT 1 // wxStaticText +#define wxUSE_STATBMP 1 // wxStaticBitmap +#define wxUSE_TEXTCTRL 1 // wxTextCtrl +#define wxUSE_TOGGLEBTN 1 // wxToggleButton +#define wxUSE_TREECTRL 1 // wxTreeCtrl // Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR // below either wxStatusBar95 or a generic wxStatusBar will be used. -- 2.45.2