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

diff --git a/Makefile.in b/Makefile.in
index b1b17ef28bac71703c687355280f871d8d52f870..dd2fef9055e2c12e16758faa60fa63f300252a90 100644 (file)
--- 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 8b130ea02cf2d2d3839cc9b95f7f3b2677b051d8..f99d7710bd9df82b840ea41725ab9e74f854e093 100644 (file)
--- 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 49f3a8a512ee2133d99d887830e47131839dcbf6..f137753783a8c5ccfd6940d12cc37cd6ceea57d5 100644 (file)
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1219,6 +1219,7 @@ XRCDLL_OBJECTS =  \
        $(OBJS)\xrcdll_xh_sttxt.obj \\r
        $(OBJS)\xrcdll_xh_text.obj \\r
        $(OBJS)\xrcdll_xh_tglbtn.obj \\r
+       $(OBJS)\xrcdll_xh_timectrl.obj \
        $(OBJS)\xrcdll_xh_toolb.obj \\r
        $(OBJS)\xrcdll_xh_toolbk.obj \\r
        $(OBJS)\xrcdll_xh_tree.obj \\r
@@ -1294,6 +1295,7 @@ XRCLIB_OBJECTS =  \
        $(OBJS)\xrclib_xh_sttxt.obj \\r
        $(OBJS)\xrclib_xh_text.obj \\r
        $(OBJS)\xrclib_xh_tglbtn.obj \\r
+       $(OBJS)\xrclib_xh_timectrl.obj \
        $(OBJS)\xrclib_xh_toolb.obj \\r
        $(OBJS)\xrclib_xh_toolbk.obj \\r
        $(OBJS)\xrclib_xh_tree.obj \\r
@@ -1666,6 +1668,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_xh_sttxt.obj \\r
        $(OBJS)\monodll_xh_text.obj \\r
        $(OBJS)\monodll_xh_tglbtn.obj \\r
+       $(OBJS)\monodll_xh_timectrl.obj \
        $(OBJS)\monodll_xh_toolb.obj \\r
        $(OBJS)\monodll_xh_toolbk.obj \\r
        $(OBJS)\monodll_xh_tree.obj \\r
@@ -2442,6 +2445,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_xh_sttxt.obj \\r
        $(OBJS)\monolib_xh_text.obj \\r
        $(OBJS)\monolib_xh_tglbtn.obj \\r
+       $(OBJS)\monolib_xh_timectrl.obj \
        $(OBJS)\monolib_xh_toolb.obj \\r
        $(OBJS)\monolib_xh_toolbk.obj \\r
        $(OBJS)\monolib_xh_tree.obj \\r
@@ -6989,6 +6993,9 @@ $(OBJS)\monodll_xh_text.obj: ..\..\src\xrc\xh_text.cpp
 $(OBJS)\monodll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp\r
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp\r
 \r
