X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a1873279648582e6af46f9103460da50bf5e03b9..58fd7634cf871b8b03f004d97b518959ced287e8:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 69c5596644..4be6647b50 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1526,6 +1526,7 @@ XRCDLL_OBJECTS =  \
 	xrcdll_xh_notbk.o \
 	xrcdll_xh_odcombo.o \
 	xrcdll_xh_panel.o \
+	xrcdll_xh_propdlg.o \
 	xrcdll_xh_radbt.o \
 	xrcdll_xh_radbx.o \
 	xrcdll_xh_scrol.o \
@@ -1535,6 +1536,7 @@ XRCDLL_OBJECTS =  \
 	xrcdll_xh_slidr.o \
 	xrcdll_xh_spin.o \
 	xrcdll_xh_split.o \
+	xrcdll_xh_srchctrl.o \
 	xrcdll_xh_statbar.o \
 	xrcdll_xh_stbmp.o \
 	xrcdll_xh_stbox.o \
@@ -1588,6 +1590,7 @@ XRCLIB_OBJECTS =  \
 	xrclib_xh_notbk.o \
 	xrclib_xh_odcombo.o \
 	xrclib_xh_panel.o \
+	xrclib_xh_propdlg.o \
 	xrclib_xh_radbt.o \
 	xrclib_xh_radbx.o \
 	xrclib_xh_scrol.o \
@@ -1597,6 +1600,7 @@ XRCLIB_OBJECTS =  \
 	xrclib_xh_slidr.o \
 	xrclib_xh_spin.o \
 	xrclib_xh_split.o \
+	xrclib_xh_srchctrl.o \
 	xrclib_xh_statbar.o \
 	xrclib_xh_stbmp.o \
 	xrclib_xh_stbox.o \
@@ -2177,6 +2181,7 @@ COND_TOOLKIT_COCOA_GUI_HDR =  \
 	wx/cocoa/NSMenu.h \
 	wx/cocoa/NSPanel.h \
 	wx/cocoa/NSScroller.h \
+	wx/cocoa/NSSlider.h \
 	wx/cocoa/NSTabView.h \
 	wx/cocoa/NSTableView.h \
 	wx/cocoa/NSTextField.h \
@@ -2240,6 +2245,7 @@ COND_TOOLKIT_COCOA_GUI_HDR =  \
 	wx/cocoa/tooltip.h \
 	wx/cocoa/toplevel.h \
 	wx/cocoa/window.h \
+	wx/cocoa/objc/objc_uniquifying.h \
 	wx/generic/caret.h \
 	wx/generic/fdrepdlg.h \
 	wx/generic/fontdlgg.h \
@@ -2304,6 +2310,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_GUI_HDR =  \
 	wx/gtk/button.h \
 	wx/gtk/checkbox.h \
 	wx/gtk/checklst.h \
+	wx/gtk/chkconf.h \
 	wx/gtk/collpane.h \
 	wx/gtk/colordlg.h \
 	wx/gtk/choice.h \
@@ -2518,6 +2525,7 @@ COND_TOOLKIT_MAC_GUI_HDR =  \
 @COND_TOOLKIT_MAC@GUI_HDR = $(COND_TOOLKIT_MAC_GUI_HDR)
 COND_TOOLKIT_MOTIF_GUI_HDR =  \
 	wx/generic/colrdlgg.h \
+	wx/generic/ctrlsub.h \
 	wx/generic/dirdlgg.h \
 	wx/generic/fdrepdlg.h \
 	wx/generic/fontdlgg.h \
@@ -2540,6 +2548,7 @@ COND_TOOLKIT_MOTIF_GUI_HDR =  \
 	wx/motif/colour.h \
 	wx/motif/combobox.h \
 	wx/motif/control.h \
+	wx/motif/ctrlsub.h \
 	wx/motif/cursor.h \
 	wx/motif/dataform.h \
 	wx/motif/dataobj.h \
@@ -2599,6 +2608,7 @@ COND_TOOLKIT_MSW_GUI_HDR =  \
 	wx/msw/combo.h \
 	wx/msw/combobox.h \
 	wx/msw/control.h \
