X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/de97c9d7d93518c60cda4c06c7283bbf3c559945..3952889a9022dfa7ae4fa635b5f267fe13016d48:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index a55c9c2885..3abf9a4138 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -232,6 +232,7 @@ ALL_BASE_HEADERS =  \
 	wx/cmdline.h \
 	wx/confbase.h \
 	wx/config.h \
+	wx/convauto.h \
 	wx/containr.h \
 	wx/datetime.h \
 	wx/datstrm.h \
@@ -359,6 +360,7 @@ ALL_PORTS_BASE_HEADERS =  \
 	wx/cmdline.h \
 	wx/confbase.h \
 	wx/config.h \
+	wx/convauto.h \
 	wx/containr.h \
 	wx/datetime.h \
 	wx/datstrm.h \
@@ -513,6 +515,7 @@ ALL_BASE_SOURCES =  \
 	src/common/clntdata.cpp \
 	src/common/cmdline.cpp \
 	src/common/config.cpp \
+	src/common/convauto.cpp \
 	src/common/datetime.cpp \
 	src/common/datstrm.cpp \
 	src/common/dircmn.cpp \
@@ -657,6 +660,7 @@ MONODLL_OBJECTS =  \
 	monodll_clntdata.o \
 	monodll_cmdline.o \
 	monodll_config.o \
+	monodll_convauto.o \
 	monodll_datetime.o \
 	monodll_datstrm.o \
 	monodll_dircmn.o \
@@ -746,6 +750,7 @@ MONOLIB_OBJECTS =  \
 	monolib_clntdata.o \
 	monolib_cmdline.o \
 	monolib_config.o \
+	monolib_convauto.o \
 	monolib_datetime.o \
 	monolib_datstrm.o \
 	monolib_dircmn.o \
@@ -837,6 +842,7 @@ BASEDLL_OBJECTS =  \
 	basedll_clntdata.o \
 	basedll_cmdline.o \
 	basedll_config.o \
+	basedll_convauto.o \
 	basedll_datetime.o \
 	basedll_datstrm.o \
 	basedll_dircmn.o \
@@ -911,6 +917,7 @@ BASELIB_OBJECTS =  \
 	baselib_clntdata.o \
 	baselib_cmdline.o \
 	baselib_config.o \
+	baselib_convauto.o \
 	baselib_datetime.o \
 	baselib_datstrm.o \
 	baselib_dircmn.o \
@@ -1860,6 +1867,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_GUI_HDR =  \
 	wx/gtk/frame.h \
 	wx/gtk/gauge.h \
 	wx/gtk/gnome/gprint.h \
+	wx/gtk/gnome/gvfs.h \
 	wx/gtk/listbox.h \
 	wx/gtk/mdi.h \
 	wx/gtk/menu.h \
@@ -2468,6 +2476,7 @@ COND_WXUNIV_0_ADVANCED_HDR =  \
 	wx/dcbuffer.h \
 	wx/generic/calctrl.h \
 	wx/generic/datectrl.h \
+	wx/generic/dataview.h \
 	wx/generic/grid.h \
 	wx/generic/gridctrl.h \
 	wx/generic/gridsel.h \
@@ -2504,6 +2513,7 @@ COND_WXUNIV_1_ADVANCED_HDR =  \
 	wx/dcbuffer.h \
 	wx/generic/calctrl.h \
 	wx/generic/datectrl.h \
+	wx/generic/dataview.h \
 	wx/generic/grid.h \
 	wx/generic/gridctrl.h \
 	wx/generic/gridsel.h \
@@ -3790,6 +3800,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS =  \
 	monodll_frame.o \
 	monodll_gauge.o \
 	monodll_gprint.o \
+	monodll_gvfs.o \
 	monodll_listbox.o \
 	monodll_mdi.o \
 	monodll_menu.o \
@@ -4425,6 +4436,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1 =  \
 COND_WXUNIV_0___ADVANCED_SRC_OBJECTS =  \
 	monodll_datavcmn.o \
 	monodll_calctrl.o \
+	monodll_datavgen.o \
 	monodll_datectlg.o \
 	monodll_grid.o \
 	monodll_gridctrl.o \
@@ -4447,6 +4459,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS =  \
 COND_WXUNIV_1___ADVANCED_SRC_OBJECTS =  \
 	monodll_datavcmn.o \
 	monodll_calctrl.o \
+	monodll_datavgen.o \
 	monodll_datectlg.o \
 	monodll_grid.o \
 	monodll_gridctrl.o \
@@ -5410,6 +5423,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_1 =  \
 	monolib_frame.o \
 	monolib_gauge.o \
 	monolib_gprint.o \
+	monolib_gvfs.o \
 	monolib_listbox.o \
 	monolib_mdi.o \
 	monolib_menu.o \
