add XRC handler for wxSearchCtrl (extended patch 1751516)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48140 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-08-16 21:10:14 +00:00
parent b8b7b08777
commit c7db82dced
14 changed files with 209 additions and 2 deletions

View File

@@ -3032,6 +3032,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/xrc/xh_slidr.cpp
src/xrc/xh_spin.cpp
src/xrc/xh_split.cpp
src/xrc/xh_srchctrl.cpp
src/xrc/xh_statbar.cpp
src/xrc/xh_stbmp.cpp
src/xrc/xh_stbox.cpp
@@ -3092,6 +3093,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
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

View File

@@ -1129,6 +1129,7 @@ XRCDLL_OBJECTS = \
$(OBJS)\xrcdll_xh_slidr.obj \
$(OBJS)\xrcdll_xh_spin.obj \
$(OBJS)\xrcdll_xh_split.obj \
$(OBJS)\xrcdll_xh_srchctrl.obj \
$(OBJS)\xrcdll_xh_statbar.obj \
$(OBJS)\xrcdll_xh_stbmp.obj \
$(OBJS)\xrcdll_xh_stbox.obj \
@@ -1195,6 +1196,7 @@ XRCLIB_OBJECTS = \
$(OBJS)\xrclib_xh_slidr.obj \
$(OBJS)\xrclib_xh_spin.obj \
$(OBJS)\xrclib_xh_split.obj \
$(OBJS)\xrclib_xh_srchctrl.obj \
$(OBJS)\xrclib_xh_statbar.obj \
$(OBJS)\xrclib_xh_stbmp.obj \
$(OBJS)\xrclib_xh_stbox.obj \
@@ -1466,6 +1468,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_xh_slidr.obj \
$(OBJS)\monodll_xh_spin.obj \
$(OBJS)\monodll_xh_split.obj \
$(OBJS)\monodll_xh_srchctrl.obj \
$(OBJS)\monodll_xh_statbar.obj \
$(OBJS)\monodll_xh_stbmp.obj \
$(OBJS)\monodll_xh_stbox.obj \
@@ -2097,6 +2100,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_xh_slidr.obj \
$(OBJS)\monolib_xh_spin.obj \
$(OBJS)\monolib_xh_split.obj \
$(OBJS)\monolib_xh_srchctrl.obj \
$(OBJS)\monolib_xh_statbar.obj \
$(OBJS)\monolib_xh_stbmp.obj \
$(OBJS)\monolib_xh_stbox.obj \
@@ -5891,6 +5895,9 @@ $(OBJS)\monodll_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp
$(OBJS)\monodll_xh_split.obj: ..\..\src\xrc\xh_split.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_xh_srchctrl.obj: ..\..\src\xrc\xh_srchctrl.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -7959,6 +7966,9 @@ $(OBJS)\monolib_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp
$(OBJS)\monolib_xh_split.obj: ..\..\src\xrc\xh_split.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_xh_srchctrl.obj: ..\..\src\xrc\xh_srchctrl.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -13161,6 +13171,9 @@ $(OBJS)\xrcdll_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp
$(OBJS)\xrcdll_xh_split.obj: ..\..\src\xrc\xh_split.cpp
$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $**
$(OBJS)\xrcdll_xh_srchctrl.obj: ..\..\src\xrc\xh_srchctrl.cpp
$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $**
$(OBJS)\xrcdll_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp
$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $**
@@ -13332,6 +13345,9 @@ $(OBJS)\xrclib_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp
$(OBJS)\xrclib_xh_split.obj: ..\..\src\xrc\xh_split.cpp
$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $**
$(OBJS)\xrclib_xh_srchctrl.obj: ..\..\src\xrc\xh_srchctrl.cpp
$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $**
$(OBJS)\xrclib_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp
$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $**

View File