+	wx/msw/ctrlsub.h \
 	wx/msw/cursor.h \
 	wx/msw/dc.h \
 	wx/msw/dcclient.h \
@@ -2791,6 +2801,7 @@ COND_TOOLKIT_WINCE_GUI_HDR =  \
 	wx/msw/combo.h \
 	wx/msw/combobox.h \
 	wx/msw/control.h \
+	wx/msw/ctrlsub.h \
 	wx/msw/cursor.h \
 	wx/msw/dc.h \
 	wx/msw/dcclient.h \
@@ -3024,6 +3035,7 @@ 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/ctrlsub.h \
 	wx/generic/dirdlgg.h \
 	wx/generic/fdrepdlg.h \
 	wx/generic/fontdlgg.h \
@@ -3067,6 +3079,7 @@ COND_USE_GUI_1_WXUNIV_1_GUI_CORE_HEADERS =  \
 	wx/univ/stdrend.h \
 	wx/univ/textctrl.h \
 	wx/univ/theme.h \
+	wx/univ/tglbtn.h \
 	wx/univ/toolbar.h \
 	wx/univ/toplevel.h \
 	wx/univ/window.h
@@ -3325,6 +3338,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
 	wx/xrc/xh_notbk.h \
 	wx/xrc/xh_odcombo.h \
 	wx/xrc/xh_panel.h \
+	wx/xrc/xh_propdlg.h \
 	wx/xrc/xh_radbt.h \
 	wx/xrc/xh_radbx.h \
 	wx/xrc/xh_scrol.h \
@@ -3334,6 +3348,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
 	wx/xrc/xh_slidr.h \
 	wx/xrc/xh_spin.h \
 	wx/xrc/xh_split.h \
+	wx/xrc/xh_srchctrl.h \
 	wx/xrc/xh_statbar.h \
 	wx/xrc/xh_stbmp.h \
 	wx/xrc/xh_stbox.h \
@@ -3689,6 +3704,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS =  \
 	monodll_xh_notbk.o \
 	monodll_xh_odcombo.o \
 	monodll_xh_panel.o \
+	monodll_xh_propdlg.o \
 	monodll_xh_radbt.o \
 	monodll_xh_radbx.o \
 	monodll_xh_scrol.o \
@@ -3698,6 +3714,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS =  \
 	monodll_xh_slidr.o \
 	monodll_xh_spin.o \
 	monodll_xh_split.o \
+	monodll_xh_srchctrl.o \
 	monodll_xh_statbar.o \
 	monodll_xh_stbmp.o \
 	monodll_xh_stbox.o \
@@ -4339,6 +4356,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS =  \
 	monodll_NSMenu.o \
 	monodll_NSPanel.o \
 	monodll_NSScroller.o \
+	monodll_NSSlider.o \
 	monodll_NSTabView.o \
 	monodll_NSTableView.o \
 	monodll_NSTextField.o \
@@ -5531,6 +5549,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 =  \
 	monolib_xh_notbk.o \
 	monolib_xh_odcombo.o \
 	monolib_xh_panel.o \
+	monolib_xh_propdlg.o \
 	monolib_xh_radbt.o \
 	monolib_xh_radbx.o \
 	monolib_xh_scrol.o \
@@ -5540,6 +5559,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 =  \
 	monolib_xh_slidr.o \
 	monolib_xh_spin.o \
 	monolib_xh_split.o \
+	monolib_xh_srchctrl.o \
 	monolib_xh_statbar.o \
 	monolib_xh_stbmp.o \
 	monolib_xh_stbox.o \
@@ -6182,6 +6202,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 =  \
 	monolib_NSMenu.o \
 	monolib_NSPanel.o \
 	monolib_NSScroller.o \
+	monolib_NSSlider.o \
 	monolib_NSTabView.o \
 	monolib_NSTableView.o \
 	monolib_NSTextField.o \
@@ -8301,6 +8322,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 =  \
 	coredll_NSMenu.o \
 	coredll_NSPanel.o \
 	coredll_NSScroller.o \