@@ -6046,6 +6060,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3 =  \
 COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_1 =  \
 	monolib_datavcmn.o \
 	monolib_calctrl.o \
+	monolib_datavgen.o \
 	monolib_datectlg.o \
 	monolib_grid.o \
 	monolib_gridctrl.o \
@@ -6068,6 +6083,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_1 =  \
 COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_1 =  \
 	monolib_datavcmn.o \
 	monolib_calctrl.o \
+	monolib_datavgen.o \
 	monolib_datectlg.o \
 	monolib_grid.o \
 	monolib_gridctrl.o \
@@ -7263,6 +7279,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_2 =  \
 	coredll_frame.o \
 	coredll_gauge.o \
 	coredll_gprint.o \
+	coredll_gvfs.o \
 	coredll_listbox.o \
 	coredll_mdi.o \
 	coredll_menu.o \
@@ -8592,6 +8609,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_3 =  \
 	corelib_frame.o \
 	corelib_gauge.o \
 	corelib_gprint.o \
+	corelib_gvfs.o \
 	corelib_listbox.o \
 	corelib_mdi.o \
 	corelib_menu.o \
@@ -9274,6 +9292,7 @@ COND_USE_SOSYMLINKS_1___advdll___so_symlinks_inst_cmd = rm -f \
 COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_2 =  \
 	advdll_datavcmn.o \
 	advdll_calctrl.o \
+	advdll_datavgen.o \
 	advdll_datectlg.o \
 	advdll_grid.o \
 	advdll_gridctrl.o \
@@ -9296,6 +9315,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_2 =  \
 COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_2 =  \
 	advdll_datavcmn.o \
 	advdll_calctrl.o \
+	advdll_datavgen.o \
 	advdll_datectlg.o \
 	advdll_grid.o \
 	advdll_gridctrl.o \
@@ -9333,6 +9353,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname = \
 COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_3 =  \
 	advlib_datavcmn.o \
 	advlib_calctrl.o \
+	advlib_datavgen.o \
 	advlib_datectlg.o \
 	advlib_grid.o \
 	advlib_gridctrl.o \
@@ -9355,6 +9376,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_3 =  \
 COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3 =  \
 	advlib_datavcmn.o \
 	advlib_calctrl.o \
+	advlib_datavgen.o \
 	advlib_datectlg.o \
 	advlib_grid.o \
 	advlib_gridctrl.o \
@@ -11121,6 +11143,9 @@ monodll_cmdline.o: $(srcdir)/src/common/cmdline.cpp $(MONODLL_ODEP)
 monodll_config.o: $(srcdir)/src/common/config.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/config.cpp
 
+monodll_convauto.o: $(srcdir)/src/common/convauto.cpp $(MONODLL_ODEP)
+	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/convauto.cpp
+
 monodll_datetime.o: $(srcdir)/src/common/datetime.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/datetime.cpp
 
@@ -11388,6 +11413,9 @@ monodll_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(MONODLL_ODEP)
 monodll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/gnome/gprint.cpp
 
