X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/50acee04cdaf2fec9f3fa4cd0035ff2d9ed7d53a..6e204d57c44bdaaace6b0a45409c00a2af43d8ab:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index e72cef992b..0a75fd4708 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1279,6 +1279,7 @@ XRCDLL_OBJECTS =  \
 	xrcdll_xh_listc.o \
 	xrcdll_xh_menu.o \
 	xrcdll_xh_notbk.o \
+	xrcdll_xh_odcombo.o \
 	xrcdll_xh_panel.o \
 	xrcdll_xh_radbt.o \
 	xrcdll_xh_radbx.o \
@@ -1335,6 +1336,7 @@ XRCLIB_OBJECTS =  \
 	xrclib_xh_listc.o \
 	xrclib_xh_menu.o \
 	xrclib_xh_notbk.o \
+	xrclib_xh_odcombo.o \
 	xrclib_xh_panel.o \
 	xrclib_xh_radbt.o \
 	xrclib_xh_radbx.o \
@@ -2177,9 +2179,9 @@ COND_TOOLKIT_MOTIF_GUI_HDR =  \
 	wx/motif/window.h
 @COND_TOOLKIT_MOTIF@GUI_HDR = $(COND_TOOLKIT_MOTIF_GUI_HDR)
 COND_TOOLKIT_MSW_GUI_HDR =  \
-	wx/generic/clrpicker.h \
-	wx/generic/fontpicker.h \
-	wx/generic/filepicker.h \
+	wx/generic/clrpickerg.h \
+	wx/generic/fontpickerg.h \
+	wx/generic/filepickerg.h \
 	wx/msw/accel.h \
 	wx/msw/app.h \
 	wx/msw/bitmap.h \
@@ -2371,9 +2373,9 @@ COND_TOOLKIT_PM_GUI_HDR =  \
 	wx/os2/window.h
 @COND_TOOLKIT_PM@GUI_HDR = $(COND_TOOLKIT_PM_GUI_HDR)
 COND_TOOLKIT_WINCE_GUI_HDR =  \
-	wx/generic/clrpicker.h \
-	wx/generic/fontpicker.h \
-	wx/generic/filepicker.h \
+	wx/generic/clrpickerg.h \
+	wx/generic/fontpickerg.h \
+	wx/generic/filepickerg.h \
 	wx/msw/accel.h \
 	wx/msw/app.h \
 	wx/msw/bitmap.h \
@@ -2801,6 +2803,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
 	wx/notebook.h \
 	wx/ownerdrw.h \
 	wx/paper.h \
+	wx/pickerbase.h \
 	wx/popupwin.h \
 	wx/print.h \
 	wx/printdlg.h \
@@ -2887,6 +2890,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
 	wx/xrc/xh_listc.h \
 	wx/xrc/xh_menu.h \
 	wx/xrc/xh_notbk.h \
+	wx/xrc/xh_odcombo.h \
 	wx/xrc/xh_panel.h \
 	wx/xrc/xh_radbt.h \
 	wx/xrc/xh_radbx.h \
@@ -3178,6 +3182,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS =  \
 	monodll_xh_listc.o \
 	monodll_xh_menu.o \
 	monodll_xh_notbk.o \
+	monodll_xh_odcombo.o \
 	monodll_xh_panel.o \
 	monodll_xh_radbt.o \
 	monodll_xh_radbx.o \
@@ -4842,6 +4847,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 =  \
 	monolib_xh_listc.o \
 	monolib_xh_menu.o \
 	monolib_xh_notbk.o \
+	monolib_xh_odcombo.o \
 	monolib_xh_panel.o \
 	monolib_xh_radbt.o \
 	monolib_xh_radbx.o \
@@ -12069,6 +12075,9 @@ monodll_xh_menu.o: $(srcdir)/src/xrc/xh_menu.cpp $(MONODLL_ODEP)
 monodll_xh_notbk.o: $(srcdir)/src/xrc/xh_notbk.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_notbk.cpp
 
+monodll_xh_odcombo.o: $(srcdir)/src/xrc/xh_odcombo.cpp $(MONODLL_ODEP)
+	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_odcombo.cpp
+
 monodll_xh_panel.o: $(srcdir)/src/xrc/xh_panel.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_panel.cpp
 
@@ -15942,6 +15951,9 @@ monolib_xh_menu.o: $(srcdir)/src/xrc/xh_menu.cpp $(MONOLIB_ODEP)
 monolib_xh_notbk.o: $(srcdir)/src/xrc/xh_notbk.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_notbk.cpp
 
+monolib_xh_odcombo.o: $(srcdir)/src/xrc/xh_odcombo.cpp $(MONOLIB_ODEP)
+	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_odcombo.cpp
+
 monolib_xh_panel.o: $(srcdir)/src/xrc/xh_panel.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_panel.cpp
 
@@ -26793,6 +26805,9 @@ xrcdll_xh_menu.o: $(srcdir)/src/xrc/xh_menu.cpp $(XRCDLL_ODEP)
 xrcdll_xh_notbk.o: $(srcdir)/src/xrc/xh_notbk.cpp $(XRCDLL_ODEP)
 	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_notbk.cpp
 