@@ -1133,6 +1133,7 @@ XRCDLL_OBJECTS = \
$(OBJS)\xrcdll_xh_slidr.o \
$(OBJS)\xrcdll_xh_spin.o \
$(OBJS)\xrcdll_xh_split.o \
$(OBJS)\xrcdll_xh_srchctrl.o \
$(OBJS)\xrcdll_xh_statbar.o \
$(OBJS)\xrcdll_xh_stbmp.o \
$(OBJS)\xrcdll_xh_stbox.o \
@@ -1199,6 +1200,7 @@ XRCLIB_OBJECTS = \
$(OBJS)\xrclib_xh_slidr.o \
$(OBJS)\xrclib_xh_spin.o \
$(OBJS)\xrclib_xh_split.o \
$(OBJS)\xrclib_xh_srchctrl.o \
$(OBJS)\xrclib_xh_statbar.o \
$(OBJS)\xrclib_xh_stbmp.o \
$(OBJS)\xrclib_xh_stbox.o \
@@ -1483,6 +1485,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_xh_slidr.o \
$(OBJS)\monodll_xh_spin.o \
$(OBJS)\monodll_xh_split.o \
$(OBJS)\monodll_xh_srchctrl.o \
$(OBJS)\monodll_xh_statbar.o \
$(OBJS)\monodll_xh_stbmp.o \
$(OBJS)\monodll_xh_stbox.o \
@@ -2120,6 +2123,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_xh_slidr.o \
$(OBJS)\monolib_xh_spin.o \
$(OBJS)\monolib_xh_split.o \
$(OBJS)\monolib_xh_srchctrl.o \
$(OBJS)\monolib_xh_statbar.o \
$(OBJS)\monolib_xh_stbmp.o \
$(OBJS)\monolib_xh_stbox.o \
@@ -6060,6 +6064,9 @@ $(OBJS)\monodll_xh_spin.o: ../../src/xrc/xh_spin.cpp
$(OBJS)\monodll_xh_split.o: ../../src/xrc/xh_split.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_xh_srchctrl.o: ../../src/xrc/xh_srchctrl.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_xh_statbar.o: ../../src/xrc/xh_statbar.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -8228,6 +8235,9 @@ $(OBJS)\monolib_xh_spin.o: ../../src/xrc/xh_spin.cpp
$(OBJS)\monolib_xh_split.o: ../../src/xrc/xh_split.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_xh_srchctrl.o: ../../src/xrc/xh_srchctrl.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_xh_statbar.o: ../../src/xrc/xh_statbar.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -13730,6 +13740,9 @@ $(OBJS)\xrcdll_xh_spin.o: ../../src/xrc/xh_spin.cpp
$(OBJS)\xrcdll_xh_split.o: ../../src/xrc/xh_split.cpp
$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrcdll_xh_srchctrl.o: ../../src/xrc/xh_srchctrl.cpp
$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrcdll_xh_statbar.o: ../../src/xrc/xh_statbar.cpp
$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -13901,6 +13914,9 @@ $(OBJS)\xrclib_xh_spin.o: ../../src/xrc/xh_spin.cpp
$(OBJS)\xrclib_xh_split.o: ../../src/xrc/xh_split.cpp
$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrclib_xh_srchctrl.o: ../../src/xrc/xh_srchctrl.cpp
$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrclib_xh_statbar.o: ../../src/xrc/xh_statbar.cpp
$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<

View File

@@ -1214,6 +1214,7 @@ XRCDLL_OBJECTS = \
$(OBJS)\xrcdll_xh_slidr.obj \
$(OBJS)\xrcdll_xh_spin.obj \
$(OBJS)\xrcdll_xh_split.obj \
$(OBJS)\xrcdll_xh_srchctrl.obj \
$(OBJS)\xrcdll_xh_statbar.obj \
$(OBJS)\xrcdll_xh_stbmp.obj \
$(OBJS)\xrcdll_xh_stbox.obj \
@@ -1283,6 +1284,7 @@ XRCLIB_OBJECTS = \
$(OBJS)\xrclib_xh_slidr.obj \
$(OBJS)\xrclib_xh_spin.obj \
$(OBJS)\xrclib_xh_split.obj \
$(OBJS)\xrclib_xh_srchctrl.obj \
$(OBJS)\xrclib_xh_statbar.obj \
$(OBJS)\xrclib_xh_stbmp.obj \
$(OBJS)\xrclib_xh_stbox.obj \
@@ -1654,6 +1656,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_xh_slidr.obj \
$(OBJS)\monodll_xh_spin.obj \
$(OBJS)\monodll_xh_split.obj \
$(OBJS)\monodll_xh_srchctrl.obj \
$(OBJS)\monodll_xh_statbar.obj \
$(OBJS)\monodll_xh_stbmp.obj \
$(OBJS)\monodll_xh_stbox.obj \
@@ -2291,6 +2294,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_xh_slidr.obj \
$(OBJS)\monolib_xh_spin.obj \
$(OBJS)\monolib_xh_split.obj \
$(OBJS)\monolib_xh_srchctrl.obj \
$(OBJS)\monolib_xh_statbar.obj \
$(OBJS)\monolib_xh_stbmp.obj \
$(OBJS)\monolib_xh_stbox.obj \
@@ -4539,7 +4543,7 @@ clean:
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
cd ..\..\samples
$(MAKE) -f makefile.vc $(MAKEARGS) clean
cd $(MAKEDIR)
cd "$(MAKEDIR)"
setup_h: $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h $(SETUPHDIR)\wx\msw\rcdefs.h
@@ -4892,7 +4896,7 @@ wxgl: $(____wxgl_namedll_DEP) $(____wxgl_namelib_DEP)
sub_samples:
cd ..\..\samples
$(MAKE) -f makefile.vc $(MAKEARGS) all
cd $(MAKEDIR)
cd "$(MAKEDIR)"
$(LIBDIRNAME):
if not exist $(LIBDIRNAME) mkdir $(LIBDIRNAME)
@@ -6253,6 +6257,9 @@ $(OBJS)\monodll_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp
$(OBJS)\monodll_xh_split.obj: ..\..\src\xrc\xh_split.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_xh_srchctrl.obj: ..\..\src\xrc\xh_srchctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -8321,6 +8328,9 @@ $(OBJS)\monolib_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp
$(OBJS)\monolib_xh_split.obj: ..\..\src\xrc\xh_split.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_xh_srchctrl.obj: ..\..\src\xrc\xh_srchctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -13523,6 +13533,9 @@ $(OBJS)\xrcdll_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp
$(OBJS)\xrcdll_xh_split.obj: ..\..\src\xrc\xh_split.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
$(OBJS)\xrcdll_xh_srchctrl.obj: ..\..\src\xrc\xh_srchctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
$(OBJS)\xrcdll_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
@@ -13694,6 +13707,9 @@ $(OBJS)\xrclib_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp
$(OBJS)\xrclib_xh_split.obj: ..\..\src\xrc\xh_split.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
$(OBJS)\xrclib_xh_srchctrl.obj: ..\..\src\xrc\xh_srchctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
$(OBJS)\xrclib_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**