+monodll_gvfs.o: $(srcdir)/src/gtk/gnome/gvfs.cpp $(MONODLL_ODEP)
+	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/gnome/gvfs.cpp
+
 monodll_treeentry_gtk.o: $(srcdir)/src/gtk/treeentry_gtk.c $(MONODLL_ODEP)
 	$(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/gtk/treeentry_gtk.c
 
@@ -14709,6 +14737,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@monodll_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/calctrl.cpp
 
+@COND_USE_GUI_1@monodll_datavgen.o: $(srcdir)/src/generic/datavgen.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/datavgen.cpp
+
 @COND_USE_GUI_1@monodll_datectlg.o: $(srcdir)/src/generic/datectlg.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/datectlg.cpp
 
@@ -14898,6 +14929,9 @@ monolib_cmdline.o: $(srcdir)/src/common/cmdline.cpp $(MONOLIB_ODEP)
 monolib_config.o: $(srcdir)/src/common/config.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/config.cpp
 
+monolib_convauto.o: $(srcdir)/src/common/convauto.cpp $(MONOLIB_ODEP)
+	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/convauto.cpp
+
 monolib_datetime.o: $(srcdir)/src/common/datetime.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/datetime.cpp
 
@@ -15165,6 +15199,9 @@ monolib_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(MONOLIB_ODEP)
 monolib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/gnome/gprint.cpp
 
+monolib_gvfs.o: $(srcdir)/src/gtk/gnome/gvfs.cpp $(MONOLIB_ODEP)
+	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/gnome/gvfs.cpp
+
 monolib_treeentry_gtk.o: $(srcdir)/src/gtk/treeentry_gtk.c $(MONOLIB_ODEP)
 	$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/gtk/treeentry_gtk.c
 
@@ -18486,6 +18523,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@monolib_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/calctrl.cpp
 
+@COND_USE_GUI_1@monolib_datavgen.o: $(srcdir)/src/generic/datavgen.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/datavgen.cpp
+
 @COND_USE_GUI_1@monolib_datectlg.o: $(srcdir)/src/generic/datectlg.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/datectlg.cpp
 
@@ -18678,6 +18718,9 @@ basedll_cmdline.o: $(srcdir)/src/common/cmdline.cpp $(BASEDLL_ODEP)
 basedll_config.o: $(srcdir)/src/common/config.cpp $(BASEDLL_ODEP)
 	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/config.cpp
 
+basedll_convauto.o: $(srcdir)/src/common/convauto.cpp $(BASEDLL_ODEP)
+	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/convauto.cpp
+
 basedll_datetime.o: $(srcdir)/src/common/datetime.cpp $(BASEDLL_ODEP)
 	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/datetime.cpp
 
@@ -19230,6 +19273,9 @@ baselib_cmdline.o: $(srcdir)/src/common/cmdline.cpp $(BASELIB_ODEP)
 baselib_config.o: $(srcdir)/src/common/config.cpp $(BASELIB_ODEP)
 	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/config.cpp
 
+baselib_convauto.o: $(srcdir)/src/common/convauto.cpp $(BASELIB_ODEP)
+	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/convauto.cpp
+
 baselib_datetime.o: $(srcdir)/src/common/datetime.cpp $(BASELIB_ODEP)
 	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/datetime.cpp
 
@@ -19902,6 +19948,9 @@ coredll_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(COREDLL_ODEP)
 coredll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(COREDLL_ODEP)
 	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/gnome/gprint.cpp
 
+coredll_gvfs.o: $(srcdir)/src/gtk/gnome/gvfs.cpp $(COREDLL_ODEP)
+	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/gnome/gvfs.cpp
+
 coredll_treeentry_gtk.o: $(srcdir)/src/gtk/treeentry_gtk.c $(COREDLL_ODEP)
 	$(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/gtk/treeentry_gtk.c
 
@@ -22668,6 +22717,9 @@ corelib_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(CORELIB_ODEP)
 corelib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(CORELIB_ODEP)
 	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/gnome/gprint.cpp
 
+corelib_gvfs.o: $(srcdir)/src/gtk/gnome/gvfs.cpp $(CORELIB_ODEP)
+	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/gnome/gvfs.cpp
+
 corelib_treeentry_gtk.o: $(srcdir)/src/gtk/treeentry_gtk.c $(CORELIB_ODEP)
 	$(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/gtk/treeentry_gtk.c
 
@@ -25419,6 +25471,9 @@ advdll_datavcmn.o: $(srcdir)/src/common/datavcmn.cpp $(ADVDLL_ODEP)
 advdll_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(ADVDLL_ODEP)
 	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/calctrl.cpp
 
+advdll_datavgen.o: $(srcdir)/src/generic/datavgen.cpp $(ADVDLL_ODEP)
+	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/datavgen.cpp
+
 advdll_datectlg.o: $(srcdir)/src/generic/datectlg.cpp $(ADVDLL_ODEP)
 	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/datectlg.cpp
 
@@ -25590,6 +25645,9 @@ advlib_datavcmn.o: $(srcdir)/src/common/datavcmn.cpp $(ADVLIB_ODEP)
 advlib_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(ADVLIB_ODEP)
 	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/calctrl.cpp
 
+advlib_datavgen.o: $(srcdir)/src/generic/datavgen.cpp $(ADVLIB_ODEP)
+	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/datavgen.cpp
+
 advlib_datectlg.o: $(srcdir)/src/generic/datectlg.cpp $(ADVLIB_ODEP)
 	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/datectlg.cpp
 
@@ -26844,9 +26902,7 @@ DEMOS_DIST: ALL_GUI_DIST
 	$(CP_P) $(DEMODIR)/forty/*.h $(DISTDIR)/demos/forty
 	$(CP_P) $(DEMODIR)/forty/*.cpp $(DISTDIR)/demos/forty
 	$(CP_P) $(DEMODIR)/forty/*.xpm $(DISTDIR)/demos/forty
-	$(CP_P) $(DEMODIR)/forty/*.xbm $(DISTDIR)/demos/forty
 	$(CP_P) $(DEMODIR)/forty/*.htm $(DISTDIR)/demos/forty
-	$(CP_P) $(DEMODIR)/forty/*.bmp $(DISTDIR)/demos/forty
 	$(CP_P) $(DEMODIR)/forty/*.ico $(DISTDIR)/demos/forty
 	$(CP_P) $(DEMODIR)/forty/*.rc $(DISTDIR)/demos/forty
 	$(CP_P) $(DEMODIR)/forty/readme.txt $(DISTDIR)/demos/forty