+xrcdll_xh_odcombo.o: $(srcdir)/src/xrc/xh_odcombo.cpp $(XRCDLL_ODEP)
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_odcombo.cpp
+
 xrcdll_xh_panel.o: $(srcdir)/src/xrc/xh_panel.cpp $(XRCDLL_ODEP)
 	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_panel.cpp
 
@@ -26943,6 +26958,9 @@ xrclib_xh_menu.o: $(srcdir)/src/xrc/xh_menu.cpp $(XRCLIB_ODEP)
 xrclib_xh_notbk.o: $(srcdir)/src/xrc/xh_notbk.cpp $(XRCLIB_ODEP)
 	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_notbk.cpp
 
+xrclib_xh_odcombo.o: $(srcdir)/src/xrc/xh_odcombo.cpp $(XRCLIB_ODEP)
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_odcombo.cpp
+
 xrclib_xh_panel.o: $(srcdir)/src/xrc/xh_panel.cpp $(XRCLIB_ODEP)
 	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_panel.cpp
 
@@ -27110,6 +27128,7 @@ GENDIR   = $(WXDIR)/src/generic
 COMMDIR  = $(WXDIR)/src/common
 HTMLDIR  = $(WXDIR)/src/html
 RICHTEXTDIR = $(WXDIR)/src/richtext
+AUIDIR =   $(WXDIR)/src/aui
 UNIXDIR  = $(WXDIR)/src/unix
 PNGDIR   = $(WXDIR)/src/png
 JPEGDIR  = $(WXDIR)/src/jpeg
@@ -27253,6 +27272,7 @@ ALL_GUI_DIST: ALL_DIST
 	mkdir $(DISTDIR)/include/wx/generic
 	mkdir $(DISTDIR)/include/wx/html
 	mkdir $(DISTDIR)/include/wx/richtext
+	mkdir $(DISTDIR)/include/wx/aui
 	mkdir $(DISTDIR)/include/wx/protocol
 	mkdir $(DISTDIR)/include/wx/unix
 	mkdir $(DISTDIR)/include/wx/xml
@@ -27262,6 +27282,7 @@ ALL_GUI_DIST: ALL_DIST
 	$(CP_P) $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic
 	$(CP_P) $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html
 	$(CP_P) $(INCDIR)/wx/richtext/*.h $(DISTDIR)/include/wx/richtext
+	$(CP_P) $(INCDIR)/wx/aui/*.h $(DISTDIR)/include/wx/aui
 	$(CP_P) $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix
 	$(CP_P) $(INCDIR)/wx/xml/*.h $(DISTDIR)/include/wx/xml
 	$(CP_P) $(INCDIR)/wx/xrc/*.h $(DISTDIR)/include/wx/xrc
@@ -27275,6 +27296,7 @@ ALL_GUI_DIST: ALL_DIST
 	mkdir $(DISTDIR)/src/generic
 	mkdir $(DISTDIR)/src/html
 	mkdir $(DISTDIR)/src/richtext
+	mkdir $(DISTDIR)/src/aui
 	mkdir $(DISTDIR)/src/$(TOOLKITDIR)
 	mkdir $(DISTDIR)/src/png
 	mkdir $(DISTDIR)/src/jpeg
@@ -27292,6 +27314,7 @@ ALL_GUI_DIST: ALL_DIST
 	$(CP_P) $(GENDIR)/*.mms $(DISTDIR)/src/generic
 	$(CP_P) $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
 	$(CP_P) $(RICHTEXTDIR)/*.cpp $(DISTDIR)/src/richtext
+	$(CP_P) $(AUIDIR)/*.cpp $(DISTDIR)/src/aui
 	$(CP_P) $(PNGDIR)/*.h $(DISTDIR)/src/png
 	$(CP_P) $(PNGDIR)/*.c $(DISTDIR)/src/png
 	$(CP_P) $(PNGDIR)/README $(DISTDIR)/src/png
@@ -27318,6 +27341,7 @@ BASE_DIST: ALL_DIST
 	mkdir $(DISTDIR)/include/wx/msw
 	mkdir $(DISTDIR)/include/wx/html
 	mkdir $(DISTDIR)/include/wx/richtext
+	mkdir $(DISTDIR)/include/wx/aui
 	mkdir $(DISTDIR)/include/wx/mac
 	mkdir $(DISTDIR)/include/wx/mac/carbon
 	mkdir $(DISTDIR)/include/wx/mac/corefoundation
@@ -28001,6 +28025,10 @@ SAMPLES_DIST: ALL_GUI_DIST
 	$(CP_P) $(SAMPDIR)/richtext/readme.txt $(DISTDIR)/samples/richtext
 	$(CP_P) $(SAMPDIR)/richtext/todo.txt $(DISTDIR)/samples/richtext
 
+	mkdir $(DISTDIR)/samples/aui
+	$(CP_P) $(SAMPDIR)/aui/Makefile.in $(DISTDIR)/samples/aui
+	$(CP_P) $(SAMPDIR)/aui/*.cpp $(DISTDIR)/samples/aui
+
 	mkdir $(DISTDIR)/samples/propsize
 	$(CP_P) $(SAMPDIR)/propsize/Makefile.in $(DISTDIR)/samples/propsize
 	$(CP_P) $(SAMPDIR)/propsize/makefile.unx $(DISTDIR)/samples/propsize