Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied patch [ 882493 ] Added XRC support for wxStatusBar

Browse Source 
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
This commit is contained in:
Julian Smart
2004-01-23 10:01:44 +00:00
parent bfdad56521
commit 05b43e428d
18 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/include/wx/xrc/xh_all.h
View File

@@ -49,5 +49,6 @@
#include "wx/xrc/xh_scwin.h" #include "wx/xrc/xh_scwin.h"
#include "wx/xrc/xh_split.h" #include "wx/xrc/xh_split.h"
#include "wx/xrc/xh_wizrd.h" #include "wx/xrc/xh_wizrd.h"
#include "wx/xrc/xh_statbar.h"
#endif // _WX_XMLRES_H_ #endif // _WX_XMLRES_H_

5
contrib/src/xrc/Makefile.in
View File

@@ -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_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_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_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) \ OBJECTS=$(EXPAT_OBJECTS) \
xml.o xmlres.o xmlrsall.o \ 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_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_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_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) DEPFILES=$(OBJECTS:.o=.d)
APPEXTRADEFS=-I$(top_srcdir)/contrib/include $(EXPAT_DEFS) APPEXTRADEFS=-I$(top_srcdir)/contrib/include $(EXPAT_DEFS)

4
contrib/src/xrc/XrcVC.dsp
View File

@@ -294,6 +294,10 @@ SOURCE=.\xh_wizrd.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\xh_statbar.cpp
# End Source File
# Begin Source File
SOURCE=.\xml.cpp SOURCE=.\xml.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File

2
contrib/src/xrc/makefile.b32
View File

@@ -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_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_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_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 !include $(WXDIR)\src\makelib.b32

2
contrib/src/xrc/makefile.g95
View File

@@ -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_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_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_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 include $(WXDIR)/src/makelib.g95

3
contrib/src/xrc/makefile.vc
View File

@@ -57,7 +57,8 @@ OBJECTS=$(EXPAT_OBJS) \
$(D)\xh_text.obj $(D)\xh_listb.obj $(D)\xh_toolb.obj \ $(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_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_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 !include $(WXDIR)\src\makelib.vc

1
contrib/src/xrc/makefile.wat
View File

@@ -48,6 +48,7 @@ OBJECTS=&
$(OUTPUTDIR)\xh_frame.obj & $(OUTPUTDIR)\xh_frame.obj &
$(OUTPUTDIR)\xh_scwin.obj & $(OUTPUTDIR)\xh_scwin.obj &
$(OUTPUTDIR)\xh_split.obj & $(OUTPUTDIR)\xh_split.obj &
$(OUTPUTDIR)\xh_statbar.obj &
$(OUTPUTDIR)\xh_wizrd.obj $(OUTPUTDIR)\xh_wizrd.obj
!include $(WXDIR)\src\makelib.wat !include $(WXDIR)\src\makelib.wat

3
contrib/src/xrc/xmlrsall.cpp
View File

@@ -99,4 +99,7 @@ void wxXmlResource::InitAllHandlers()
#if wxUSE_WIZARDDLG #if wxUSE_WIZARDDLG
AddHandler(new wxWizardXmlHandler); AddHandler(new wxWizardXmlHandler);
#endif #endif
#if wxUSE_STATUSBAR
AddHandler(new wxStatusBarXmlHandler);
#endif
} }

1
docs/changes.txt
View File

@@ -195,6 +195,7 @@ Generic:
- file dialog and directory dialog now support drive letters on OS/2 - file dialog and directory dialog now support drive letters on OS/2
- fixed scrollbar problem in wxGrid (not showing scrollbars - fixed scrollbar problem in wxGrid (not showing scrollbars
when sizing smaller) (Shane Harper) when sizing smaller) (Shane Harper)
- Added wxStatusBar support to XRC (Brian Ravnsgaard Riis)
Unix: Unix:

5
docs/tech/tn0014.txt
View File

@@ -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 splitter is created splitted, either horizontally or vertically depending
on the value of "orientation" attribute. on the value of "orientation" attribute.
wxStatusBar
-----------
fields Integer number of fields
widths Width1, Width2, Width3, ...
5. More features 5. More features

1
include/wx/xrc/xh_all.h
View File

@@ -49,5 +49,6 @@
#include "wx/xrc/xh_scwin.h" #include "wx/xrc/xh_scwin.h"
#include "wx/xrc/xh_split.h" #include "wx/xrc/xh_split.h"
#include "wx/xrc/xh_wizrd.h" #include "wx/xrc/xh_wizrd.h"
#include "wx/xrc/xh_statbar.h"
#endif // _WX_XMLRES_H_ #endif // _WX_XMLRES_H_

5
src/xrc/Makefile.in
View File

@@ -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_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_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_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) \ OBJECTS=$(EXPAT_OBJECTS) \
xml.o xmlres.o xmlrsall.o \ 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_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_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_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) DEPFILES=$(OBJECTS:.o=.d)
APPEXTRADEFS=-I$(top_srcdir)/contrib/include $(EXPAT_DEFS) APPEXTRADEFS=-I$(top_srcdir)/contrib/include $(EXPAT_DEFS)

4
src/xrc/XrcVC.dsp
View File

@@ -294,6 +294,10 @@ SOURCE=.\xh_wizrd.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\xh_statbar.cpp
# End Source File
# Begin Source File
SOURCE=.\xml.cpp SOURCE=.\xml.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File

2
src/xrc/makefile.b32
View File

@@ -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_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_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_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 !include $(WXDIR)\src\makelib.b32

2
src/xrc/makefile.g95
View File

@@ -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_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_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_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 include $(WXDIR)/src/makelib.g95

3
src/xrc/makefile.vc
View File

@@ -57,7 +57,8 @@ OBJECTS=$(EXPAT_OBJS) \
$(D)\xh_text.obj $(D)\xh_listb.obj $(D)\xh_toolb.obj \ $(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_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_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 !include $(WXDIR)\src\makelib.vc

1
src/xrc/makefile.wat
View File

@@ -48,6 +48,7 @@ OBJECTS=&
$(OUTPUTDIR)\xh_frame.obj & $(OUTPUTDIR)\xh_frame.obj &
$(OUTPUTDIR)\xh_scwin.obj & $(OUTPUTDIR)\xh_scwin.obj &
$(OUTPUTDIR)\xh_split.obj & $(OUTPUTDIR)\xh_split.obj &
$(OUTPUTDIR)\xh_statbar.obj &
$(OUTPUTDIR)\xh_wizrd.obj $(OUTPUTDIR)\xh_wizrd.obj
!include $(WXDIR)\src\makelib.wat !include $(WXDIR)\src\makelib.wat

3
src/xrc/xmlrsall.cpp
View File

@@ -99,4 +99,7 @@ void wxXmlResource::InitAllHandlers()
#if wxUSE_WIZARDDLG #if wxUSE_WIZARDDLG
AddHandler(new wxWizardXmlHandler); AddHandler(new wxWizardXmlHandler);
#endif #endif
#if wxUSE_STATUSBAR
AddHandler(new wxStatusBarXmlHandler);
#endif
} }