+$(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\r
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp\r
 \r
@@ -9373,6 +9380,9 @@ $(OBJS)\monolib_xh_text.obj: ..\..\src\xrc\xh_text.cpp
 $(OBJS)\monolib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp\r
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp\r
 \r
+$(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\r
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp\r
 \r
@@ -15080,6 +15090,9 @@ $(OBJS)\xrcdll_xh_text.obj: ..\..\src\xrc\xh_text.cpp
 $(OBJS)\xrcdll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp\r
        $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp\r
 \r
+$(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\r
        $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp\r
 \r
@@ -15275,6 +15288,9 @@ $(OBJS)\xrclib_xh_text.obj: ..\..\src\xrc\xh_text.cpp
 $(OBJS)\xrclib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp\r
        $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp\r
 \r
+$(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\r
        $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp\r
 \r

diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 713346f21a673353e0c1efca2ae77381ef78d416..e33065481b70be48bd1b083db59b1e6449c5a389 100644 (file)
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -1218,6 +1218,7 @@ XRCDLL_OBJECTS =  \
        $(OBJS)\xrcdll_xh_sttxt.o \\r
        $(OBJS)\xrcdll_xh_text.o \\r
        $(OBJS)\xrcdll_xh_tglbtn.o \\r
+       $(OBJS)\xrcdll_xh_timectrl.o \
        $(OBJS)\xrcdll_xh_toolb.o \\r
        $(OBJS)\xrcdll_xh_toolbk.o \\r
        $(OBJS)\xrcdll_xh_tree.o \\r
@@ -1292,6 +1293,7 @@ XRCLIB_OBJECTS =  \
        $(OBJS)\xrclib_xh_sttxt.o \\r
        $(OBJS)\xrclib_xh_text.o \\r
        $(OBJS)\xrclib_xh_tglbtn.o \\r
+       $(OBJS)\xrclib_xh_timectrl.o \
        $(OBJS)\xrclib_xh_toolb.o \\r
        $(OBJS)\xrclib_xh_toolbk.o \\r
        $(OBJS)\xrclib_xh_tree.o \\r
@@ -1677,6 +1679,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_xh_sttxt.o \\r
        $(OBJS)\monodll_xh_text.o \\r
        $(OBJS)\monodll_xh_tglbtn.o \\r
+       $(OBJS)\monodll_xh_timectrl.o \
        $(OBJS)\monodll_xh_toolb.o \\r
        $(OBJS)\monodll_xh_toolbk.o \\r
        $(OBJS)\monodll_xh_tree.o \\r
@@ -2459,6 +2462,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_xh_sttxt.o \\r
        $(OBJS)\monolib_xh_text.o \\r
        $(OBJS)\monolib_xh_tglbtn.o \\r
+       $(OBJS)\monolib_xh_timectrl.o \
        $(OBJS)\monolib_xh_toolb.o \\r
        $(OBJS)\monolib_xh_toolbk.o \\r
        $(OBJS)\monolib_xh_tree.o \\r
@@ -7157,6 +7161,9 @@ $(OBJS)\monodll_xh_text.o: ../../src/xrc/xh_text.cpp
 $(OBJS)\monodll_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp\r
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
 \r
+$(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\r
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
 \r
@@ -9541,6 +9548,9 @@ $(OBJS)\monolib_xh_text.o: ../../src/xrc/xh_text.cpp
 $(OBJS)\monolib_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp\r
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
 \r
+$(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\r
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
 \r
@@ -15248,6 +15258,9 @@ $(OBJS)\xrcdll_xh_text.o: ../../src/xrc/xh_text.cpp
 $(OBJS)\xrcdll_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp\r
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<\r
 \r
+$(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\r
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<\r
 \r
@@ -15443,6 +15456,9 @@ $(OBJS)\xrclib_xh_text.o: ../../src/xrc/xh_text.cpp
 $(OBJS)\xrclib_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp\r
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<\r
 \r
+$(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\r
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<\r
 \r

diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index a45e851a896daa7ea55c08a0f0c0f868b6dc70ab..08fb453f4d3fe5547db7370cda4f39c0a904be24 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1300,6 +1300,7 @@ XRCDLL_OBJECTS =  \
        $(OBJS)\xrcdll_xh_sttxt.obj \\r
        $(OBJS)\xrcdll_xh_text.obj \\r
        $(OBJS)\xrcdll_xh_tglbtn.obj \\r
+       $(OBJS)\xrcdll_xh_timectrl.obj \
        $(OBJS)\xrcdll_xh_toolb.obj \\r
        $(OBJS)\xrcdll_xh_toolbk.obj \\r
        $(OBJS)\xrcdll_xh_tree.obj \\r
@@ -1379,6 +1380,7 @@ XRCLIB_OBJECTS =  \
        $(OBJS)\xrclib_xh_sttxt.obj \\r
        $(OBJS)\xrclib_xh_text.obj \\r
        $(OBJS)\xrclib_xh_tglbtn.obj \\r
+       $(OBJS)\xrclib_xh_timectrl.obj \
        $(OBJS)\xrclib_xh_toolb.obj \\r
        $(OBJS)\xrclib_xh_toolbk.obj \\r
        $(OBJS)\xrclib_xh_tree.obj \\r
@@ -1880,6 +1882,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_xh_sttxt.obj \\r
        $(OBJS)\monodll_xh_text.obj \\r
        $(OBJS)\monodll_xh_tglbtn.obj \\r
+       $(OBJS)\monodll_xh_timectrl.obj \
        $(OBJS)\monodll_xh_toolb.obj \\r
        $(OBJS)\monodll_xh_toolbk.obj \\r
        $(OBJS)\monodll_xh_tree.obj \\r
@@ -2662,6 +2665,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_xh_sttxt.obj \\r
        $(OBJS)\monolib_xh_text.obj \\r
        $(OBJS)\monolib_xh_tglbtn.obj \\r
+       $(OBJS)\monolib_xh_timectrl.obj \
        $(OBJS)\monolib_xh_toolb.obj \\r
        $(OBJS)\monolib_xh_toolbk.obj \\r
        $(OBJS)\monolib_xh_tree.obj \\r
@@ -7595,6 +7599,9 @@ $(OBJS)\monodll_xh_text.obj: ..\..\src\xrc\xh_text.cpp
 $(OBJS)\monodll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp\r
 \r
+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp\r
 \r
@@ -9979,6 +9986,9 @@ $(OBJS)\monolib_xh_text.obj: ..\..\src\xrc\xh_text.cpp
 $(OBJS)\monolib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp\r
 \r
+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp\r
 \r
@@ -15686,6 +15696,9 @@ $(OBJS)\xrcdll_xh_text.obj: ..\..\src\xrc\xh_text.cpp
 $(OBJS)\xrcdll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp\r
 \r
+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp\r
 \r
@@ -15881,6 +15894,9 @@ $(OBJS)\xrclib_xh_text.obj: ..\..\src\xrc\xh_text.cpp
 $(OBJS)\xrclib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp\r
 \r
+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp\r
 \r

diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index 933bbc77ec3396aebeae87fc45d3af1d2d05a7fd..ce5ccccf31d7e7428ab52031cfd5eff845b00505 100644 (file)
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -195,6 +195,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_xh_sttxt.obj &\r
        $(OBJS)\monodll_xh_text.obj &\r
        $(OBJS)\monodll_xh_tglbtn.obj &\r
+       $(OBJS)\monodll_xh_timectrl.obj &
        $(OBJS)\monodll_xh_toolb.obj &\r
        $(OBJS)\monodll_xh_toolbk.obj &\r
        $(OBJS)\monodll_xh_tree.obj &\r
@@ -982,6 +983,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_xh_sttxt.obj &\r
        $(OBJS)\monolib_xh_text.obj &\r
        $(OBJS)\monolib_xh_tglbtn.obj &\r
+       $(OBJS)\monolib_xh_timectrl.obj &
        $(OBJS)\monolib_xh_toolb.obj &\r
        $(OBJS)\monolib_xh_toolbk.obj &\r
        $(OBJS)\monolib_xh_tree.obj &\r
@@ -4712,6 +4714,7 @@ XRCDLL_OBJECTS =  &
        $(OBJS)\xrcdll_xh_sttxt.obj &\r
        $(OBJS)\xrcdll_xh_text.obj &\r
        $(OBJS)\xrcdll_xh_tglbtn.obj &\r
+       $(OBJS)\xrcdll_xh_timectrl.obj &
        $(OBJS)\xrcdll_xh_toolb.obj &\r
        $(OBJS)\xrcdll_xh_toolbk.obj &\r
        $(OBJS)\xrcdll_xh_tree.obj &\r
@@ -4787,6 +4790,7 @@ XRCLIB_OBJECTS =  &
        $(OBJS)\xrclib_xh_sttxt.obj &\r
        $(OBJS)\xrclib_xh_text.obj &\r
        $(OBJS)\xrclib_xh_tglbtn.obj &\r
+       $(OBJS)\xrclib_xh_timectrl.obj &
        $(OBJS)\xrclib_xh_toolb.obj &\r
        $(OBJS)\xrclib_xh_toolbk.obj &\r
        $(OBJS)\xrclib_xh_tree.obj &\r
@@ -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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
@@ -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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
@@ -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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<\r
 \r
+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<\r
 \r
@@ -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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<\r
 \r
+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<\r
 \r

diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index 61534fa9af1be5c4b7f2205bc611f5180cf1f604..ed8cda79c6e322153ffc769ac2fdb7267c15150f 100644 (file)
--- 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\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\xrc\xh_timectrl.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\xrc\xh_toolb.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 6f2167b36b32d0a0e0b268343a5d004f6281293f..9ec402b2bd2103623cb7911e575f5e13f8b4224f 100644 (file)
--- 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">\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_timectrl.h">
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\xrc\xh_toolb.h">\r
                        </File>\r
                        <File\r

diff --git a/build/msw/wx_vc7_xrc.vcproj b/build/msw/wx_vc7_xrc.vcproj
index fcf7133e0a84f37e1d43a1988d970b3b15a39cf7..b623b4a361d036d8c80266d6b5f3e779ec6dcebb 100644 (file)
--- a/build/msw/wx_vc7_xrc.vcproj
+++ b/build/msw/wx_vc7_xrc.vcproj
@@ -940,6 +940,9 @@
                                RelativePath="..\..\include\wx\xrc\xh_tglbtn.h">\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_timectrl.h">
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\xrc\xh_toolb.h">\r
                        </File>\r
                        <File\r
@@ -1131,6 +1134,9 @@
                                RelativePath="..\..\src\xrc\xh_tglbtn.cpp">\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\src\xrc\xh_timectrl.cpp">
+                       </File>
+                       <File
                                RelativePath="..\..\src\xrc\xh_toolb.cpp">\r
                        </File>\r
                        <File\r

diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj
index 400fa42735b260b5c06edd2d0dfb9341d94ea887..f8947d47c33a850dc876ce81cb93ed3881e76ff4 100644 (file)
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -8028,6 +8028,10 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_timectrl.h"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\xrc\xh_toolb.h"\r
                                >\r
                        </File>\r

diff --git a/build/msw/wx_vc8_xrc.vcproj b/build/msw/wx_vc8_xrc.vcproj
index c39718f6897809eea807f8c5dbef6b2a7f03fae2..c66cb7927d9d5466e480b47a9cd993c07ab1ebbe 100644 (file)
--- a/build/msw/wx_vc8_xrc.vcproj
+++ b/build/msw/wx_vc8_xrc.vcproj
@@ -1275,6 +1275,10 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_timectrl.h"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\xrc\xh_toolb.h"\r
                                >\r
                        </File>\r
@@ -1529,6 +1533,10 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\src\xrc\xh_timectrl.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\src\xrc\xh_toolb.cpp"\r
                                >\r
                        </File>\r

diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj
index f8cc2d1d5582d009e1b552c6f178b6f9d3bf5fe4..f7ebb18e4cad03ea4035de65102ef7c894b13780 100644 (file)
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -8024,6 +8024,10 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_timectrl.h"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\xrc\xh_toolb.h"\r
                                >\r
                        </File>\r

diff --git a/build/msw/wx_vc9_xrc.vcproj b/build/msw/wx_vc9_xrc.vcproj
index dc51f76e83c699b1979eac852fd87f4e32bb10d9..94ad36ebd24f6b7e95942c6b4254fe60fc9d9ce1 100644 (file)
--- a/build/msw/wx_vc9_xrc.vcproj
+++ b/build/msw/wx_vc9_xrc.vcproj
@@ -1271,6 +1271,10 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_timectrl.h"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\xrc\xh_toolb.h"\r
                                >\r
                        </File>\r
@@ -1525,6 +1529,10 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\src\xrc\xh_timectrl.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\src\xrc\xh_toolb.cpp"\r
                                >\r
                        </File>\r

diff --git a/build/msw/wx_xrc.dsp b/build/msw/wx_xrc.dsp
index 0ccabeb54a482bba7be623d61d25a50cda3cb6ab..c9fae43551007f4409a8470952f0df6e0b3e9e4a 100644 (file)
--- 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\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\xrc\xh_timectrl.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\xrc\xh_toolb.h\r
 # End Source File\r
 # Begin Source File\r
@@ -1006,6 +1010,10 @@ SOURCE=..\..\src\xrc\xh_tglbtn.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\xrc\xh_timectrl.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\xrc\xh_toolb.cpp\r
 # End Source File\r
 # Begin Source File\r

diff --git a/docs/doxygen/overviews/xrc_format.h b/docs/doxygen/overviews/xrc_format.h
index 72d5405f4acc02a923cc0f2ff2fb8d78f5443a19..71325a6ebb096bf07d0beb2dadee37cdd831a3d2 100644 (file)
--- 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 7825a72b31859b7f2dd46a4bcecc9f6b32ba9eed..c647166072144b066eff856319acb6fa71b4380f 100644 (file)
--- 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 (file)
index 0000000..ad5e307
--- /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 <vadim@wxwidgets.org>
+// 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 (file)
index 0000000..0661b45
--- /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 <vadim@wxwidgets.org>
+// 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 993b8de9823747e410518d0c7ce3b588fb831516..e823ea9e0087da02aad773f7dc613dbf8e59f0c4 100644 (file)
--- 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