Added XRC handler for wxComboCtrl (closes #10151)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index bd27cd4206d69ff42a84b8853d646c219abde420..2f952b9ffef6869ba20b01283937e7529bc58530 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1552,6 +1552,7 @@ XRCDLL_OBJECTS =  \
        xrcdll_xh_clrpicker.o \
        xrcdll_xh_collpane.o \
        xrcdll_xh_combo.o \
        xrcdll_xh_clrpicker.o \
        xrcdll_xh_collpane.o \
        xrcdll_xh_combo.o \

+       xrcdll_xh_comboctrl.o \

        xrcdll_xh_datectrl.o \
        xrcdll_xh_dirpicker.o \
        xrcdll_xh_dlg.o \
        xrcdll_xh_datectrl.o \
        xrcdll_xh_dirpicker.o \
        xrcdll_xh_dlg.o \


@@ -1617,6 +1618,7 @@ XRCLIB_OBJECTS =  \
        xrclib_xh_clrpicker.o \
        xrclib_xh_collpane.o \
        xrclib_xh_combo.o \
        xrclib_xh_clrpicker.o \
        xrclib_xh_collpane.o \
        xrclib_xh_combo.o \

+       xrclib_xh_comboctrl.o \

        xrclib_xh_datectrl.o \
        xrclib_xh_dirpicker.o \
        xrclib_xh_dlg.o \
        xrclib_xh_datectrl.o \
        xrclib_xh_dirpicker.o \
        xrclib_xh_dlg.o \


@@ -3694,6 +3696,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
        wx/xrc/xh_clrpicker.h \
        wx/xrc/xh_collpane.h \
        wx/xrc/xh_combo.h \
        wx/xrc/xh_clrpicker.h \
        wx/xrc/xh_collpane.h \
        wx/xrc/xh_combo.h \

+       wx/xrc/xh_comboctrl.h \

        wx/xrc/xh_datectrl.h \
        wx/xrc/xh_dirpicker.h \
        wx/xrc/xh_dlg.h \
        wx/xrc/xh_datectrl.h \
        wx/xrc/xh_dirpicker.h \
        wx/xrc/xh_dlg.h \


@@ -3949,6 +3952,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS =  \
        monodll_xh_clrpicker.o \
        monodll_xh_collpane.o \
        monodll_xh_combo.o \
        monodll_xh_clrpicker.o \
        monodll_xh_collpane.o \
        monodll_xh_combo.o \

+       monodll_xh_comboctrl.o \

        monodll_xh_datectrl.o \
        monodll_xh_dirpicker.o \
        monodll_xh_dlg.o \
        monodll_xh_datectrl.o \
        monodll_xh_dirpicker.o \
        monodll_xh_dlg.o \


@@ -5761,6 +5765,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 =  \
        monolib_xh_clrpicker.o \
        monolib_xh_collpane.o \
        monolib_xh_combo.o \
        monolib_xh_clrpicker.o \
        monolib_xh_collpane.o \
        monolib_xh_combo.o \

+       monolib_xh_comboctrl.o \

        monolib_xh_datectrl.o \
        monolib_xh_dirpicker.o \
        monolib_xh_dlg.o \
        monolib_xh_datectrl.o \
        monolib_xh_dirpicker.o \
        monolib_xh_dlg.o \


@@ -15697,6 +15702,9 @@ monodll_xh_collpane.o: $(srcdir)/src/xrc/xh_collpane.cpp $(MONODLL_ODEP)
 monodll_xh_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_combo.cpp
 
 monodll_xh_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_combo.cpp
 

+monodll_xh_comboctrl.o: $(srcdir)/src/xrc/xh_comboctrl.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_comboctrl.cpp
+

 monodll_xh_datectrl.o: $(srcdir)/src/xrc/xh_datectrl.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_datectrl.cpp
 
 monodll_xh_datectrl.o: $(srcdir)/src/xrc/xh_datectrl.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_datectrl.cpp
 


@@ -20365,6 +20373,9 @@ monolib_xh_collpane.o: $(srcdir)/src/xrc/xh_collpane.cpp $(MONOLIB_ODEP)
 monolib_xh_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_combo.cpp
 
 monolib_xh_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_combo.cpp
 

+monolib_xh_comboctrl.o: $(srcdir)/src/xrc/xh_comboctrl.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_comboctrl.cpp
+

 monolib_xh_datectrl.o: $(srcdir)/src/xrc/xh_datectrl.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_datectrl.cpp
 
 monolib_xh_datectrl.o: $(srcdir)/src/xrc/xh_datectrl.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_datectrl.cpp
 


@@ -32260,6 +32271,9 @@ xrcdll_xh_collpane.o: $(srcdir)/src/xrc/xh_collpane.cpp $(XRCDLL_ODEP)
 xrcdll_xh_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_combo.cpp
 
 xrcdll_xh_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_combo.cpp
 

+xrcdll_xh_comboctrl.o: $(srcdir)/src/xrc/xh_comboctrl.cpp $(XRCDLL_ODEP)
+       $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_comboctrl.cpp
+

 xrcdll_xh_datectrl.o: $(srcdir)/src/xrc/xh_datectrl.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_datectrl.cpp
 
 xrcdll_xh_datectrl.o: $(srcdir)/src/xrc/xh_datectrl.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_datectrl.cpp
 


@@ -32434,6 +32448,9 @@ xrclib_xh_collpane.o: $(srcdir)/src/xrc/xh_collpane.cpp $(XRCLIB_ODEP)
 xrclib_xh_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_combo.cpp
 
 xrclib_xh_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_combo.cpp
 

+xrclib_xh_comboctrl.o: $(srcdir)/src/xrc/xh_comboctrl.cpp $(XRCLIB_ODEP)
+       $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_comboctrl.cpp
+

 xrclib_xh_datectrl.o: $(srcdir)/src/xrc/xh_datectrl.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_datectrl.cpp
 
 xrclib_xh_datectrl.o: $(srcdir)/src/xrc/xh_datectrl.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_datectrl.cpp
 

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 6fcc9760e5e27689ea9a44ed1c798de958136757..cd4598a3b83032c00aeae0582a6198caee8bbcad 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -3181,6 +3181,7 @@ src/osx/iphone/window.mm
     src/xrc/xh_clrpicker.cpp
     src/xrc/xh_collpane.cpp
     src/xrc/xh_combo.cpp
     src/xrc/xh_clrpicker.cpp
     src/xrc/xh_collpane.cpp
     src/xrc/xh_combo.cpp

+    src/xrc/xh_comboctrl.cpp

     src/xrc/xh_datectrl.cpp
     src/xrc/xh_dirpicker.cpp
     src/xrc/xh_dlg.cpp
     src/xrc/xh_datectrl.cpp
     src/xrc/xh_dirpicker.cpp
     src/xrc/xh_dlg.cpp


@@ -3244,6 +3245,7 @@ src/osx/iphone/window.mm
     wx/xrc/xh_clrpicker.h
     wx/xrc/xh_collpane.h
     wx/xrc/xh_combo.h
     wx/xrc/xh_clrpicker.h
     wx/xrc/xh_collpane.h
     wx/xrc/xh_combo.h

+    wx/xrc/xh_comboctrl.h

     wx/xrc/xh_datectrl.h
     wx/xrc/xh_dirpicker.h
     wx/xrc/xh_dlg.h
     wx/xrc/xh_datectrl.h
     wx/xrc/xh_dirpicker.h
     wx/xrc/xh_dlg.h

diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index cfa9a6c2aeb7eaee93e7229cffde956c181b7507..ebda828d8977a2ab997251d1c25ede3f92369c89 100644 (file)
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1073,6 +1073,7 @@ XRCDLL_OBJECTS =  \
        $(OBJS)\xrcdll_xh_clrpicker.obj \
        $(OBJS)\xrcdll_xh_collpane.obj \
        $(OBJS)\xrcdll_xh_combo.obj \
        $(OBJS)\xrcdll_xh_clrpicker.obj \
        $(OBJS)\xrcdll_xh_collpane.obj \
        $(OBJS)\xrcdll_xh_combo.obj \

+       $(OBJS)\xrcdll_xh_comboctrl.obj \

        $(OBJS)\xrcdll_xh_datectrl.obj \
        $(OBJS)\xrcdll_xh_dirpicker.obj \
        $(OBJS)\xrcdll_xh_dlg.obj \
        $(OBJS)\xrcdll_xh_datectrl.obj \
        $(OBJS)\xrcdll_xh_dirpicker.obj \
        $(OBJS)\xrcdll_xh_dlg.obj \


@@ -1141,6 +1142,7 @@ XRCLIB_OBJECTS =  \
        $(OBJS)\xrclib_xh_clrpicker.obj \
        $(OBJS)\xrclib_xh_collpane.obj \
        $(OBJS)\xrclib_xh_combo.obj \
        $(OBJS)\xrclib_xh_clrpicker.obj \
        $(OBJS)\xrclib_xh_collpane.obj \
        $(OBJS)\xrclib_xh_combo.obj \

+       $(OBJS)\xrclib_xh_comboctrl.obj \

        $(OBJS)\xrclib_xh_datectrl.obj \
        $(OBJS)\xrclib_xh_dirpicker.obj \
        $(OBJS)\xrclib_xh_dlg.obj \
        $(OBJS)\xrclib_xh_datectrl.obj \
        $(OBJS)\xrclib_xh_dirpicker.obj \
        $(OBJS)\xrclib_xh_dlg.obj \


@@ -1448,6 +1450,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_xh_clrpicker.obj \
        $(OBJS)\monodll_xh_collpane.obj \
        $(OBJS)\monodll_xh_combo.obj \
        $(OBJS)\monodll_xh_clrpicker.obj \
        $(OBJS)\monodll_xh_collpane.obj \
        $(OBJS)\monodll_xh_combo.obj \

+       $(OBJS)\monodll_xh_comboctrl.obj \

        $(OBJS)\monodll_xh_datectrl.obj \
        $(OBJS)\monodll_xh_dirpicker.obj \
        $(OBJS)\monodll_xh_dlg.obj \
        $(OBJS)\monodll_xh_datectrl.obj \
        $(OBJS)\monodll_xh_dirpicker.obj \
        $(OBJS)\monodll_xh_dlg.obj \


@@ -2127,6 +2130,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_xh_clrpicker.obj \
        $(OBJS)\monolib_xh_collpane.obj \
        $(OBJS)\monolib_xh_combo.obj \
        $(OBJS)\monolib_xh_clrpicker.obj \
        $(OBJS)\monolib_xh_collpane.obj \
        $(OBJS)\monolib_xh_combo.obj \

+       $(OBJS)\monolib_xh_comboctrl.obj \

        $(OBJS)\monolib_xh_datectrl.obj \
        $(OBJS)\monolib_xh_dirpicker.obj \
        $(OBJS)\monolib_xh_dlg.obj \
        $(OBJS)\monolib_xh_datectrl.obj \
        $(OBJS)\monolib_xh_dirpicker.obj \
        $(OBJS)\monolib_xh_dlg.obj \


@@ -6000,6 +6004,9 @@ $(OBJS)\monodll_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
 $(OBJS)\monodll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
 
 $(OBJS)\monodll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
 

+$(OBJS)\monodll_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp
+

 $(OBJS)\monodll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
 
 $(OBJS)\monodll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
 


@@ -8215,6 +8222,9 @@ $(OBJS)\monolib_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
 $(OBJS)\monolib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
 
 $(OBJS)\monolib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
 

+$(OBJS)\monolib_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp
+

 $(OBJS)\monolib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
 
 $(OBJS)\monolib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
 


@@ -13760,6 +13770,9 @@ $(OBJS)\xrcdll_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
 $(OBJS)\xrcdll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
        $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
 
 $(OBJS)\xrcdll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
        $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
 

+$(OBJS)\xrcdll_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
+       $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp
+

 $(OBJS)\xrcdll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
        $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
 
 $(OBJS)\xrcdll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
        $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
 


@@ -13937,6 +13950,9 @@ $(OBJS)\xrclib_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
 $(OBJS)\xrclib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
        $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
 
 $(OBJS)\xrclib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
        $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
 

+$(OBJS)\xrclib_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
+       $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp
+

 $(OBJS)\xrclib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
        $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
 
 $(OBJS)\xrclib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
        $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
 

diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index c997f0624380737ac0e81e5f851433f610973b65..e23b144a54b5b6b5fee285964663f5984aa8efee 100644 (file)
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -1075,6 +1075,7 @@ XRCDLL_OBJECTS =  \
        $(OBJS)\xrcdll_xh_clrpicker.o \
        $(OBJS)\xrcdll_xh_collpane.o \
        $(OBJS)\xrcdll_xh_combo.o \
        $(OBJS)\xrcdll_xh_clrpicker.o \
        $(OBJS)\xrcdll_xh_collpane.o \
        $(OBJS)\xrcdll_xh_combo.o \

+       $(OBJS)\xrcdll_xh_comboctrl.o \

        $(OBJS)\xrcdll_xh_datectrl.o \
        $(OBJS)\xrcdll_xh_dirpicker.o \
        $(OBJS)\xrcdll_xh_dlg.o \
        $(OBJS)\xrcdll_xh_datectrl.o \
        $(OBJS)\xrcdll_xh_dirpicker.o \
        $(OBJS)\xrcdll_xh_dlg.o \


@@ -1143,6 +1144,7 @@ XRCLIB_OBJECTS =  \
        $(OBJS)\xrclib_xh_clrpicker.o \
        $(OBJS)\xrclib_xh_collpane.o \
        $(OBJS)\xrclib_xh_combo.o \
        $(OBJS)\xrclib_xh_clrpicker.o \
        $(OBJS)\xrclib_xh_collpane.o \
        $(OBJS)\xrclib_xh_combo.o \

+       $(OBJS)\xrclib_xh_comboctrl.o \

        $(OBJS)\xrclib_xh_datectrl.o \
        $(OBJS)\xrclib_xh_dirpicker.o \
        $(OBJS)\xrclib_xh_dlg.o \
        $(OBJS)\xrclib_xh_datectrl.o \
        $(OBJS)\xrclib_xh_dirpicker.o \
        $(OBJS)\xrclib_xh_dlg.o \


@@ -1465,6 +1467,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_xh_clrpicker.o \
        $(OBJS)\monodll_xh_collpane.o \
        $(OBJS)\monodll_xh_combo.o \
        $(OBJS)\monodll_xh_clrpicker.o \
        $(OBJS)\monodll_xh_collpane.o \
        $(OBJS)\monodll_xh_combo.o \

+       $(OBJS)\monodll_xh_comboctrl.o \

        $(OBJS)\monodll_xh_datectrl.o \
        $(OBJS)\monodll_xh_dirpicker.o \
        $(OBJS)\monodll_xh_dlg.o \
        $(OBJS)\monodll_xh_datectrl.o \
        $(OBJS)\monodll_xh_dirpicker.o \
        $(OBJS)\monodll_xh_dlg.o \


@@ -2150,6 +2153,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_xh_clrpicker.o \
        $(OBJS)\monolib_xh_collpane.o \
        $(OBJS)\monolib_xh_combo.o \
        $(OBJS)\monolib_xh_clrpicker.o \
        $(OBJS)\monolib_xh_collpane.o \
        $(OBJS)\monolib_xh_combo.o \

+       $(OBJS)\monolib_xh_comboctrl.o \

        $(OBJS)\monolib_xh_datectrl.o \
        $(OBJS)\monolib_xh_dirpicker.o \
        $(OBJS)\monolib_xh_dlg.o \
        $(OBJS)\monolib_xh_datectrl.o \
        $(OBJS)\monolib_xh_dirpicker.o \
        $(OBJS)\monolib_xh_dlg.o \


@@ -6152,6 +6156,9 @@ $(OBJS)\monodll_xh_collpane.o: ../../src/xrc/xh_collpane.cpp
 $(OBJS)\monodll_xh_combo.o: ../../src/xrc/xh_combo.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\monodll_xh_combo.o: ../../src/xrc/xh_combo.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 

+$(OBJS)\monodll_xh_comboctrl.o: ../../src/xrc/xh_comboctrl.cpp
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+

 $(OBJS)\monodll_xh_datectrl.o: ../../src/xrc/xh_datectrl.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\monodll_xh_datectrl.o: ../../src/xrc/xh_datectrl.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 


@@ -8481,6 +8488,9 @@ $(OBJS)\monolib_xh_collpane.o: ../../src/xrc/xh_collpane.cpp
 $(OBJS)\monolib_xh_combo.o: ../../src/xrc/xh_combo.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\monolib_xh_combo.o: ../../src/xrc/xh_combo.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 

+$(OBJS)\monolib_xh_comboctrl.o: ../../src/xrc/xh_comboctrl.cpp
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+

 $(OBJS)\monolib_xh_datectrl.o: ../../src/xrc/xh_datectrl.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\monolib_xh_datectrl.o: ../../src/xrc/xh_datectrl.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 


@@ -14364,6 +14374,9 @@ $(OBJS)\xrcdll_xh_collpane.o: ../../src/xrc/xh_collpane.cpp
 $(OBJS)\xrcdll_xh_combo.o: ../../src/xrc/xh_combo.cpp
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\xrcdll_xh_combo.o: ../../src/xrc/xh_combo.cpp
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
 

+$(OBJS)\xrcdll_xh_comboctrl.o: ../../src/xrc/xh_comboctrl.cpp
+       $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
+

 $(OBJS)\xrcdll_xh_datectrl.o: ../../src/xrc/xh_datectrl.cpp
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\xrcdll_xh_datectrl.o: ../../src/xrc/xh_datectrl.cpp
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
 


@@ -14541,6 +14554,9 @@ $(OBJS)\xrclib_xh_collpane.o: ../../src/xrc/xh_collpane.cpp
 $(OBJS)\xrclib_xh_combo.o: ../../src/xrc/xh_combo.cpp
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\xrclib_xh_combo.o: ../../src/xrc/xh_combo.cpp
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
 

+$(OBJS)\xrclib_xh_comboctrl.o: ../../src/xrc/xh_comboctrl.cpp
+       $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
+

 $(OBJS)\xrclib_xh_datectrl.o: ../../src/xrc/xh_datectrl.cpp
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\xrclib_xh_datectrl.o: ../../src/xrc/xh_datectrl.cpp
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
 

diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 09722b24905fbda2880a196e75e1d208c19ada43..4da5672d5c3c0c81027d9b1de1c03a2e210e6cd6 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1143,6 +1143,7 @@ XRCDLL_OBJECTS =  \
        $(OBJS)\xrcdll_xh_clrpicker.obj \
        $(OBJS)\xrcdll_xh_collpane.obj \
        $(OBJS)\xrcdll_xh_combo.obj \
        $(OBJS)\xrcdll_xh_clrpicker.obj \
        $(OBJS)\xrcdll_xh_collpane.obj \
        $(OBJS)\xrcdll_xh_combo.obj \

+       $(OBJS)\xrcdll_xh_comboctrl.obj \

        $(OBJS)\xrcdll_xh_datectrl.obj \
        $(OBJS)\xrcdll_xh_dirpicker.obj \
        $(OBJS)\xrcdll_xh_dlg.obj \
        $(OBJS)\xrcdll_xh_datectrl.obj \
        $(OBJS)\xrcdll_xh_dirpicker.obj \
        $(OBJS)\xrcdll_xh_dlg.obj \


@@ -1214,6 +1215,7 @@ XRCLIB_OBJECTS =  \
        $(OBJS)\xrclib_xh_clrpicker.obj \
        $(OBJS)\xrclib_xh_collpane.obj \
        $(OBJS)\xrclib_xh_combo.obj \
        $(OBJS)\xrclib_xh_clrpicker.obj \
        $(OBJS)\xrclib_xh_collpane.obj \
        $(OBJS)\xrclib_xh_combo.obj \

+       $(OBJS)\xrclib_xh_comboctrl.obj \

        $(OBJS)\xrclib_xh_datectrl.obj \
        $(OBJS)\xrclib_xh_dirpicker.obj \
        $(OBJS)\xrclib_xh_dlg.obj \
        $(OBJS)\xrclib_xh_datectrl.obj \
        $(OBJS)\xrclib_xh_dirpicker.obj \
        $(OBJS)\xrclib_xh_dlg.obj \


@@ -1628,6 +1630,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_xh_clrpicker.obj \
        $(OBJS)\monodll_xh_collpane.obj \
        $(OBJS)\monodll_xh_combo.obj \
        $(OBJS)\monodll_xh_clrpicker.obj \
        $(OBJS)\monodll_xh_collpane.obj \
        $(OBJS)\monodll_xh_combo.obj \

+       $(OBJS)\monodll_xh_comboctrl.obj \

        $(OBJS)\monodll_xh_datectrl.obj \
        $(OBJS)\monodll_xh_dirpicker.obj \
        $(OBJS)\monodll_xh_dlg.obj \
        $(OBJS)\monodll_xh_datectrl.obj \
        $(OBJS)\monodll_xh_dirpicker.obj \
        $(OBJS)\monodll_xh_dlg.obj \


@@ -2313,6 +2316,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_xh_clrpicker.obj \
        $(OBJS)\monolib_xh_collpane.obj \
        $(OBJS)\monolib_xh_combo.obj \
        $(OBJS)\monolib_xh_clrpicker.obj \
        $(OBJS)\monolib_xh_collpane.obj \
        $(OBJS)\monolib_xh_combo.obj \

+       $(OBJS)\monolib_xh_comboctrl.obj \

        $(OBJS)\monolib_xh_datectrl.obj \
        $(OBJS)\monolib_xh_dirpicker.obj \
        $(OBJS)\monolib_xh_dlg.obj \
        $(OBJS)\monolib_xh_datectrl.obj \
        $(OBJS)\monolib_xh_dirpicker.obj \
        $(OBJS)\monolib_xh_dlg.obj \


@@ -6346,6 +6350,9 @@ $(OBJS)\monodll_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
 $(OBJS)\monodll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
 
 $(OBJS)\monodll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
 

+$(OBJS)\monodll_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp
+

 $(OBJS)\monodll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
 
 $(OBJS)\monodll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
 


@@ -8561,6 +8568,9 @@ $(OBJS)\monolib_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
 $(OBJS)\monolib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
 
 $(OBJS)\monolib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
 

+$(OBJS)\monolib_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp
+

 $(OBJS)\monolib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
 
 $(OBJS)\monolib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
 


@@ -14106,6 +14116,9 @@ $(OBJS)\xrcdll_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
 $(OBJS)\xrcdll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
 
 $(OBJS)\xrcdll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
 

+$(OBJS)\xrcdll_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp
+

 $(OBJS)\xrcdll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
 
 $(OBJS)\xrcdll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
 


@@ -14283,6 +14296,9 @@ $(OBJS)\xrclib_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
 $(OBJS)\xrclib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
 
 $(OBJS)\xrclib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
 

+$(OBJS)\xrclib_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp
+

 $(OBJS)\xrclib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
 
 $(OBJS)\xrclib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
 

diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index 09bafb559972190027605a162ee50a5828242cde..082784a063d3dfdfac8ba42c3beee735d97836a8 100644 (file)
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -143,6 +143,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_xh_clrpicker.obj &
        $(OBJS)\monodll_xh_collpane.obj &
        $(OBJS)\monodll_xh_combo.obj &
        $(OBJS)\monodll_xh_clrpicker.obj &
        $(OBJS)\monodll_xh_collpane.obj &
        $(OBJS)\monodll_xh_combo.obj &

+       $(OBJS)\monodll_xh_comboctrl.obj &

        $(OBJS)\monodll_xh_datectrl.obj &
        $(OBJS)\monodll_xh_dirpicker.obj &
        $(OBJS)\monodll_xh_dlg.obj &
        $(OBJS)\monodll_xh_datectrl.obj &
        $(OBJS)\monodll_xh_dirpicker.obj &
        $(OBJS)\monodll_xh_dlg.obj &


@@ -833,6 +834,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_xh_clrpicker.obj &
        $(OBJS)\monolib_xh_collpane.obj &
        $(OBJS)\monolib_xh_combo.obj &
        $(OBJS)\monolib_xh_clrpicker.obj &
        $(OBJS)\monolib_xh_collpane.obj &
        $(OBJS)\monolib_xh_combo.obj &

+       $(OBJS)\monolib_xh_comboctrl.obj &

        $(OBJS)\monolib_xh_datectrl.obj &
        $(OBJS)\monolib_xh_dirpicker.obj &
        $(OBJS)\monolib_xh_dlg.obj &
        $(OBJS)\monolib_xh_datectrl.obj &
        $(OBJS)\monolib_xh_dirpicker.obj &
        $(OBJS)\monolib_xh_dlg.obj &


@@ -4170,6 +4172,7 @@ XRCDLL_OBJECTS =  &
        $(OBJS)\xrcdll_xh_clrpicker.obj &
        $(OBJS)\xrcdll_xh_collpane.obj &
        $(OBJS)\xrcdll_xh_combo.obj &
        $(OBJS)\xrcdll_xh_clrpicker.obj &
        $(OBJS)\xrcdll_xh_collpane.obj &
        $(OBJS)\xrcdll_xh_combo.obj &

+       $(OBJS)\xrcdll_xh_comboctrl.obj &

        $(OBJS)\xrcdll_xh_datectrl.obj &
        $(OBJS)\xrcdll_xh_dirpicker.obj &
        $(OBJS)\xrcdll_xh_dlg.obj &
        $(OBJS)\xrcdll_xh_datectrl.obj &
        $(OBJS)\xrcdll_xh_dirpicker.obj &
        $(OBJS)\xrcdll_xh_dlg.obj &


@@ -4238,6 +4241,7 @@ XRCLIB_OBJECTS =  &
        $(OBJS)\xrclib_xh_clrpicker.obj &
        $(OBJS)\xrclib_xh_collpane.obj &
        $(OBJS)\xrclib_xh_combo.obj &
        $(OBJS)\xrclib_xh_clrpicker.obj &
        $(OBJS)\xrclib_xh_collpane.obj &
        $(OBJS)\xrclib_xh_combo.obj &

+       $(OBJS)\xrclib_xh_comboctrl.obj &

        $(OBJS)\xrclib_xh_datectrl.obj &
        $(OBJS)\xrclib_xh_dirpicker.obj &
        $(OBJS)\xrclib_xh_dlg.obj &
        $(OBJS)\xrclib_xh_datectrl.obj &
        $(OBJS)\xrclib_xh_dirpicker.obj &
        $(OBJS)\xrclib_xh_dlg.obj &


@@ -6397,6 +6401,9 @@ $(OBJS)\monodll_xh_collpane.obj :  .AUTODEPEND ..\..\src\xrc\xh_collpane.cpp
 $(OBJS)\monodll_xh_combo.obj :  .AUTODEPEND ..\..\src\xrc\xh_combo.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(OBJS)\monodll_xh_combo.obj :  .AUTODEPEND ..\..\src\xrc\xh_combo.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 

+$(OBJS)\monodll_xh_comboctrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_comboctrl.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+

 $(OBJS)\monodll_xh_datectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_datectrl.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(OBJS)\monodll_xh_datectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_datectrl.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 


@@ -8726,6 +8733,9 @@ $(OBJS)\monolib_xh_collpane.obj :  .AUTODEPEND ..\..\src\xrc\xh_collpane.cpp
 $(OBJS)\monolib_xh_combo.obj :  .AUTODEPEND ..\..\src\xrc\xh_combo.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(OBJS)\monolib_xh_combo.obj :  .AUTODEPEND ..\..\src\xrc\xh_combo.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 

+$(OBJS)\monolib_xh_comboctrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_comboctrl.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+

 $(OBJS)\monolib_xh_datectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_datectrl.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(OBJS)\monolib_xh_datectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_datectrl.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 


@@ -14609,6 +14619,9 @@ $(OBJS)\xrcdll_xh_collpane.obj :  .AUTODEPEND ..\..\src\xrc\xh_collpane.cpp
 $(OBJS)\xrcdll_xh_combo.obj :  .AUTODEPEND ..\..\src\xrc\xh_combo.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 
 $(OBJS)\xrcdll_xh_combo.obj :  .AUTODEPEND ..\..\src\xrc\xh_combo.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 

+$(OBJS)\xrcdll_xh_comboctrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_comboctrl.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
+

 $(OBJS)\xrcdll_xh_datectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_datectrl.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 
 $(OBJS)\xrcdll_xh_datectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_datectrl.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 


@@ -14786,6 +14799,9 @@ $(OBJS)\xrclib_xh_collpane.obj :  .AUTODEPEND ..\..\src\xrc\xh_collpane.cpp
 $(OBJS)\xrclib_xh_combo.obj :  .AUTODEPEND ..\..\src\xrc\xh_combo.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
 
 $(OBJS)\xrclib_xh_combo.obj :  .AUTODEPEND ..\..\src\xrc\xh_combo.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
 

+$(OBJS)\xrclib_xh_comboctrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_comboctrl.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
+

 $(OBJS)\xrclib_xh_datectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_datectrl.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
 
 $(OBJS)\xrclib_xh_datectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_datectrl.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
 

diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index 07f58a9f13b8c567c8123dbb83464352de3285de..3701568184342d2fe508fe0b7b9299abb54454df 100644 (file)
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -6626,6 +6626,10 @@ SOURCE=..\..\include\wx\xrc\xh_combo.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\xrc\xh_comboctrl.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\xrc\xh_datectrl.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\xrc\xh_datectrl.h\r
 # End Source File\r
 # Begin Source File\r

diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index e0523118cfa73d69151d0d89bbcec8f74056f037..6c145c93b0e56a7d2c6c662133f23d737866ca02 100644 (file)
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -4219,6 +4219,9 @@
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_combo.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_combo.h">\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_comboctrl.h">\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_datectrl.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_datectrl.h">\r
                        </File>\r

diff --git a/build/msw/wx_vc7_xrc.vcproj b/build/msw/wx_vc7_xrc.vcproj
index 40bbdd04d53a47bd270215379e6fa9342bfb3582..c23ea9691130e376180747c6fa379fa26a64e96a 100644 (file)
--- a/build/msw/wx_vc7_xrc.vcproj
+++ b/build/msw/wx_vc7_xrc.vcproj
@@ -809,6 +809,9 @@
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_combo.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_combo.h">\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_comboctrl.h">\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_datectrl.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_datectrl.h">\r
                        </File>\r


@@ -982,6 +985,9 @@
                        <File\r
                                RelativePath="..\..\src\xrc\xh_combo.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_combo.cpp">\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\src\xrc\xh_comboctrl.cpp">\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\xrc\xh_datectrl.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_datectrl.cpp">\r
                        </File>\r

diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj
index bfc07fd603e315a6cf81417c9cfd49b7b6d56d39..1ce1d737327a631356d98dd9818c0e1f3b9c627e 100644 (file)
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -5647,6 +5647,10 @@
                                RelativePath="..\..\include\wx\xrc\xh_combo.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\xrc\xh_combo.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_comboctrl.h"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_datectrl.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_datectrl.h"\r
                                >\r

diff --git a/build/msw/wx_vc8_xrc.vcproj b/build/msw/wx_vc8_xrc.vcproj
index 87c65d0e444ab8d5509a9e0499fba5295f1bd99e..110c0038212414ebd19634e35b585614b7ae2a43 100644 (file)
--- a/build/msw/wx_vc8_xrc.vcproj
+++ b/build/msw/wx_vc8_xrc.vcproj
@@ -1102,6 +1102,10 @@
                                RelativePath="..\..\include\wx\xrc\xh_combo.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\xrc\xh_combo.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_comboctrl.h"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_datectrl.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_datectrl.h"\r
                                >\r


@@ -1332,6 +1336,10 @@
                                RelativePath="..\..\src\xrc\xh_combo.cpp"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\src\xrc\xh_combo.cpp"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\src\xrc\xh_comboctrl.cpp"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\xrc\xh_datectrl.cpp"\r
                                >\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_datectrl.cpp"\r
                                >\r

diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj
index 3e6620b5005621821a752303a53041ed87b3d8b7..37fbe587a3180f7e2ce1e6a3e7af9c5284b191ae 100644 (file)
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -5643,6 +5643,10 @@
                                RelativePath="..\..\include\wx\xrc\xh_combo.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\xrc\xh_combo.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_comboctrl.h"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_datectrl.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_datectrl.h"\r
                                >\r

diff --git a/build/msw/wx_vc9_xrc.vcproj b/build/msw/wx_vc9_xrc.vcproj
index f494d17ec23b67c152c842db0254d7f315fc6bbc..94ef4e0d54f66a4747aacb3c274bcabf0ed20e9d 100644 (file)
--- a/build/msw/wx_vc9_xrc.vcproj
+++ b/build/msw/wx_vc9_xrc.vcproj
@@ -1098,6 +1098,10 @@
                                RelativePath="..\..\include\wx\xrc\xh_combo.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\xrc\xh_combo.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_comboctrl.h"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_datectrl.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_datectrl.h"\r
                                >\r


@@ -1328,6 +1332,10 @@
                                RelativePath="..\..\src\xrc\xh_combo.cpp"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\src\xrc\xh_combo.cpp"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\src\xrc\xh_comboctrl.cpp"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\xrc\xh_datectrl.cpp"\r
                                >\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_datectrl.cpp"\r
                                >\r

diff --git a/build/msw/wx_xrc.dsp b/build/msw/wx_xrc.dsp
index 117182ad13eb1869f97bb068d69ca2c4f5c9b4a9..0b3f6186b8a5232f9714e64cf1dea90c9231e56d 100644 (file)
--- a/build/msw/wx_xrc.dsp
+++ b/build/msw/wx_xrc.dsp
@@ -586,6 +586,10 @@ SOURCE=..\..\include\wx\xrc\xh_combo.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\xrc\xh_comboctrl.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\xrc\xh_datectrl.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\xrc\xh_datectrl.h\r
 # End Source File\r
 # Begin Source File\r


@@ -814,6 +818,10 @@ SOURCE=..\..\src\xrc\xh_combo.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\xrc\xh_comboctrl.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\xrc\xh_datectrl.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\xrc\xh_datectrl.cpp\r
 # End Source File\r
 # Begin Source File\r

diff --git a/include/wx/xrc/xh_all.h b/include/wx/xrc/xh_all.h
index 34f459f655e1c615c2078ff257b091311b8d4b6d..212c01a133cb1878430b79faf17f29ecd14cd2c7 100644 (file)
--- a/include/wx/xrc/xh_all.h
+++ b/include/wx/xrc/xh_all.h
@@ -27,6 +27,7 @@
 #include "wx/xrc/xh_clrpicker.h"
 #include "wx/xrc/xh_collpane.h"
 #include "wx/xrc/xh_combo.h"
 #include "wx/xrc/xh_clrpicker.h"
 #include "wx/xrc/xh_collpane.h"
 #include "wx/xrc/xh_combo.h"

+#include "wx/xrc/xh_comboctrl.h"

 #include "wx/xrc/xh_datectrl.h"
 #include "wx/xrc/xh_dirpicker.h"
 #include "wx/xrc/xh_dlg.h"
 #include "wx/xrc/xh_datectrl.h"
 #include "wx/xrc/xh_dirpicker.h"
 #include "wx/xrc/xh_dlg.h"

diff --git a/include/wx/xrc/xh_comboctrl.h b/include/wx/xrc/xh_comboctrl.h
new file mode 100644 (file)
index 0000000..d70a473
--- /dev/null
+++ b/include/wx/xrc/xh_comboctrl.h
@@ -0,0 +1,32 @@
+/////////////////////////////////////////////////////////////////////////////\r
+// Name:        wx/xrc/xh_comboctrl.h\r
+// Purpose:     XML resource handler for wxComboBox\r
+// Author:      Jaakko Salli\r
+// Created:     2009/01/25\r
+// RCS-ID:      $Id$\r
+// Copyright:   (c) 2009 Jaakko Salli\r
+// Licence:     wxWindows licence\r
+/////////////////////////////////////////////////////////////////////////////\r
+\r
+#ifndef _WX_XH_COMBOCTRL_H_\r
+#define _WX_XH_COMBOCTRL_H_\r
+\r
+#include "wx/xrc/xmlres.h"\r
+\r
+#if wxUSE_XRC && wxUSE_COMBOCTRL\r
+\r
+class WXDLLIMPEXP_XRC wxComboCtrlXmlHandler : public wxXmlResourceHandler\r
+{\r
+    DECLARE_DYNAMIC_CLASS(wxComboCtrlXmlHandler)\r
+\r
+public:\r
+    wxComboCtrlXmlHandler();\r
+    virtual wxObject *DoCreateResource();\r
+    virtual bool CanHandle(wxXmlNode *node);\r
+\r
+private:\r
+};\r
+\r
+#endif // wxUSE_XRC && wxUSE_COMBOCTRL\r
+\r
+#endif // _WX_XH_COMBOCTRL_H_\r

diff --git a/src/xrc/descrip.mms b/src/xrc/descrip.mms
index 316f9e0b27d66bc3cc4c4cef7d7c07b5c9312cd6..500765d4bf47e053067e89a153776b0e3ed0eff8 100755 (executable)
--- a/src/xrc/descrip.mms
+++ b/src/xrc/descrip.mms
@@ -55,7 +55,7 @@ OBJECTS=xh_bmp.obj,xh_bmpbt.obj,xh_bttn.obj,xh_cald.obj,xh_chckb.obj,\
        xh_fontpicker.obj,xh_clrpicker.obj,xh_odcombo.obj,xh_mdi.obj,\
        xh_grid.obj,xh_datectrl.obj,xh_treebk.obj,xh_bmpcbox.obj,\
        xh_animatctrl.obj,xh_htmllbox.obj,xh_collpane.obj,xh_srchctrl.obj,\
        xh_fontpicker.obj,xh_clrpicker.obj,xh_odcombo.obj,xh_mdi.obj,\
        xh_grid.obj,xh_datectrl.obj,xh_treebk.obj,xh_bmpcbox.obj,\
        xh_animatctrl.obj,xh_htmllbox.obj,xh_collpane.obj,xh_srchctrl.obj,\

-       xh_propdlg.obj,xmladv.obj
+       xh_propdlg.obj,xh_comboctrl.obj,xmladv.obj

 
 SOURCES =xh_bmp.cpp,xh_bmpbt.cpp,xh_bttn.cpp,xh_cald.cpp,xh_chckb.cpp,\
        xh_chckl.cpp,xh_choic.cpp,xh_combo.cpp,xh_dlg.cpp,xh_frame.cpp,\
 
 SOURCES =xh_bmp.cpp,xh_bmpbt.cpp,xh_bttn.cpp,xh_cald.cpp,xh_chckb.cpp,\
        xh_chckl.cpp,xh_choic.cpp,xh_combo.cpp,xh_dlg.cpp,xh_frame.cpp,\


@@ -69,7 +69,7 @@ SOURCES =xh_bmp.cpp,xh_bmpbt.cpp,xh_bttn.cpp,xh_cald.cpp,xh_chckb.cpp,\
        xh_fontpicker.cpp,xh_clrpicker.cpp,xh_odcombo.cpp,xh_mdi.cpp,\
        xh_grid.cpp,xh_datectrl.cpp,xh_treebk.cpp,xh_bmpcbox.cpp,\
        xh_animatctrl.cpp,xh_htmllbox.cpp,xh_collpane.cpp,xh_srchctrl.cpp,\
        xh_fontpicker.cpp,xh_clrpicker.cpp,xh_odcombo.cpp,xh_mdi.cpp,\
        xh_grid.cpp,xh_datectrl.cpp,xh_treebk.cpp,xh_bmpcbox.cpp,\
        xh_animatctrl.cpp,xh_htmllbox.cpp,xh_collpane.cpp,xh_srchctrl.cpp,\

-       xh_propdlg.cpp,xmladv.cpp
+       xh_propdlg.cpp,xh_comboctrl.cpp,xmladv.cpp

   
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
   
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)