View File

@@ -176,6 +176,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_xh_slidr.obj &
$(OBJS)\monodll_xh_spin.obj &
$(OBJS)\monodll_xh_split.obj &
$(OBJS)\monodll_xh_srchctrl.obj &
$(OBJS)\monodll_xh_statbar.obj &
$(OBJS)\monodll_xh_stbmp.obj &
$(OBJS)\monodll_xh_stbox.obj &
@@ -818,6 +819,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_xh_slidr.obj &
$(OBJS)\monolib_xh_spin.obj &
$(OBJS)\monolib_xh_split.obj &
$(OBJS)\monolib_xh_srchctrl.obj &
$(OBJS)\monolib_xh_statbar.obj &
$(OBJS)\monolib_xh_stbmp.obj &
$(OBJS)\monolib_xh_stbox.obj &
@@ -4070,6 +4072,7 @@ XRCDLL_OBJECTS = &
$(OBJS)\xrcdll_xh_slidr.obj &
$(OBJS)\xrcdll_xh_spin.obj &
$(OBJS)\xrcdll_xh_split.obj &
$(OBJS)\xrcdll_xh_srchctrl.obj &
$(OBJS)\xrcdll_xh_statbar.obj &
$(OBJS)\xrcdll_xh_stbmp.obj &
$(OBJS)\xrcdll_xh_stbox.obj &
@@ -4136,6 +4139,7 @@ XRCLIB_OBJECTS = &
$(OBJS)\xrclib_xh_slidr.obj &
$(OBJS)\xrclib_xh_spin.obj &
$(OBJS)\xrclib_xh_split.obj &
$(OBJS)\xrclib_xh_srchctrl.obj &
$(OBJS)\xrclib_xh_statbar.obj &
$(OBJS)\xrclib_xh_stbmp.obj &
$(OBJS)\xrclib_xh_stbox.obj &
@@ -6322,6 +6326,9 @@ $(OBJS)\monodll_xh_spin.obj : .AUTODEPEND ..\..\src\xrc\xh_spin.cpp
$(OBJS)\monodll_xh_split.obj : .AUTODEPEND ..\..\src\xrc\xh_split.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_xh_srchctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_srchctrl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_xh_statbar.obj : .AUTODEPEND ..\..\src\xrc\xh_statbar.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -8490,6 +8497,9 @@ $(OBJS)\monolib_xh_spin.obj : .AUTODEPEND ..\..\src\xrc\xh_spin.cpp
$(OBJS)\monolib_xh_split.obj : .AUTODEPEND ..\..\src\xrc\xh_split.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_xh_srchctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_srchctrl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_xh_statbar.obj : .AUTODEPEND ..\..\src\xrc\xh_statbar.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -13992,6 +14002,9 @@ $(OBJS)\xrcdll_xh_spin.obj : .AUTODEPEND ..\..\src\xrc\xh_spin.cpp
$(OBJS)\xrcdll_xh_split.obj : .AUTODEPEND ..\..\src\xrc\xh_split.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
$(OBJS)\xrcdll_xh_srchctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_srchctrl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
$(OBJS)\xrcdll_xh_statbar.obj : .AUTODEPEND ..\..\src\xrc\xh_statbar.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
@@ -14163,6 +14176,9 @@ $(OBJS)\xrclib_xh_spin.obj : .AUTODEPEND ..\..\src\xrc\xh_spin.cpp
$(OBJS)\xrclib_xh_split.obj : .AUTODEPEND ..\..\src\xrc\xh_split.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
$(OBJS)\xrclib_xh_srchctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_srchctrl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
$(OBJS)\xrclib_xh_statbar.obj : .AUTODEPEND ..\..\src\xrc\xh_statbar.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<

View File

@@ -9645,6 +9645,10 @@ SOURCE=..\..\include\wx\xrc\xh_split.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_srchctrl.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_statbar.h
# End Source File
# Begin Source File

View File

@@ -1146,6 +1146,10 @@ SOURCE=..\..\include\wx\xrc\xh_split.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_srchctrl.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_statbar.h
# End Source File
# Begin Source File
@@ -1370,6 +1374,10 @@ SOURCE=..\..\src\xrc\xh_split.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\xrc\xh_srchctrl.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\xrc\xh_statbar.cpp
# End Source File
# Begin Source File