+	coredll_NSSlider.o \
 	coredll_NSTabView.o \
 	coredll_NSTableView.o \
 	coredll_NSTextField.o \
@@ -9756,6 +9778,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 =  \
 	corelib_NSMenu.o \
 	corelib_NSPanel.o \
 	corelib_NSScroller.o \
+	corelib_NSSlider.o \
 	corelib_NSTabView.o \
 	corelib_NSTableView.o \
 	corelib_NSTextField.o \
@@ -13878,6 +13901,9 @@ monodll_NSPanel.o: $(srcdir)/src/cocoa/NSPanel.mm $(MONODLL_ODEP)
 monodll_NSScroller.o: $(srcdir)/src/cocoa/NSScroller.mm $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/NSScroller.mm
 
+monodll_NSSlider.o: $(srcdir)/src/cocoa/NSSlider.mm $(MONODLL_ODEP)
+	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/NSSlider.mm
+
 monodll_NSTabView.o: $(srcdir)/src/cocoa/NSTabView.mm $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/NSTabView.mm
 
@@ -14142,6 +14168,9 @@ monodll_xh_odcombo.o: $(srcdir)/src/xrc/xh_odcombo.cpp $(MONODLL_ODEP)
 monodll_xh_panel.o: $(srcdir)/src/xrc/xh_panel.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_panel.cpp
 
+monodll_xh_propdlg.o: $(srcdir)/src/xrc/xh_propdlg.cpp $(MONODLL_ODEP)
+	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_propdlg.cpp
+
 monodll_xh_radbt.o: $(srcdir)/src/xrc/xh_radbt.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_radbt.cpp
 
@@ -14169,6 +14198,9 @@ monodll_xh_spin.o: $(srcdir)/src/xrc/xh_spin.cpp $(MONODLL_ODEP)
 monodll_xh_split.o: $(srcdir)/src/xrc/xh_split.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_split.cpp
 
+monodll_xh_srchctrl.o: $(srcdir)/src/xrc/xh_srchctrl.cpp $(MONODLL_ODEP)
+	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_srchctrl.cpp
+
 monodll_xh_statbar.o: $(srcdir)/src/xrc/xh_statbar.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_statbar.cpp
 
@@ -18195,6 +18227,9 @@ monolib_NSPanel.o: $(srcdir)/src/cocoa/NSPanel.mm $(MONOLIB_ODEP)
 monolib_NSScroller.o: $(srcdir)/src/cocoa/NSScroller.mm $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/NSScroller.mm
 
+monolib_NSSlider.o: $(srcdir)/src/cocoa/NSSlider.mm $(MONOLIB_ODEP)
+	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/NSSlider.mm
+
 monolib_NSTabView.o: $(srcdir)/src/cocoa/NSTabView.mm $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/NSTabView.mm
 
@@ -18459,6 +18494,9 @@ monolib_xh_odcombo.o: $(srcdir)/src/xrc/xh_odcombo.cpp $(MONOLIB_ODEP)
 monolib_xh_panel.o: $(srcdir)/src/xrc/xh_panel.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_panel.cpp
 
+monolib_xh_propdlg.o: $(srcdir)/src/xrc/xh_propdlg.cpp $(MONOLIB_ODEP)
+	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_propdlg.cpp
+
 monolib_xh_radbt.o: $(srcdir)/src/xrc/xh_radbt.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_radbt.cpp
 
@@ -18486,6 +18524,9 @@ monolib_xh_spin.o: $(srcdir)/src/xrc/xh_spin.cpp $(MONOLIB_ODEP)
 monolib_xh_split.o: $(srcdir)/src/xrc/xh_split.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_split.cpp
 
+monolib_xh_srchctrl.o: $(srcdir)/src/xrc/xh_srchctrl.cpp $(MONOLIB_ODEP)
+	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_srchctrl.cpp
+
 monolib_xh_statbar.o: $(srcdir)/src/xrc/xh_statbar.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_statbar.cpp
 
