From 05b43e428d92c799fea8baa8dc319ff443a61ee3 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Fri, 23 Jan 2004 10:01:44 +0000 Subject: [PATCH] Applied patch [ 882493 ] Added XRC support for wxStatusBar By Brian Ravnsgaard Riis git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@25337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/include/wx/xrc/xh_all.h | 1 + contrib/src/xrc/Makefile.in | 5 +++-- contrib/src/xrc/XrcVC.dsp | 4 ++++ contrib/src/xrc/makefile.b32 | 2 +- contrib/src/xrc/makefile.g95 | 2 +- contrib/src/xrc/makefile.vc | 3 ++- contrib/src/xrc/makefile.wat | 1 + contrib/src/xrc/xmlrsall.cpp | 3 +++ docs/changes.txt | 1 + docs/tech/tn0014.txt | 5 +++++ include/wx/xrc/xh_all.h | 1 + src/xrc/Makefile.in | 5 +++-- src/xrc/XrcVC.dsp | 4 ++++ src/xrc/makefile.b32 | 2 +- src/xrc/makefile.g95 | 2 +- src/xrc/makefile.vc | 3 ++- src/xrc/makefile.wat | 1 + src/xrc/xmlrsall.cpp | 3 +++ 18 files changed, 38 insertions(+), 10 deletions(-) diff --git a/contrib/include/wx/xrc/xh_all.h b/contrib/include/wx/xrc/xh_all.h index 51ccbf3533..fc1d82c439 100644 --- a/contrib/include/wx/xrc/xh_all.h +++ b/contrib/include/wx/xrc/xh_all.h @@ -49,5 +49,6 @@ #include "wx/xrc/xh_scwin.h" #include "wx/xrc/xh_split.h" #include "wx/xrc/xh_wizrd.h" +#include "wx/xrc/xh_statbar.h" #endif // _WX_XMLRES_H_ diff --git a/contrib/src/xrc/Makefile.in b/contrib/src/xrc/Makefile.in index 25eccb7df1..6c7a2a6e60 100644 --- a/contrib/src/xrc/Makefile.in +++ b/contrib/src/xrc/Makefile.in @@ -24,7 +24,8 @@ HEADERS=xh_all.h xh_bttn.h xh_chckb.h xh_chckl.h xh_choic.h xh_combo.h \ xh_radbt.h xh_radbx.h xh_sizer.h xh_slidr.h xh_spin.h xh_stbmp.h \ xh_sttxt.h xh_text.h xh_listb.h xml.h xmlres.h xh_toolb.h \ xh_bmpbt.h xh_cald.h xh_listc.h xh_scrol.h xh_stbox.h xh_tree.h \ - xh_stlin.h xh_bmp.h xh_unkwn.h xh_frame.h xh_gdctl.h xh_scwin.h xh_split.h xh_wizrd.h + xh_stlin.h xh_bmp.h xh_unkwn.h xh_frame.h xh_gdctl.h xh_scwin.h xh_split.h \ + xh_wizrd.h xh_statbar.h OBJECTS=$(EXPAT_OBJECTS) \ xml.o xmlres.o xmlrsall.o \ @@ -33,7 +34,7 @@ OBJECTS=$(EXPAT_OBJECTS) \ xh_radbx.o xh_sizer.o xh_slidr.o xh_spin.o xh_stbmp.o xh_sttxt.o \ xh_text.o xh_listb.o xh_toolb.o xh_stlin.o xh_bmp.o xh_unkwn.o \ xh_bmpbt.o xh_cald.o xh_listc.o xh_scrol.o xh_stbox.o xh_tree.o \ - xh_frame.o xh_gdctl.o xh_scwin.o xh_split.o xh_wizrd.o + xh_frame.o xh_gdctl.o xh_scwin.o xh_split.o xh_wizrd.o xh_statbar.o DEPFILES=$(OBJECTS:.o=.d) APPEXTRADEFS=-I$(top_srcdir)/contrib/include $(EXPAT_DEFS) diff --git a/contrib/src/xrc/XrcVC.dsp b/contrib/src/xrc/XrcVC.dsp index bc4e3a712c..f52ecfbb40 100644 --- a/contrib/src/xrc/XrcVC.dsp +++ b/contrib/src/xrc/XrcVC.dsp @@ -294,6 +294,10 @@ SOURCE=.\xh_wizrd.cpp # End Source File # Begin Source File +SOURCE=.\xh_statbar.cpp +# End Source File +# Begin Source File + SOURCE=.\xml.cpp # End Source File # Begin Source File diff --git a/contrib/src/xrc/makefile.b32 b/contrib/src/xrc/makefile.b32 index ea4476f53f..2343ab59fc 100644 --- a/contrib/src/xrc/makefile.b32 +++ b/contrib/src/xrc/makefile.b32 @@ -27,7 +27,7 @@ OBJECTS=$(EXPAT_OBJECTS) \ xh_radbx.obj xh_sizer.obj xh_slidr.obj xh_spin.obj xh_stbmp.obj xh_sttxt.obj \ xh_text.obj xh_listb.obj xh_toolb.obj xh_stlin.obj xh_bmp.obj \ xh_bmpbt.obj xh_cald.obj xh_listc.obj xh_scrol.obj xh_stbox.obj \ - xh_tree.obj xh_unkwn.obj xh_frame.obj xh_gdctl.obj xh_scwin.obj xh_split.obj xh_wizrd.obj + xh_tree.obj xh_unkwn.obj xh_frame.obj xh_gdctl.obj xh_scwin.obj xh_split.obj xh_wizrd.obj xh_statbar.obj !include $(WXDIR)\src\makelib.b32 diff --git a/contrib/src/xrc/makefile.g95 b/contrib/src/xrc/makefile.g95 index a3e9d80636..860f6649cc 100644 --- a/contrib/src/xrc/makefile.g95 +++ b/contrib/src/xrc/makefile.g95 @@ -28,7 +28,7 @@ OBJECTS= $(XMLPARSEDIR_OBJECTS) $(XMLTOKDIR_OBJECTS) \ xh_radbx.o xh_sizer.o xh_slidr.o xh_spin.o xh_stbmp.o xh_sttxt.o \ xh_text.o xh_listb.o xh_toolb.o xh_stlin.o xh_bmp.o xh_unkwn.o \ xh_bmpbt.o xh_cald.o xh_listc.o xh_scrol.o xh_stbox.o xh_tree.o \ - xh_frame.o xh_gdctl.o xh_scwin.o xh_split.o xh_wizrd.o + xh_frame.o xh_gdctl.o xh_scwin.o xh_split.o xh_wizrd.o xh_statbar.o include $(WXDIR)/src/makelib.g95 diff --git a/contrib/src/xrc/makefile.vc b/contrib/src/xrc/makefile.vc index ee9600bae4..1fc4068976 100644 --- a/contrib/src/xrc/makefile.vc +++ b/contrib/src/xrc/makefile.vc @@ -57,7 +57,8 @@ OBJECTS=$(EXPAT_OBJS) \ $(D)\xh_text.obj $(D)\xh_listb.obj $(D)\xh_toolb.obj \ $(D)\xh_bmpbt.obj $(D)\xh_cald.obj $(D)\xh_listc.obj $(D)\xh_scrol.obj \ $(D)\xh_stbox.obj $(D)\xh_tree.obj $(D)\xh_stlin.obj $(D)\xh_bmp.obj \ - $(D)\xh_unkwn.obj $(D)\xh_gdctl.obj $(D)\xh_scwin.obj $(D)\xh_split.obj $(D)\xh_wizrd.obj + $(D)\xh_unkwn.obj $(D)\xh_gdctl.obj $(D)\xh_scwin.obj $(D)\xh_split.obj \ + $(D)\xh_wizrd.obj $(D)\xh_statbar.obj !include $(WXDIR)\src\makelib.vc diff --git a/contrib/src/xrc/makefile.wat b/contrib/src/xrc/makefile.wat index a128327d0a..912412ac7a 100644 --- a/contrib/src/xrc/makefile.wat +++ b/contrib/src/xrc/makefile.wat @@ -48,6 +48,7 @@ OBJECTS=& $(OUTPUTDIR)\xh_frame.obj & $(OUTPUTDIR)\xh_scwin.obj & $(OUTPUTDIR)\xh_split.obj & + $(OUTPUTDIR)\xh_statbar.obj & $(OUTPUTDIR)\xh_wizrd.obj !include $(WXDIR)\src\makelib.wat diff --git a/contrib/src/xrc/xmlrsall.cpp b/contrib/src/xrc/xmlrsall.cpp index 2749b9eb00..0b180c5cbf 100644 --- a/contrib/src/xrc/xmlrsall.cpp +++ b/contrib/src/xrc/xmlrsall.cpp @@ -99,4 +99,7 @@ void wxXmlResource::InitAllHandlers() #if wxUSE_WIZARDDLG AddHandler(new wxWizardXmlHandler); #endif +#if wxUSE_STATUSBAR + AddHandler(new wxStatusBarXmlHandler); +#endif } diff --git a/docs/changes.txt b/docs/changes.txt index f99b9e4254..68ec5b8074 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -195,6 +195,7 @@ Generic: - file dialog and directory dialog now support drive letters on OS/2 - fixed scrollbar problem in wxGrid (not showing scrollbars when sizing smaller) (Shane Harper) +- Added wxStatusBar support to XRC (Brian Ravnsgaard Riis) Unix: diff --git a/docs/tech/tn0014.txt b/docs/tech/tn0014.txt index f7ec689a60..933209a78e 100644 --- a/docs/tech/tn0014.txt +++ b/docs/tech/tn0014.txt @@ -316,6 +316,11 @@ and the splitter is created unsplitted. If there are two children, the splitter is created splitted, either horizontally or vertically depending on the value of "orientation" attribute. +wxStatusBar +----------- +fields Integer number of fields +widths Width1, Width2, Width3, ... + 5. More features diff --git a/include/wx/xrc/xh_all.h b/include/wx/xrc/xh_all.h index 51ccbf3533..fc1d82c439 100644 --- a/include/wx/xrc/xh_all.h +++ b/include/wx/xrc/xh_all.h @@ -49,5 +49,6 @@ #include "wx/xrc/xh_scwin.h" #include "wx/xrc/xh_split.h" #include "wx/xrc/xh_wizrd.h" +#include "wx/xrc/xh_statbar.h" #endif // _WX_XMLRES_H_ diff --git a/src/xrc/Makefile.in b/src/xrc/Makefile.in index 25eccb7df1..6c7a2a6e60 100644 --- a/src/xrc/Makefile.in +++ b/src/xrc/Makefile.in @@ -24,7 +24,8 @@ HEADERS=xh_all.h xh_bttn.h xh_chckb.h xh_chckl.h xh_choic.h xh_combo.h \ xh_radbt.h xh_radbx.h xh_sizer.h xh_slidr.h xh_spin.h xh_stbmp.h \ xh_sttxt.h xh_text.h xh_listb.h xml.h xmlres.h xh_toolb.h \ xh_bmpbt.h xh_cald.h xh_listc.h xh_scrol.h xh_stbox.h xh_tree.h \ - xh_stlin.h xh_bmp.h xh_unkwn.h xh_frame.h xh_gdctl.h xh_scwin.h xh_split.h xh_wizrd.h + xh_stlin.h xh_bmp.h xh_unkwn.h xh_frame.h xh_gdctl.h xh_scwin.h xh_split.h \ + xh_wizrd.h xh_statbar.h OBJECTS=$(EXPAT_OBJECTS) \ xml.o xmlres.o xmlrsall.o \ @@ -33,7 +34,7 @@ OBJECTS=$(EXPAT_OBJECTS) \ xh_radbx.o xh_sizer.o xh_slidr.o xh_spin.o xh_stbmp.o xh_sttxt.o \ xh_text.o xh_listb.o xh_toolb.o xh_stlin.o xh_bmp.o xh_unkwn.o \ xh_bmpbt.o xh_cald.o xh_listc.o xh_scrol.o xh_stbox.o xh_tree.o \ - xh_frame.o xh_gdctl.o xh_scwin.o xh_split.o xh_wizrd.o + xh_frame.o xh_gdctl.o xh_scwin.o xh_split.o xh_wizrd.o xh_statbar.o DEPFILES=$(OBJECTS:.o=.d) APPEXTRADEFS=-I$(top_srcdir)/contrib/include $(EXPAT_DEFS) diff --git a/src/xrc/XrcVC.dsp b/src/xrc/XrcVC.dsp index bc4e3a712c..f52ecfbb40 100644 --- a/src/xrc/XrcVC.dsp +++ b/src/xrc/XrcVC.dsp @@ -294,6 +294,10 @@ SOURCE=.\xh_wizrd.cpp # End Source File # Begin Source File +SOURCE=.\xh_statbar.cpp +# End Source File +# Begin Source File + SOURCE=.\xml.cpp # End Source File # Begin Source File diff --git a/src/xrc/makefile.b32 b/src/xrc/makefile.b32 index ea4476f53f..2343ab59fc 100644 --- a/src/xrc/makefile.b32 +++ b/src/xrc/makefile.b32 @@ -27,7 +27,7 @@ OBJECTS=$(EXPAT_OBJECTS) \ xh_radbx.obj xh_sizer.obj xh_slidr.obj xh_spin.obj xh_stbmp.obj xh_sttxt.obj \ xh_text.obj xh_listb.obj xh_toolb.obj xh_stlin.obj xh_bmp.obj \ xh_bmpbt.obj xh_cald.obj xh_listc.obj xh_scrol.obj xh_stbox.obj \ - xh_tree.obj xh_unkwn.obj xh_frame.obj xh_gdctl.obj xh_scwin.obj xh_split.obj xh_wizrd.obj + xh_tree.obj xh_unkwn.obj xh_frame.obj xh_gdctl.obj xh_scwin.obj xh_split.obj xh_wizrd.obj xh_statbar.obj !include $(WXDIR)\src\makelib.b32 diff --git a/src/xrc/makefile.g95 b/src/xrc/makefile.g95 index a3e9d80636..860f6649cc 100644 --- a/src/xrc/makefile.g95 +++ b/src/xrc/makefile.g95 @@ -28,7 +28,7 @@ OBJECTS= $(XMLPARSEDIR_OBJECTS) $(XMLTOKDIR_OBJECTS) \ xh_radbx.o xh_sizer.o xh_slidr.o xh_spin.o xh_stbmp.o xh_sttxt.o \ xh_text.o xh_listb.o xh_toolb.o xh_stlin.o xh_bmp.o xh_unkwn.o \ xh_bmpbt.o xh_cald.o xh_listc.o xh_scrol.o xh_stbox.o xh_tree.o \ - xh_frame.o xh_gdctl.o xh_scwin.o xh_split.o xh_wizrd.o + xh_frame.o xh_gdctl.o xh_scwin.o xh_split.o xh_wizrd.o xh_statbar.o include $(WXDIR)/src/makelib.g95 diff --git a/src/xrc/makefile.vc b/src/xrc/makefile.vc index ee9600bae4..1fc4068976 100644 --- a/src/xrc/makefile.vc +++ b/src/xrc/makefile.vc @@ -57,7 +57,8 @@ OBJECTS=$(EXPAT_OBJS) \ $(D)\xh_text.obj $(D)\xh_listb.obj $(D)\xh_toolb.obj \ $(D)\xh_bmpbt.obj $(D)\xh_cald.obj $(D)\xh_listc.obj $(D)\xh_scrol.obj \ $(D)\xh_stbox.obj $(D)\xh_tree.obj $(D)\xh_stlin.obj $(D)\xh_bmp.obj \ - $(D)\xh_unkwn.obj $(D)\xh_gdctl.obj $(D)\xh_scwin.obj $(D)\xh_split.obj $(D)\xh_wizrd.obj + $(D)\xh_unkwn.obj $(D)\xh_gdctl.obj $(D)\xh_scwin.obj $(D)\xh_split.obj \ + $(D)\xh_wizrd.obj $(D)\xh_statbar.obj !include $(WXDIR)\src\makelib.vc diff --git a/src/xrc/makefile.wat b/src/xrc/makefile.wat index a128327d0a..912412ac7a 100644 --- a/src/xrc/makefile.wat +++ b/src/xrc/makefile.wat @@ -48,6 +48,7 @@ OBJECTS=& $(OUTPUTDIR)\xh_frame.obj & $(OUTPUTDIR)\xh_scwin.obj & $(OUTPUTDIR)\xh_split.obj & + $(OUTPUTDIR)\xh_statbar.obj & $(OUTPUTDIR)\xh_wizrd.obj !include $(WXDIR)\src\makelib.wat diff --git a/src/xrc/xmlrsall.cpp b/src/xrc/xmlrsall.cpp index 2749b9eb00..0b180c5cbf 100644 --- a/src/xrc/xmlrsall.cpp +++ b/src/xrc/xmlrsall.cpp @@ -99,4 +99,7 @@ void wxXmlResource::InitAllHandlers() #if wxUSE_WIZARDDLG AddHandler(new wxWizardXmlHandler); #endif +#if wxUSE_STATUSBAR + AddHandler(new wxStatusBarXmlHandler); +#endif }