From 6b9103c67b1901d59ddfbe11bba5af586b0622de Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 29 Sep 2011 13:43:23 +0000 Subject: [PATCH] Added XRC handler for wxTimePickerCtrl. Add a trivial handler modeled after the existing wxDateCtrlXmlHandler. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 17 +++++++++ build/bakefiles/files.bkl | 2 ++ build/msw/makefile.bcc | 16 +++++++++ build/msw/makefile.gcc | 16 +++++++++ build/msw/makefile.vc | 16 +++++++++ build/msw/makefile.wat | 16 +++++++++ build/msw/wx_core.dsp | 4 +++ build/msw/wx_vc7_core.vcproj | 3 ++ build/msw/wx_vc7_xrc.vcproj | 6 ++++ build/msw/wx_vc8_core.vcproj | 4 +++ build/msw/wx_vc8_xrc.vcproj | 8 +++++ build/msw/wx_vc9_core.vcproj | 4 +++ build/msw/wx_vc9_xrc.vcproj | 8 +++++ build/msw/wx_xrc.dsp | 8 +++++ docs/doxygen/overviews/xrc_format.h | 5 +++ include/wx/xrc/xh_all.h | 1 + include/wx/xrc/xh_timectrl.h | 31 +++++++++++++++++ src/xrc/xh_timectrl.cpp | 53 +++++++++++++++++++++++++++++ src/xrc/xmlrsall.cpp | 3 ++ 19 files changed, 221 insertions(+) create mode 100644 include/wx/xrc/xh_timectrl.h create mode 100644 src/xrc/xh_timectrl.cpp diff --git a/Makefile.in b/Makefile.in index b1b17ef28b..dd2fef9055 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1749,6 +1749,7 @@ XRCDLL_OBJECTS = \ xrcdll_xh_sttxt.o \ xrcdll_xh_text.o \ xrcdll_xh_tglbtn.o \ + xrcdll_xh_timectrl.o \ xrcdll_xh_toolb.o \ xrcdll_xh_toolbk.o \ xrcdll_xh_tree.o \ @@ -1820,6 +1821,7 @@ XRCLIB_OBJECTS = \ xrclib_xh_sttxt.o \ xrclib_xh_text.o \ xrclib_xh_tglbtn.o \ + xrclib_xh_timectrl.o \ xrclib_xh_toolb.o \ xrclib_xh_toolbk.o \ xrclib_xh_tree.o \ @@ -4190,6 +4192,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/xrc/xh_sttxt.h \ wx/xrc/xh_text.h \ wx/xrc/xh_tglbtn.h \ + wx/xrc/xh_timectrl.h \ wx/xrc/xh_toolb.h \ wx/xrc/xh_toolbk.h \ wx/xrc/xh_tree.h \ @@ -4502,6 +4505,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \ monodll_xh_sttxt.o \ monodll_xh_text.o \ monodll_xh_tglbtn.o \ + monodll_xh_timectrl.o \ monodll_xh_toolb.o \ monodll_xh_toolbk.o \ monodll_xh_tree.o \ @@ -6451,6 +6455,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \ monolib_xh_sttxt.o \ monolib_xh_text.o \ monolib_xh_tglbtn.o \ + monolib_xh_timectrl.o \ monolib_xh_toolb.o \ monolib_xh_toolbk.o \ monolib_xh_tree.o \ @@ -17578,6 +17583,9 @@ monodll_xh_text.o: $(srcdir)/src/xrc/xh_text.cpp $(MONODLL_ODEP) monodll_xh_tglbtn.o: $(srcdir)/src/xrc/xh_tglbtn.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_tglbtn.cpp +monodll_xh_timectrl.o: $(srcdir)/src/xrc/xh_timectrl.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_timectrl.cpp + monodll_xh_toolb.o: $(srcdir)/src/xrc/xh_toolb.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_toolb.cpp @@ -22942,6 +22950,9 @@ monolib_xh_text.o: $(srcdir)/src/xrc/xh_text.cpp $(MONOLIB_ODEP) monolib_xh_tglbtn.o: $(srcdir)/src/xrc/xh_tglbtn.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_tglbtn.cpp +monolib_xh_timectrl.o: $(srcdir)/src/xrc/xh_timectrl.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_timectrl.cpp + monolib_xh_toolb.o: $(srcdir)/src/xrc/xh_toolb.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_toolb.cpp @@ -36712,6 +36723,9 @@ xrcdll_xh_text.o: $(srcdir)/src/xrc/xh_text.cpp $(XRCDLL_ODEP) xrcdll_xh_tglbtn.o: $(srcdir)/src/xrc/xh_tglbtn.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_tglbtn.cpp +xrcdll_xh_timectrl.o: $(srcdir)/src/xrc/xh_timectrl.cpp $(XRCDLL_ODEP) + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_timectrl.cpp + xrcdll_xh_toolb.o: $(srcdir)/src/xrc/xh_toolb.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_toolb.cpp @@ -36904,6 +36918,9 @@ xrclib_xh_text.o: $(srcdir)/src/xrc/xh_text.cpp $(XRCLIB_ODEP) xrclib_xh_tglbtn.o: $(srcdir)/src/xrc/xh_tglbtn.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_tglbtn.cpp +xrclib_xh_timectrl.o: $(srcdir)/src/xrc/xh_timectrl.cpp $(XRCLIB_ODEP) + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_timectrl.cpp + xrclib_xh_toolb.o: $(srcdir)/src/xrc/xh_toolb.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_toolb.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 8b130ea02c..f99d7710bd 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -3457,6 +3457,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/xrc/xh_sttxt.cpp src/xrc/xh_text.cpp src/xrc/xh_tglbtn.cpp + src/xrc/xh_timectrl.cpp src/xrc/xh_toolb.cpp src/xrc/xh_toolbk.cpp src/xrc/xh_tree.cpp @@ -3525,6 +3526,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/xrc/xh_sttxt.h wx/xrc/xh_text.h wx/xrc/xh_tglbtn.h + wx/xrc/xh_timectrl.h wx/xrc/xh_toolb.h wx/xrc/xh_toolbk.h wx/xrc/xh_tree.h diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 49f3a8a512..f137753783 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -1219,6 +1219,7 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_sttxt.obj \ $(OBJS)\xrcdll_xh_text.obj \ $(OBJS)\xrcdll_xh_tglbtn.obj \ + $(OBJS)\xrcdll_xh_timectrl.obj \ $(OBJS)\xrcdll_xh_toolb.obj \ $(OBJS)\xrcdll_xh_toolbk.obj \ $(OBJS)\xrcdll_xh_tree.obj \ @@ -1294,6 +1295,7 @@ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_xh_sttxt.obj \ $(OBJS)\xrclib_xh_text.obj \ $(OBJS)\xrclib_xh_tglbtn.obj \ + $(OBJS)\xrclib_xh_timectrl.obj \ $(OBJS)\xrclib_xh_toolb.obj \ $(OBJS)\xrclib_xh_toolbk.obj \ $(OBJS)\xrclib_xh_tree.obj \ @@ -1666,6 +1668,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xh_sttxt.obj \ $(OBJS)\monodll_xh_text.obj \ $(OBJS)\monodll_xh_tglbtn.obj \ + $(OBJS)\monodll_xh_timectrl.obj \ $(OBJS)\monodll_xh_toolb.obj \ $(OBJS)\monodll_xh_toolbk.obj \ $(OBJS)\monodll_xh_tree.obj \ @@ -2442,6 +2445,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xh_sttxt.obj \ $(OBJS)\monolib_xh_text.obj \ $(OBJS)\monolib_xh_tglbtn.obj \ + $(OBJS)\monolib_xh_timectrl.obj \ $(OBJS)\monolib_xh_toolb.obj \ $(OBJS)\monolib_xh_toolbk.obj \ $(OBJS)\monolib_xh_tree.obj \ @@ -6989,6 +6993,9 @@ $(OBJS)\monodll_xh_text.obj: ..\..\src\xrc\xh_text.cpp $(OBJS)\monodll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp +$(OBJS)\monodll_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp + $(OBJS)\monodll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp @@ -9373,6 +9380,9 @@ $(OBJS)\monolib_xh_text.obj: ..\..\src\xrc\xh_text.cpp $(OBJS)\monolib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp +$(OBJS)\monolib_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp + $(OBJS)\monolib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp @@ -15080,6 +15090,9 @@ $(OBJS)\xrcdll_xh_text.obj: ..\..\src\xrc\xh_text.cpp $(OBJS)\xrcdll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp +$(OBJS)\xrcdll_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp + $(OBJS)\xrcdll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp @@ -15275,6 +15288,9 @@ $(OBJS)\xrclib_xh_text.obj: ..\..\src\xrc\xh_text.cpp $(OBJS)\xrclib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp +$(OBJS)\xrclib_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp + $(OBJS)\xrclib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 713346f21a..e33065481b 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1218,6 +1218,7 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_sttxt.o \ $(OBJS)\xrcdll_xh_text.o \ $(OBJS)\xrcdll_xh_tglbtn.o \ + $(OBJS)\xrcdll_xh_timectrl.o \ $(OBJS)\xrcdll_xh_toolb.o \ $(OBJS)\xrcdll_xh_toolbk.o \ $(OBJS)\xrcdll_xh_tree.o \ @@ -1292,6 +1293,7 @@ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_xh_sttxt.o \ $(OBJS)\xrclib_xh_text.o \ $(OBJS)\xrclib_xh_tglbtn.o \ + $(OBJS)\xrclib_xh_timectrl.o \ $(OBJS)\xrclib_xh_toolb.o \ $(OBJS)\xrclib_xh_toolbk.o \ $(OBJS)\xrclib_xh_tree.o \ @@ -1677,6 +1679,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xh_sttxt.o \ $(OBJS)\monodll_xh_text.o \ $(OBJS)\monodll_xh_tglbtn.o \ + $(OBJS)\monodll_xh_timectrl.o \ $(OBJS)\monodll_xh_toolb.o \ $(OBJS)\monodll_xh_toolbk.o \ $(OBJS)\monodll_xh_tree.o \ @@ -2459,6 +2462,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xh_sttxt.o \ $(OBJS)\monolib_xh_text.o \ $(OBJS)\monolib_xh_tglbtn.o \ + $(OBJS)\monolib_xh_timectrl.o \ $(OBJS)\monolib_xh_toolb.o \ $(OBJS)\monolib_xh_toolbk.o \ $(OBJS)\monolib_xh_tree.o \ @@ -7157,6 +7161,9 @@ $(OBJS)\monodll_xh_text.o: ../../src/xrc/xh_text.cpp $(OBJS)\monodll_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_xh_timectrl.o: ../../src/xrc/xh_timectrl.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_xh_toolb.o: ../../src/xrc/xh_toolb.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -9541,6 +9548,9 @@ $(OBJS)\monolib_xh_text.o: ../../src/xrc/xh_text.cpp $(OBJS)\monolib_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_xh_timectrl.o: ../../src/xrc/xh_timectrl.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_xh_toolb.o: ../../src/xrc/xh_toolb.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -15248,6 +15258,9 @@ $(OBJS)\xrcdll_xh_text.o: ../../src/xrc/xh_text.cpp $(OBJS)\xrcdll_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\xrcdll_xh_timectrl.o: ../../src/xrc/xh_timectrl.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\xrcdll_xh_toolb.o: ../../src/xrc/xh_toolb.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< @@ -15443,6 +15456,9 @@ $(OBJS)\xrclib_xh_text.o: ../../src/xrc/xh_text.cpp $(OBJS)\xrclib_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\xrclib_xh_timectrl.o: ../../src/xrc/xh_timectrl.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\xrclib_xh_toolb.o: ../../src/xrc/xh_toolb.cpp $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index a45e851a89..08fb453f4d 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -1300,6 +1300,7 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_sttxt.obj \ $(OBJS)\xrcdll_xh_text.obj \ $(OBJS)\xrcdll_xh_tglbtn.obj \ + $(OBJS)\xrcdll_xh_timectrl.obj \ $(OBJS)\xrcdll_xh_toolb.obj \ $(OBJS)\xrcdll_xh_toolbk.obj \ $(OBJS)\xrcdll_xh_tree.obj \ @@ -1379,6 +1380,7 @@ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_xh_sttxt.obj \ $(OBJS)\xrclib_xh_text.obj \ $(OBJS)\xrclib_xh_tglbtn.obj \ + $(OBJS)\xrclib_xh_timectrl.obj \ $(OBJS)\xrclib_xh_toolb.obj \ $(OBJS)\xrclib_xh_toolbk.obj \ $(OBJS)\xrclib_xh_tree.obj \ @@ -1880,6 +1882,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xh_sttxt.obj \ $(OBJS)\monodll_xh_text.obj \ $(OBJS)\monodll_xh_tglbtn.obj \ + $(OBJS)\monodll_xh_timectrl.obj \ $(OBJS)\monodll_xh_toolb.obj \ $(OBJS)\monodll_xh_toolbk.obj \ $(OBJS)\monodll_xh_tree.obj \ @@ -2662,6 +2665,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xh_sttxt.obj \ $(OBJS)\monolib_xh_text.obj \ $(OBJS)\monolib_xh_tglbtn.obj \ + $(OBJS)\monolib_xh_timectrl.obj \ $(OBJS)\monolib_xh_toolb.obj \ $(OBJS)\monolib_xh_toolbk.obj \ $(OBJS)\monolib_xh_tree.obj \ @@ -7595,6 +7599,9 @@ $(OBJS)\monodll_xh_text.obj: ..\..\src\xrc\xh_text.cpp $(OBJS)\monodll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp +$(OBJS)\monodll_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp + $(OBJS)\monodll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp @@ -9979,6 +9986,9 @@ $(OBJS)\monolib_xh_text.obj: ..\..\src\xrc\xh_text.cpp $(OBJS)\monolib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp +$(OBJS)\monolib_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp + $(OBJS)\monolib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp @@ -15686,6 +15696,9 @@ $(OBJS)\xrcdll_xh_text.obj: ..\..\src\xrc\xh_text.cpp $(OBJS)\xrcdll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp +$(OBJS)\xrcdll_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp + $(OBJS)\xrcdll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp @@ -15881,6 +15894,9 @@ $(OBJS)\xrclib_xh_text.obj: ..\..\src\xrc\xh_text.cpp $(OBJS)\xrclib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp +$(OBJS)\xrclib_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp + $(OBJS)\xrclib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index 933bbc77ec..ce5ccccf31 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -195,6 +195,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_xh_sttxt.obj & $(OBJS)\monodll_xh_text.obj & $(OBJS)\monodll_xh_tglbtn.obj & + $(OBJS)\monodll_xh_timectrl.obj & $(OBJS)\monodll_xh_toolb.obj & $(OBJS)\monodll_xh_toolbk.obj & $(OBJS)\monodll_xh_tree.obj & @@ -982,6 +983,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_xh_sttxt.obj & $(OBJS)\monolib_xh_text.obj & $(OBJS)\monolib_xh_tglbtn.obj & + $(OBJS)\monolib_xh_timectrl.obj & $(OBJS)\monolib_xh_toolb.obj & $(OBJS)\monolib_xh_toolbk.obj & $(OBJS)\monolib_xh_tree.obj & @@ -4712,6 +4714,7 @@ XRCDLL_OBJECTS = & $(OBJS)\xrcdll_xh_sttxt.obj & $(OBJS)\xrcdll_xh_text.obj & $(OBJS)\xrcdll_xh_tglbtn.obj & + $(OBJS)\xrcdll_xh_timectrl.obj & $(OBJS)\xrcdll_xh_toolb.obj & $(OBJS)\xrcdll_xh_toolbk.obj & $(OBJS)\xrcdll_xh_tree.obj & @@ -4787,6 +4790,7 @@ XRCLIB_OBJECTS = & $(OBJS)\xrclib_xh_sttxt.obj & $(OBJS)\xrclib_xh_text.obj & $(OBJS)\xrclib_xh_tglbtn.obj & + $(OBJS)\xrclib_xh_timectrl.obj & $(OBJS)\xrclib_xh_toolb.obj & $(OBJS)\xrclib_xh_toolbk.obj & $(OBJS)\xrclib_xh_tree.obj & @@ -7428,6 +7432,9 @@ $(OBJS)\monodll_xh_text.obj : .AUTODEPEND ..\..\src\xrc\xh_text.cpp $(OBJS)\monodll_xh_tglbtn.obj : .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_xh_timectrl.obj : .AUTODEPEND ..\..\src\xrc\xh_timectrl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_xh_toolb.obj : .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -9812,6 +9819,9 @@ $(OBJS)\monolib_xh_text.obj : .AUTODEPEND ..\..\src\xrc\xh_text.cpp $(OBJS)\monolib_xh_tglbtn.obj : .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_xh_timectrl.obj : .AUTODEPEND ..\..\src\xrc\xh_timectrl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_xh_toolb.obj : .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -15519,6 +15529,9 @@ $(OBJS)\xrcdll_xh_text.obj : .AUTODEPEND ..\..\src\xrc\xh_text.cpp $(OBJS)\xrcdll_xh_tglbtn.obj : .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< +$(OBJS)\xrcdll_xh_timectrl.obj : .AUTODEPEND ..\..\src\xrc\xh_timectrl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + $(OBJS)\xrcdll_xh_toolb.obj : .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< @@ -15714,6 +15727,9 @@ $(OBJS)\xrclib_xh_text.obj : .AUTODEPEND ..\..\src\xrc\xh_text.cpp $(OBJS)\xrclib_xh_tglbtn.obj : .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< +$(OBJS)\xrclib_xh_timectrl.obj : .AUTODEPEND ..\..\src\xrc\xh_timectrl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + $(OBJS)\xrclib_xh_toolb.obj : .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index 61534fa9af..ed8cda79c6 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -7240,6 +7240,10 @@ SOURCE=..\..\include\wx\xrc\xh_tglbtn.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\xrc\xh_timectrl.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\xrc\xh_toolb.h # End Source File # Begin Source File diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj index 6f2167b36b..9ec402b2bd 100644 --- a/build/msw/wx_vc7_core.vcproj +++ b/build/msw/wx_vc7_core.vcproj @@ -6006,6 +6006,9 @@ RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"> + + + + + + + + diff --git a/build/msw/wx_vc8_xrc.vcproj b/build/msw/wx_vc8_xrc.vcproj index c39718f689..c66cb7927d 100644 --- a/build/msw/wx_vc8_xrc.vcproj +++ b/build/msw/wx_vc8_xrc.vcproj @@ -1275,6 +1275,10 @@ > + + @@ -1529,6 +1533,10 @@ > + + diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj index f8cc2d1d55..f7ebb18e4c 100644 --- a/build/msw/wx_vc9_core.vcproj +++ b/build/msw/wx_vc9_core.vcproj @@ -8024,6 +8024,10 @@ > + + diff --git a/build/msw/wx_vc9_xrc.vcproj b/build/msw/wx_vc9_xrc.vcproj index dc51f76e83..94ad36ebd2 100644 --- a/build/msw/wx_vc9_xrc.vcproj +++ b/build/msw/wx_vc9_xrc.vcproj @@ -1271,6 +1271,10 @@ > + + @@ -1525,6 +1529,10 @@ > + + diff --git a/build/msw/wx_xrc.dsp b/build/msw/wx_xrc.dsp index 0ccabeb54a..c9fae43551 100644 --- a/build/msw/wx_xrc.dsp +++ b/build/msw/wx_xrc.dsp @@ -754,6 +754,10 @@ SOURCE=..\..\include\wx\xrc\xh_tglbtn.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\xrc\xh_timectrl.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\xrc\xh_toolb.h # End Source File # Begin Source File @@ -1006,6 +1010,10 @@ SOURCE=..\..\src\xrc\xh_tglbtn.cpp # End Source File # Begin Source File +SOURCE=..\..\src\xrc\xh_timectrl.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\xrc\xh_toolb.cpp # End Source File # Begin Source File diff --git a/docs/doxygen/overviews/xrc_format.h b/docs/doxygen/overviews/xrc_format.h index 72d5405f4a..71325a6ebb 100644 --- a/docs/doxygen/overviews/xrc_format.h +++ b/docs/doxygen/overviews/xrc_format.h @@ -1589,6 +1589,11 @@ No additional properties. @endTable +@subsubsection xrc_wxtimepickerctrl wxTimePickerCtrl + +No additional properties. + + @subsubsection xrc_wxtogglebuttton wxToggleButton @beginTable diff --git a/include/wx/xrc/xh_all.h b/include/wx/xrc/xh_all.h index 7825a72b31..c647166072 100644 --- a/include/wx/xrc/xh_all.h +++ b/include/wx/xrc/xh_all.h @@ -69,6 +69,7 @@ #include "wx/xrc/xh_stlin.h" #include "wx/xrc/xh_text.h" #include "wx/xrc/xh_tglbtn.h" +#include "wx/xrc/xh_timectrl.h" #include "wx/xrc/xh_toolb.h" #include "wx/xrc/xh_toolbk.h" #include "wx/xrc/xh_tree.h" diff --git a/include/wx/xrc/xh_timectrl.h b/include/wx/xrc/xh_timectrl.h new file mode 100644 index 0000000000..ad5e307f5d --- /dev/null +++ b/include/wx/xrc/xh_timectrl.h @@ -0,0 +1,31 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/xrc/xh_timectrl.h +// Purpose: XML resource handler for wxTimePickerCtrl +// Author: Vadim Zeitlin +// Created: 2011-09-22 +// RCS-ID: $Id$ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_XH_TIMECTRL_H_ +#define _WX_XH_TIMECTRL_H_ + +#include "wx/xrc/xmlres.h" + +#if wxUSE_XRC && wxUSE_TIMEPICKCTRL + +class WXDLLIMPEXP_XRC wxTimeCtrlXmlHandler : public wxXmlResourceHandler +{ +public: + wxTimeCtrlXmlHandler(); + virtual wxObject *DoCreateResource(); + virtual bool CanHandle(wxXmlNode *node); + +private: + wxDECLARE_DYNAMIC_CLASS(wxTimeCtrlXmlHandler); +}; + +#endif // wxUSE_XRC && wxUSE_TIMEPICKCTRL + +#endif // _WX_XH_TIMECTRL_H_ diff --git a/src/xrc/xh_timectrl.cpp b/src/xrc/xh_timectrl.cpp new file mode 100644 index 0000000000..0661b45ad5 --- /dev/null +++ b/src/xrc/xh_timectrl.cpp @@ -0,0 +1,53 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: src/xrc/xh_timectrl.cpp +// Purpose: XML resource handler for wxTimePickerCtrl +// Author: Vadim Zeitlin +// Created: 2011-09-22 +// RCS-ID: $Id$ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#if wxUSE_XRC && wxUSE_TIMEPICKCTRL + +#include "wx/xrc/xh_timectrl.h" +#include "wx/timectrl.h" + +IMPLEMENT_DYNAMIC_CLASS(wxTimeCtrlXmlHandler, wxXmlResourceHandler) + +wxTimeCtrlXmlHandler::wxTimeCtrlXmlHandler() +{ + XRC_ADD_STYLE(wxTP_DEFAULT); + AddWindowStyles(); +} + +wxObject *wxTimeCtrlXmlHandler::DoCreateResource() +{ + XRC_MAKE_INSTANCE(picker, wxTimePickerCtrl) + + picker->Create(m_parentAsWindow, + GetID(), + wxDefaultDateTime, + GetPosition(), GetSize(), + GetStyle(wxT("style"), wxTP_DEFAULT), + wxDefaultValidator, + GetName()); + + SetupWindow(picker); + + return picker; +} + +bool wxTimeCtrlXmlHandler::CanHandle(wxXmlNode *node) +{ + return IsOfClass(node, wxS("wxTimePickerCtrl")); +} + +#endif // wxUSE_XRC && wxUSE_TIMEPICKCTRL diff --git a/src/xrc/xmlrsall.cpp b/src/xrc/xmlrsall.cpp index 993b8de982..e823ea9e00 100644 --- a/src/xrc/xmlrsall.cpp +++ b/src/xrc/xmlrsall.cpp @@ -188,6 +188,9 @@ void wxXmlResource::InitAllHandlers() #if wxUSE_TOGGLEBTN AddHandler(new wxToggleButtonXmlHandler); #endif +#if wxUSE_TIMEPICKCTRL + AddHandler(new wxTimeCtrlXmlHandler); +#endif #if wxUSE_TOOLBAR AddHandler(new wxToolBarXmlHandler); #endif -- 2.45.2