@@ -23838,6 +23879,9 @@ coredll_NSPanel.o: $(srcdir)/src/cocoa/NSPanel.mm $(COREDLL_ODEP)
 coredll_NSScroller.o: $(srcdir)/src/cocoa/NSScroller.mm $(COREDLL_ODEP)
 	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/NSScroller.mm
 
+coredll_NSSlider.o: $(srcdir)/src/cocoa/NSSlider.mm $(COREDLL_ODEP)
+	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/NSSlider.mm
+
 coredll_NSTabView.o: $(srcdir)/src/cocoa/NSTabView.mm $(COREDLL_ODEP)
 	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/NSTabView.mm
 
@@ -26793,6 +26837,9 @@ corelib_NSPanel.o: $(srcdir)/src/cocoa/NSPanel.mm $(CORELIB_ODEP)
 corelib_NSScroller.o: $(srcdir)/src/cocoa/NSScroller.mm $(CORELIB_ODEP)
 	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/NSScroller.mm
 
+corelib_NSSlider.o: $(srcdir)/src/cocoa/NSSlider.mm $(CORELIB_ODEP)
+	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/NSSlider.mm
+
 corelib_NSTabView.o: $(srcdir)/src/cocoa/NSTabView.mm $(CORELIB_ODEP)
 	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/NSTabView.mm
 
@@ -30450,6 +30497,9 @@ xrcdll_xh_odcombo.o: $(srcdir)/src/xrc/xh_odcombo.cpp $(XRCDLL_ODEP)
 xrcdll_xh_panel.o: $(srcdir)/src/xrc/xh_panel.cpp $(XRCDLL_ODEP)
 	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_panel.cpp
 
+xrcdll_xh_propdlg.o: $(srcdir)/src/xrc/xh_propdlg.cpp $(XRCDLL_ODEP)
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_propdlg.cpp
+
 xrcdll_xh_radbt.o: $(srcdir)/src/xrc/xh_radbt.cpp $(XRCDLL_ODEP)
 	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_radbt.cpp
 
@@ -30477,6 +30527,9 @@ xrcdll_xh_spin.o: $(srcdir)/src/xrc/xh_spin.cpp $(XRCDLL_ODEP)
 xrcdll_xh_split.o: $(srcdir)/src/xrc/xh_split.cpp $(XRCDLL_ODEP)
 	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_split.cpp
 
+xrcdll_xh_srchctrl.o: $(srcdir)/src/xrc/xh_srchctrl.cpp $(XRCDLL_ODEP)
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_srchctrl.cpp
+
 xrcdll_xh_statbar.o: $(srcdir)/src/xrc/xh_statbar.cpp $(XRCDLL_ODEP)
 	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_statbar.cpp
 
@@ -30615,6 +30668,9 @@ xrclib_xh_odcombo.o: $(srcdir)/src/xrc/xh_odcombo.cpp $(XRCLIB_ODEP)
 xrclib_xh_panel.o: $(srcdir)/src/xrc/xh_panel.cpp $(XRCLIB_ODEP)
 	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_panel.cpp
 
+xrclib_xh_propdlg.o: $(srcdir)/src/xrc/xh_propdlg.cpp $(XRCLIB_ODEP)
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_propdlg.cpp
+
 xrclib_xh_radbt.o: $(srcdir)/src/xrc/xh_radbt.cpp $(XRCLIB_ODEP)
 	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_radbt.cpp
 
@@ -30642,6 +30698,9 @@ xrclib_xh_spin.o: $(srcdir)/src/xrc/xh_spin.cpp $(XRCLIB_ODEP)
 xrclib_xh_split.o: $(srcdir)/src/xrc/xh_split.cpp $(XRCLIB_ODEP)
 	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_split.cpp
 
+xrclib_xh_srchctrl.o: $(srcdir)/src/xrc/xh_srchctrl.cpp $(XRCLIB_ODEP)
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_srchctrl.cpp
+
 xrclib_xh_statbar.o: $(srcdir)/src/xrc/xh_statbar.cpp $(XRCLIB_ODEP)
 	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_statbar.cpp