@@ -97,6 +97,7 @@ xh_chckb.obj : xh_chckb.cpp
 xh_chckl.obj : xh_chckl.cpp
 xh_choic.obj : xh_choic.cpp
 xh_combo.obj : xh_combo.cpp
 xh_chckl.obj : xh_chckl.cpp
 xh_choic.obj : xh_choic.cpp
 xh_combo.obj : xh_combo.cpp

+xh_comboctrl.obj : xh_comboctrl.cpp

 xh_dlg.obj : xh_dlg.cpp
 xh_frame.obj : xh_frame.cpp
 xh_gauge.obj : xh_gauge.cpp
 xh_dlg.obj : xh_dlg.cpp
 xh_frame.obj : xh_frame.cpp
 xh_gauge.obj : xh_gauge.cpp

diff --git a/src/xrc/xh_comboctrl.cpp b/src/xrc/xh_comboctrl.cpp
new file mode 100644 (file)
index 0000000..162ce70
--- /dev/null
+++ b/src/xrc/xh_comboctrl.cpp
@@ -0,0 +1,69 @@
+/////////////////////////////////////////////////////////////////////////////\r
+// Name:        src/xrc/xh_comboctrl.cpp\r
+// Purpose:     XRC resource for wxComboCtrl\r
+// Author:      Jaakko Salli\r
+// Created:     2009/01/25\r
+// RCS-ID:      $Id$\r
+// Copyright:   (c) 2009 Jaakko Salli\r
+// Licence:     wxWindows licence\r
+/////////////////////////////////////////////////////////////////////////////\r
+\r
+// For compilers that support precompilation, includes "wx.h".\r
+#include "wx/wxprec.h"\r
+\r
+#ifdef __BORLANDC__\r
+    #pragma hdrstop\r
+#endif\r
+\r
+#if wxUSE_XRC && wxUSE_COMBOCTRL\r
+\r
+#include "wx/xrc/xh_comboctrl.h"\r
+\r
+#ifndef WX_PRECOMP\r
+    #include "wx/intl.h"\r
+    #include "wx/textctrl.h"    // for wxTE_PROCESS_ENTER\r
+#endif\r
+\r
+#include "wx/combo.h"\r
+\r
+\r
+IMPLEMENT_DYNAMIC_CLASS(wxComboCtrlXmlHandler, wxXmlResourceHandler)\r
+\r
+wxComboCtrlXmlHandler::wxComboCtrlXmlHandler()\r
+                     : wxXmlResourceHandler()\r
+{\r
+    XRC_ADD_STYLE(wxCB_SORT);\r
+    XRC_ADD_STYLE(wxCB_READONLY);\r
+    XRC_ADD_STYLE(wxTE_PROCESS_ENTER);\r
+    XRC_ADD_STYLE(wxCC_SPECIAL_DCLICK);\r
+    XRC_ADD_STYLE(wxCC_STD_BUTTON);\r
+    AddWindowStyles();\r
+}\r
+\r
+wxObject *wxComboCtrlXmlHandler::DoCreateResource()\r
+{\r
+    if( m_class == wxT("wxComboCtrl"))\r
+    {\r
+        XRC_MAKE_INSTANCE(control, wxComboCtrl)\r
+\r
+        control->Create(m_parentAsWindow,\r
+                        GetID(),\r
+                        GetText(wxT("value")),\r
+                        GetPosition(), GetSize(),\r
+                        GetStyle(),\r
+                        wxDefaultValidator,\r
+                        GetName());\r
+\r
+        SetupWindow(control);\r
+\r
+        return control;\r
+    }\r
+    return NULL;\r
+}\r
+\r
+bool wxComboCtrlXmlHandler::CanHandle(wxXmlNode *node)\r
+{\r
+    return IsOfClass(node, wxT("wxComboCtrl"));\r
+}\r
+\r
+#endif // wxUSE_XRC && wxUSE_COMBOBOX\r

diff --git a/src/xrc/xmlrsall.cpp b/src/xrc/xmlrsall.cpp
index ccee1ef255161dcd5cb09d6a1877b0fc6acadf37..87a23ea384e3fe411784e2c3df0c4c9cf634d67b 100644 (file)
--- a/src/xrc/xmlrsall.cpp
+++ b/src/xrc/xmlrsall.cpp
@@ -75,6 +75,9 @@ void wxXmlResource::InitAllHandlers()
 #if wxUSE_COMBOBOX
     AddHandler(new wxComboBoxXmlHandler);
 #endif
 #if wxUSE_COMBOBOX
     AddHandler(new wxComboBoxXmlHandler);
 #endif

+#if wxUSE_COMBOCTRL
+    AddHandler(new wxComboCtrlXmlHandler);
+#endif

 #if wxUSE_DATEPICKCTRL
     AddHandler(new wxDateCtrlXmlHandler);
 #endif
 #if wxUSE_DATEPICKCTRL
     AddHandler(new wxDateCtrlXmlHandler);
 #endif