From 999d9a9f795cfc745681989ae0f30e531cde059f Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 9 Jun 2001 22:18:45 +0000 Subject: [PATCH] changed wxXML to XRC, wx/xml/*.h->wx/xrc/*.h git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/configure | 10 +- contrib/configure.in | 5 +- contrib/include/wx/xml/xh_all.h | 49 - contrib/include/wx/xrc/xh_all.h | 49 + contrib/include/wx/{xml => xrc}/xh_bmp.h | 2 +- contrib/include/wx/{xml => xrc}/xh_bmpbt.h | 2 +- contrib/include/wx/{xml => xrc}/xh_bttn.h | 2 +- contrib/include/wx/{xml => xrc}/xh_cald.h | 2 +- contrib/include/wx/{xml => xrc}/xh_chckb.h | 2 +- contrib/include/wx/{xml => xrc}/xh_chckl.h | 2 +- contrib/include/wx/{xml => xrc}/xh_choic.h | 2 +- contrib/include/wx/{xml => xrc}/xh_combo.h | 2 +- contrib/include/wx/{xml => xrc}/xh_dlg.h | 2 +- contrib/include/wx/{xml => xrc}/xh_frame.h | 2 +- contrib/include/wx/{xml => xrc}/xh_gauge.h | 2 +- contrib/include/wx/{xml => xrc}/xh_html.h | 2 +- contrib/include/wx/{xml => xrc}/xh_listb.h | 2 +- contrib/include/wx/{xml => xrc}/xh_listc.h | 2 +- contrib/include/wx/{xml => xrc}/xh_menu.h | 2 +- contrib/include/wx/{xml => xrc}/xh_notbk.h | 2 +- contrib/include/wx/{xml => xrc}/xh_panel.h | 2 +- contrib/include/wx/{xml => xrc}/xh_radbt.h | 2 +- contrib/include/wx/{xml => xrc}/xh_radbx.h | 2 +- contrib/include/wx/{xml => xrc}/xh_scrol.h | 2 +- contrib/include/wx/{xml => xrc}/xh_sizer.h | 2 +- contrib/include/wx/{xml => xrc}/xh_slidr.h | 2 +- contrib/include/wx/{xml => xrc}/xh_spin.h | 2 +- contrib/include/wx/{xml => xrc}/xh_stbmp.h | 2 +- contrib/include/wx/{xml => xrc}/xh_stbox.h | 2 +- contrib/include/wx/{xml => xrc}/xh_stlin.h | 2 +- contrib/include/wx/{xml => xrc}/xh_sttxt.h | 2 +- contrib/include/wx/{xml => xrc}/xh_text.h | 2 +- contrib/include/wx/{xml => xrc}/xh_toolb.h | 2 +- contrib/include/wx/{xml => xrc}/xh_tree.h | 2 +- contrib/include/wx/{xml => xrc}/xh_unkwn.h | 2 +- contrib/include/wx/{xml => xrc}/xml.h | 0 contrib/include/wx/{xml => xrc}/xmlio.h | 10 +- contrib/include/wx/{xml => xrc}/xmlres.h | 2 +- contrib/samples/Makefile.in | 2 +- contrib/samples/{xml => xrc}/Makefile.in | 6 +- contrib/samples/{xml => xrc}/XmlDemoVC.dsp | 8 +- contrib/samples/{xml => xrc}/XmlDemoVC.dsw | 0 contrib/samples/{xml => xrc}/makefile.b32 | 4 +- contrib/samples/{xml => xrc}/makefile.g95 | 4 +- contrib/samples/{xml => xrc}/makefile.vc | 4 +- contrib/samples/{xml => xrc}/rc/appicon.ico | Bin contrib/samples/{xml => xrc}/rc/appicon.xpm | 0 contrib/samples/{xml => xrc}/rc/fileopen.gif | Bin contrib/samples/{xml => xrc}/rc/filesave.gif | Bin contrib/samples/{xml => xrc}/rc/fuzzy.gif | Bin contrib/samples/{xml => xrc}/rc/quotes.gif | Bin contrib/samples/{xml => xrc}/rc/resource.xrc | 0 contrib/samples/{xml => xrc}/rc/scanning.gif | Bin contrib/samples/{xml => xrc}/rc/update.gif | Bin .../{xml/xmldemo.cpp => xrc/xrcdemo.cpp} | 6 +- .../{xml/xmldemo.rc => xrc/xrcdemo.rc} | 0 contrib/src/Makefile.in | 2 +- contrib/src/xml/FORMAT.txt | 324 -- contrib/src/xml/Makefile.in | 41 - contrib/src/xml/README.EXPAT | 39 - contrib/src/xml/expat/copying.txt | 20 - contrib/src/xml/expat/xmlparse/xmlparse.c | 3925 ----------------- contrib/src/xml/expat/xmlparse/xmlparse.h | 527 --- contrib/src/xml/expat/xmltok/ascii.h | 86 - contrib/src/xml/expat/xmltok/asciitab.h | 37 - contrib/src/xml/expat/xmltok/dllmain.c | 15 - contrib/src/xml/expat/xmltok/iasciitab.h | 38 - contrib/src/xml/expat/xmltok/latin1tab.h | 37 - contrib/src/xml/expat/xmltok/nametab.h | 150 - contrib/src/xml/expat/xmltok/utf8tab.h | 38 - contrib/src/xml/expat/xmltok/xmldef.h | 52 - contrib/src/xml/expat/xmltok/xmlrole.c | 1268 ------ contrib/src/xml/expat/xmltok/xmlrole.h | 99 - contrib/src/xml/expat/xmltok/xmltok.c | 1557 ------- contrib/src/xml/expat/xmltok/xmltok.h | 301 -- contrib/src/xml/expat/xmltok/xmltok_impl.c | 1790 -------- contrib/src/xml/expat/xmltok/xmltok_impl.h | 46 - contrib/src/xml/expat/xmltok/xmltok_ns.c | 96 - contrib/src/xml/makefile.b32 | 40 - contrib/src/xml/makefile.g95 | 40 - contrib/src/xml/makefile.vc | 149 - contrib/src/xml/makefile.wat | 31 - contrib/src/xml/wxXMLVC.dsp | 254 -- contrib/src/xml/xh_bmp.cpp | 60 - contrib/src/xml/xh_bmpbt.cpp | 66 - contrib/src/xml/xh_bttn.cpp | 59 - contrib/src/xml/xh_cald.cpp | 61 - contrib/src/xml/xh_chckb.cpp | 57 - contrib/src/xml/xh_chckl.cpp | 109 - contrib/src/xml/xh_choic.cpp | 95 - contrib/src/xml/xh_combo.cpp | 101 - contrib/src/xml/xh_dlg.cpp | 80 - contrib/src/xml/xh_frame.cpp | 85 - contrib/src/xml/xh_gauge.cpp | 74 - contrib/src/xml/xh_html.cpp | 72 - contrib/src/xml/xh_listb.cpp | 101 - contrib/src/xml/xh_listc.cpp | 67 - contrib/src/xml/xh_menu.cpp | 135 - contrib/src/xml/xh_notbk.cpp | 100 - contrib/src/xml/xh_panel.cpp | 63 - contrib/src/xml/xh_radbt.cpp | 66 - contrib/src/xml/xh_radbx.cpp | 102 - contrib/src/xml/xh_scrol.cpp | 63 - contrib/src/xml/xh_sizer.cpp | 219 - contrib/src/xml/xh_slidr.cpp | 94 - contrib/src/xml/xh_spin.cpp | 99 - contrib/src/xml/xh_stbmp.cpp | 52 - contrib/src/xml/xh_stbox.cpp | 52 - contrib/src/xml/xh_stlin.cpp | 55 - contrib/src/xml/xh_sttxt.cpp | 56 - contrib/src/xml/xh_text.cpp | 58 - contrib/src/xml/xh_toolb.cpp | 129 - contrib/src/xml/xh_tree.cpp | 57 - contrib/src/xml/xh_unkwn.cpp | 91 - contrib/src/xml/xml.cpp | 441 -- contrib/src/xml/xmlbin.cpp | 161 - contrib/src/xml/xmlbinz.cpp | 59 - contrib/src/xml/xmlexpat.cpp | 198 - contrib/src/xml/xmlres.cpp | 1001 ----- contrib/src/xml/xmlrsall.cpp | 97 - contrib/src/xml/xmlwrite.cpp | 152 - contrib/utils/convertrc/makefile.b32 | 2 +- contrib/utils/convertrc/makefile.g95 | 2 +- contrib/utils/convertrc/makefile.vc | 4 +- contrib/utils/convertrc/makefile.wat | 2 +- contrib/utils/wxrc/Makefile.in | 2 +- contrib/utils/wxrc/makefile.b32 | 2 +- contrib/utils/wxrc/makefile.g95 | 2 +- contrib/utils/wxrc/makefile.vc | 6 +- contrib/utils/wxrc/makefile.wat | 2 +- contrib/utils/wxrc/wxrc.cpp | 8 +- contrib/utils/wxrcedit/Makefile.in | 2 +- contrib/utils/wxrcedit/edapp.cpp | 2 +- contrib/utils/wxrcedit/editor.cpp | 4 +- contrib/utils/wxrcedit/makefile.b32 | 2 +- contrib/utils/wxrcedit/makefile.g95 | 2 +- contrib/utils/wxrcedit/makefile.vc | 6 +- contrib/utils/wxrcedit/makefile.wat | 2 +- contrib/utils/wxrcedit/nodehnd.cpp | 2 +- contrib/utils/wxrcedit/nodehnd.h | 2 +- contrib/utils/wxrcedit/pe_adv.cpp | 2 +- contrib/utils/wxrcedit/pe_basic.cpp | 2 +- contrib/utils/wxrcedit/preview.cpp | 6 +- contrib/utils/wxrcedit/propedit.cpp | 2 +- contrib/utils/wxrcedit/propframe.cpp | 2 +- contrib/utils/wxrcedit/xmlhelpr.cpp | 2 +- include/wx/xrc/xh_all.h | 49 + include/wx/xrc/xh_bmp.h | 38 + include/wx/xrc/xh_bmpbt.h | 30 + include/wx/xrc/xh_bttn.h | 29 + include/wx/xrc/xh_cald.h | 29 + include/wx/xrc/xh_chckb.h | 35 + include/wx/xrc/xh_chckl.h | 33 + include/wx/xrc/xh_choic.h | 32 + include/wx/xrc/xh_combo.h | 35 + include/wx/xrc/xh_dlg.h | 29 + include/wx/xrc/xh_frame.h | 29 + include/wx/xrc/xh_gauge.h | 40 + include/wx/xrc/xh_html.h | 34 + include/wx/xrc/xh_listb.h | 35 + include/wx/xrc/xh_listc.h | 29 + include/wx/xrc/xh_menu.h | 40 + include/wx/xrc/xh_notbk.h | 37 + include/wx/xrc/xh_panel.h | 29 + include/wx/xrc/xh_radbt.h | 33 + include/wx/xrc/xh_radbx.h | 35 + include/wx/xrc/xh_scrol.h | 39 + include/wx/xrc/xh_sizer.h | 38 + include/wx/xrc/xh_slidr.h | 40 + include/wx/xrc/xh_spin.h | 55 + include/wx/xrc/xh_stbmp.h | 30 + include/wx/xrc/xh_stbox.h | 30 + include/wx/xrc/xh_stlin.h | 32 + include/wx/xrc/xh_sttxt.h | 30 + include/wx/xrc/xh_text.h | 30 + include/wx/xrc/xh_toolb.h | 38 + include/wx/xrc/xh_tree.h | 29 + include/wx/xrc/xh_unkwn.h | 30 + include/wx/xrc/xml.h | 264 ++ include/wx/xrc/xmlio.h | 85 + include/wx/xrc/xmlres.h | 358 ++ samples/xrc/Makefile.in | 23 + samples/xrc/XmlDemoVC.dsp | 175 + .../wxXMLVC.dsw => samples/xrc/XmlDemoVC.dsw | 2 +- samples/xrc/makefile.b32 | 18 + samples/xrc/makefile.g95 | 14 + samples/xrc/makefile.vc | 14 + samples/xrc/rc/appicon.ico | Bin 0 -> 2238 bytes samples/xrc/rc/appicon.xpm | 61 + samples/xrc/rc/fileopen.gif | Bin 0 -> 136 bytes samples/xrc/rc/filesave.gif | Bin 0 -> 183 bytes samples/xrc/rc/fuzzy.gif | Bin 0 -> 338 bytes samples/xrc/rc/quotes.gif | Bin 0 -> 82 bytes samples/xrc/rc/resource.xrc | 154 + samples/xrc/rc/scanning.gif | Bin 0 -> 3418 bytes samples/xrc/rc/update.gif | Bin 0 -> 99 bytes samples/xrc/xrcdemo.cpp | 168 + samples/xrc/xrcdemo.rc | 2 + utils/wxrc/Makefile.in | 2 +- utils/wxrc/makefile.b32 | 2 +- utils/wxrc/makefile.g95 | 2 +- utils/wxrc/makefile.vc | 6 +- utils/wxrc/makefile.wat | 2 +- utils/wxrc/wxrc.cpp | 8 +- 204 files changed, 2599 insertions(+), 15844 deletions(-) delete mode 100644 contrib/include/wx/xml/xh_all.h create mode 100644 contrib/include/wx/xrc/xh_all.h rename contrib/include/wx/{xml => xrc}/xh_bmp.h (97%) rename contrib/include/wx/{xml => xrc}/xh_bmpbt.h (96%) rename contrib/include/wx/{xml => xrc}/xh_bttn.h (96%) rename contrib/include/wx/{xml => xrc}/xh_cald.h (96%) rename contrib/include/wx/{xml => xrc}/xh_chckb.h (96%) rename contrib/include/wx/{xml => xrc}/xh_chckl.h (96%) rename contrib/include/wx/{xml => xrc}/xh_choic.h (96%) rename contrib/include/wx/{xml => xrc}/xh_combo.h (96%) rename contrib/include/wx/{xml => xrc}/xh_dlg.h (96%) rename contrib/include/wx/{xml => xrc}/xh_frame.h (96%) rename contrib/include/wx/{xml => xrc}/xh_gauge.h (96%) rename contrib/include/wx/{xml => xrc}/xh_html.h (96%) rename contrib/include/wx/{xml => xrc}/xh_listb.h (96%) rename contrib/include/wx/{xml => xrc}/xh_listc.h (96%) rename contrib/include/wx/{xml => xrc}/xh_menu.h (97%) rename contrib/include/wx/{xml => xrc}/xh_notbk.h (96%) rename contrib/include/wx/{xml => xrc}/xh_panel.h (96%) rename contrib/include/wx/{xml => xrc}/xh_radbt.h (96%) rename contrib/include/wx/{xml => xrc}/xh_radbx.h (96%) rename contrib/include/wx/{xml => xrc}/xh_scrol.h (96%) rename contrib/include/wx/{xml => xrc}/xh_sizer.h (96%) rename contrib/include/wx/{xml => xrc}/xh_slidr.h (97%) rename contrib/include/wx/{xml => xrc}/xh_spin.h (97%) rename contrib/include/wx/{xml => xrc}/xh_stbmp.h (96%) rename contrib/include/wx/{xml => xrc}/xh_stbox.h (96%) rename contrib/include/wx/{xml => xrc}/xh_stlin.h (96%) rename contrib/include/wx/{xml => xrc}/xh_sttxt.h (96%) rename contrib/include/wx/{xml => xrc}/xh_text.h (96%) rename contrib/include/wx/{xml => xrc}/xh_toolb.h (96%) rename contrib/include/wx/{xml => xrc}/xh_tree.h (96%) rename contrib/include/wx/{xml => xrc}/xh_unkwn.h (96%) rename contrib/include/wx/{xml => xrc}/xml.h (100%) rename contrib/include/wx/{xml => xrc}/xmlio.h (85%) rename contrib/include/wx/{xml => xrc}/xmlres.h (99%) rename contrib/samples/{xml => xrc}/Makefile.in (83%) rename contrib/samples/{xml => xrc}/XmlDemoVC.dsp (96%) rename contrib/samples/{xml => xrc}/XmlDemoVC.dsw (100%) rename contrib/samples/{xml => xrc}/makefile.b32 (81%) rename contrib/samples/{xml => xrc}/makefile.g95 (84%) rename contrib/samples/{xml => xrc}/makefile.vc (76%) rename contrib/samples/{xml => xrc}/rc/appicon.ico (100%) rename contrib/samples/{xml => xrc}/rc/appicon.xpm (100%) rename contrib/samples/{xml => xrc}/rc/fileopen.gif (100%) rename contrib/samples/{xml => xrc}/rc/filesave.gif (100%) rename contrib/samples/{xml => xrc}/rc/fuzzy.gif (100%) rename contrib/samples/{xml => xrc}/rc/quotes.gif (100%) rename contrib/samples/{xml => xrc}/rc/resource.xrc (100%) rename contrib/samples/{xml => xrc}/rc/scanning.gif (100%) rename contrib/samples/{xml => xrc}/rc/update.gif (100%) rename contrib/samples/{xml/xmldemo.cpp => xrc/xrcdemo.cpp} (98%) rename contrib/samples/{xml/xmldemo.rc => xrc/xrcdemo.rc} (100%) delete mode 100644 contrib/src/xml/FORMAT.txt delete mode 100644 contrib/src/xml/Makefile.in delete mode 100644 contrib/src/xml/README.EXPAT delete mode 100644 contrib/src/xml/expat/copying.txt delete mode 100644 contrib/src/xml/expat/xmlparse/xmlparse.c delete mode 100644 contrib/src/xml/expat/xmlparse/xmlparse.h delete mode 100644 contrib/src/xml/expat/xmltok/ascii.h delete mode 100644 contrib/src/xml/expat/xmltok/asciitab.h delete mode 100644 contrib/src/xml/expat/xmltok/dllmain.c delete mode 100644 contrib/src/xml/expat/xmltok/iasciitab.h delete mode 100644 contrib/src/xml/expat/xmltok/latin1tab.h delete mode 100644 contrib/src/xml/expat/xmltok/nametab.h delete mode 100644 contrib/src/xml/expat/xmltok/utf8tab.h delete mode 100644 contrib/src/xml/expat/xmltok/xmldef.h delete mode 100644 contrib/src/xml/expat/xmltok/xmlrole.c delete mode 100644 contrib/src/xml/expat/xmltok/xmlrole.h delete mode 100644 contrib/src/xml/expat/xmltok/xmltok.c delete mode 100644 contrib/src/xml/expat/xmltok/xmltok.h delete mode 100644 contrib/src/xml/expat/xmltok/xmltok_impl.c delete mode 100644 contrib/src/xml/expat/xmltok/xmltok_impl.h delete mode 100644 contrib/src/xml/expat/xmltok/xmltok_ns.c delete mode 100644 contrib/src/xml/makefile.b32 delete mode 100644 contrib/src/xml/makefile.g95 delete mode 100644 contrib/src/xml/makefile.vc delete mode 100644 contrib/src/xml/makefile.wat delete mode 100644 contrib/src/xml/wxXMLVC.dsp delete mode 100644 contrib/src/xml/xh_bmp.cpp delete mode 100644 contrib/src/xml/xh_bmpbt.cpp delete mode 100644 contrib/src/xml/xh_bttn.cpp delete mode 100644 contrib/src/xml/xh_cald.cpp delete mode 100644 contrib/src/xml/xh_chckb.cpp delete mode 100644 contrib/src/xml/xh_chckl.cpp delete mode 100644 contrib/src/xml/xh_choic.cpp delete mode 100644 contrib/src/xml/xh_combo.cpp delete mode 100644 contrib/src/xml/xh_dlg.cpp delete mode 100644 contrib/src/xml/xh_frame.cpp delete mode 100644 contrib/src/xml/xh_gauge.cpp delete mode 100644 contrib/src/xml/xh_html.cpp delete mode 100644 contrib/src/xml/xh_listb.cpp delete mode 100644 contrib/src/xml/xh_listc.cpp delete mode 100644 contrib/src/xml/xh_menu.cpp delete mode 100644 contrib/src/xml/xh_notbk.cpp delete mode 100644 contrib/src/xml/xh_panel.cpp delete mode 100644 contrib/src/xml/xh_radbt.cpp delete mode 100644 contrib/src/xml/xh_radbx.cpp delete mode 100644 contrib/src/xml/xh_scrol.cpp delete mode 100644 contrib/src/xml/xh_sizer.cpp delete mode 100644 contrib/src/xml/xh_slidr.cpp delete mode 100644 contrib/src/xml/xh_spin.cpp delete mode 100644 contrib/src/xml/xh_stbmp.cpp delete mode 100644 contrib/src/xml/xh_stbox.cpp delete mode 100644 contrib/src/xml/xh_stlin.cpp delete mode 100644 contrib/src/xml/xh_sttxt.cpp delete mode 100644 contrib/src/xml/xh_text.cpp delete mode 100644 contrib/src/xml/xh_toolb.cpp delete mode 100644 contrib/src/xml/xh_tree.cpp delete mode 100644 contrib/src/xml/xh_unkwn.cpp delete mode 100644 contrib/src/xml/xml.cpp delete mode 100644 contrib/src/xml/xmlbin.cpp delete mode 100644 contrib/src/xml/xmlbinz.cpp delete mode 100644 contrib/src/xml/xmlexpat.cpp delete mode 100644 contrib/src/xml/xmlres.cpp delete mode 100644 contrib/src/xml/xmlrsall.cpp delete mode 100644 contrib/src/xml/xmlwrite.cpp create mode 100644 include/wx/xrc/xh_all.h create mode 100644 include/wx/xrc/xh_bmp.h create mode 100644 include/wx/xrc/xh_bmpbt.h create mode 100644 include/wx/xrc/xh_bttn.h create mode 100644 include/wx/xrc/xh_cald.h create mode 100644 include/wx/xrc/xh_chckb.h create mode 100644 include/wx/xrc/xh_chckl.h create mode 100644 include/wx/xrc/xh_choic.h create mode 100644 include/wx/xrc/xh_combo.h create mode 100644 include/wx/xrc/xh_dlg.h create mode 100644 include/wx/xrc/xh_frame.h create mode 100644 include/wx/xrc/xh_gauge.h create mode 100644 include/wx/xrc/xh_html.h create mode 100644 include/wx/xrc/xh_listb.h create mode 100644 include/wx/xrc/xh_listc.h create mode 100644 include/wx/xrc/xh_menu.h create mode 100644 include/wx/xrc/xh_notbk.h create mode 100644 include/wx/xrc/xh_panel.h create mode 100644 include/wx/xrc/xh_radbt.h create mode 100644 include/wx/xrc/xh_radbx.h create mode 100644 include/wx/xrc/xh_scrol.h create mode 100644 include/wx/xrc/xh_sizer.h create mode 100644 include/wx/xrc/xh_slidr.h create mode 100644 include/wx/xrc/xh_spin.h create mode 100644 include/wx/xrc/xh_stbmp.h create mode 100644 include/wx/xrc/xh_stbox.h create mode 100644 include/wx/xrc/xh_stlin.h create mode 100644 include/wx/xrc/xh_sttxt.h create mode 100644 include/wx/xrc/xh_text.h create mode 100644 include/wx/xrc/xh_toolb.h create mode 100644 include/wx/xrc/xh_tree.h create mode 100644 include/wx/xrc/xh_unkwn.h create mode 100644 include/wx/xrc/xml.h create mode 100644 include/wx/xrc/xmlio.h create mode 100644 include/wx/xrc/xmlres.h create mode 100644 samples/xrc/Makefile.in create mode 100644 samples/xrc/XmlDemoVC.dsp rename contrib/src/xml/wxXMLVC.dsw => samples/xrc/XmlDemoVC.dsw (88%) create mode 100644 samples/xrc/makefile.b32 create mode 100644 samples/xrc/makefile.g95 create mode 100644 samples/xrc/makefile.vc create mode 100644 samples/xrc/rc/appicon.ico create mode 100644 samples/xrc/rc/appicon.xpm create mode 100644 samples/xrc/rc/fileopen.gif create mode 100644 samples/xrc/rc/filesave.gif create mode 100644 samples/xrc/rc/fuzzy.gif create mode 100644 samples/xrc/rc/quotes.gif create mode 100644 samples/xrc/rc/resource.xrc create mode 100644 samples/xrc/rc/scanning.gif create mode 100644 samples/xrc/rc/update.gif create mode 100644 samples/xrc/xrcdemo.cpp create mode 100644 samples/xrc/xrcdemo.rc diff --git a/contrib/configure b/contrib/configure index d5805d8ee4..5f5ab2decd 100755 --- a/contrib/configure +++ b/contrib/configure @@ -817,7 +817,7 @@ trap 'rm -fr `echo " src/ogl/Makefile src/mmedia/Makefile src/stc/Makefile - src/xml/Makefile + src/xrc/Makefile src/canvas/Makefile src/gizmos/Makefile src/plot/Makefile @@ -834,7 +834,8 @@ trap 'rm -fr `echo " samples/gizmos/Makefile samples/gizmos/multicell/Makefile samples/gizmos/splittree/Makefile - samples/xml/Makefile + samples/gizmos/editlbox/Makefile + samples/xrc/Makefile samples/plot/Makefile samples/applet/Makefile utils/Makefile @@ -924,7 +925,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile src/ogl/Makefile src/mmedia/Makefile src/stc/Makefile - src/xml/Makefile + src/xrc/Makefile src/canvas/Makefile src/gizmos/Makefile src/plot/Makefile @@ -941,7 +942,8 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile samples/gizmos/Makefile samples/gizmos/multicell/Makefile samples/gizmos/splittree/Makefile - samples/xml/Makefile + samples/gizmos/editlbox/Makefile + samples/xrc/Makefile samples/plot/Makefile samples/applet/Makefile utils/Makefile diff --git a/contrib/configure.in b/contrib/configure.in index c6399802e2..bf39a34e41 100644 --- a/contrib/configure.in +++ b/contrib/configure.in @@ -42,7 +42,7 @@ AC_OUTPUT([ src/ogl/Makefile src/mmedia/Makefile src/stc/Makefile - src/xml/Makefile + src/xrc/Makefile src/canvas/Makefile src/gizmos/Makefile src/plot/Makefile @@ -59,7 +59,8 @@ AC_OUTPUT([ samples/gizmos/Makefile samples/gizmos/multicell/Makefile samples/gizmos/splittree/Makefile - samples/xml/Makefile + samples/gizmos/editlbox/Makefile + samples/xrc/Makefile samples/plot/Makefile samples/applet/Makefile utils/Makefile diff --git a/contrib/include/wx/xml/xh_all.h b/contrib/include/wx/xml/xh_all.h deleted file mode 100644 index a659665bd9..0000000000 --- a/contrib/include/wx/xml/xh_all.h +++ /dev/null @@ -1,49 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: xh_all.h -// Purpose: includes all xh_*.h files -// Author: Vaclav Slavik -// Created: 2000/03/05 -// RCS-ID: $Id$ -// Copyright: (c) 2000 Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_XH_ALL_H_ -#define _WX_XH_ALL_H_ - - -// Existing handlers: - -#include "wx/xml/xh_menu.h" -#include "wx/xml/xh_panel.h" -#include "wx/xml/xh_dlg.h" -#include "wx/xml/xh_bttn.h" -#include "wx/xml/xh_chckb.h" -#include "wx/xml/xh_gauge.h" -#include "wx/xml/xh_html.h" -#include "wx/xml/xh_spin.h" -#include "wx/xml/xh_sttxt.h" -#include "wx/xml/xh_slidr.h" -#include "wx/xml/xh_radbt.h" -#include "wx/xml/xh_radbx.h" -#include "wx/xml/xh_combo.h" -#include "wx/xml/xh_chckl.h" -#include "wx/xml/xh_choic.h" -#include "wx/xml/xh_sizer.h" -#include "wx/xml/xh_stbmp.h" -#include "wx/xml/xh_notbk.h" -#include "wx/xml/xh_text.h" -#include "wx/xml/xh_listb.h" -#include "wx/xml/xh_toolb.h" -#include "wx/xml/xh_bmpbt.h" -#include "wx/xml/xh_stbox.h" -#include "wx/xml/xh_scrol.h" -#include "wx/xml/xh_tree.h" -#include "wx/xml/xh_cald.h" -#include "wx/xml/xh_listc.h" -#include "wx/xml/xh_stlin.h" -#include "wx/xml/xh_bmp.h" -#include "wx/xml/xh_unkwn.h" -#include "wx/xml/xh_frame.h" - -#endif // _WX_XMLRES_H_ diff --git a/contrib/include/wx/xrc/xh_all.h b/contrib/include/wx/xrc/xh_all.h new file mode 100644 index 0000000000..3abb40c2c6 --- /dev/null +++ b/contrib/include/wx/xrc/xh_all.h @@ -0,0 +1,49 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: xh_all.h +// Purpose: includes all xh_*.h files +// Author: Vaclav Slavik +// Created: 2000/03/05 +// RCS-ID: $Id$ +// Copyright: (c) 2000 Vaclav Slavik +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_XH_ALL_H_ +#define _WX_XH_ALL_H_ + + +// Existing handlers: + +#include "wx/xrc/xh_menu.h" +#include "wx/xrc/xh_panel.h" +#include "wx/xrc/xh_dlg.h" +#include "wx/xrc/xh_bttn.h" +#include "wx/xrc/xh_chckb.h" +#include "wx/xrc/xh_gauge.h" +#include "wx/xrc/xh_html.h" +#include "wx/xrc/xh_spin.h" +#include "wx/xrc/xh_sttxt.h" +#include "wx/xrc/xh_slidr.h" +#include "wx/xrc/xh_radbt.h" +#include "wx/xrc/xh_radbx.h" +#include "wx/xrc/xh_combo.h" +#include "wx/xrc/xh_chckl.h" +#include "wx/xrc/xh_choic.h" +#include "wx/xrc/xh_sizer.h" +#include "wx/xrc/xh_stbmp.h" +#include "wx/xrc/xh_notbk.h" +#include "wx/xrc/xh_text.h" +#include "wx/xrc/xh_listb.h" +#include "wx/xrc/xh_toolb.h" +#include "wx/xrc/xh_bmpbt.h" +#include "wx/xrc/xh_stbox.h" +#include "wx/xrc/xh_scrol.h" +#include "wx/xrc/xh_tree.h" +#include "wx/xrc/xh_cald.h" +#include "wx/xrc/xh_listc.h" +#include "wx/xrc/xh_stlin.h" +#include "wx/xrc/xh_bmp.h" +#include "wx/xrc/xh_unkwn.h" +#include "wx/xrc/xh_frame.h" + +#endif // _WX_XMLRES_H_ diff --git a/contrib/include/wx/xml/xh_bmp.h b/contrib/include/wx/xrc/xh_bmp.h similarity index 97% rename from contrib/include/wx/xml/xh_bmp.h rename to contrib/include/wx/xrc/xh_bmp.h index 91a4d0280e..9867f1041a 100644 --- a/contrib/include/wx/xml/xh_bmp.h +++ b/contrib/include/wx/xrc/xh_bmp.h @@ -15,7 +15,7 @@ #pragma interface "xh_bmp.h" #endif -#include "wx/xml/xmlres.h" +#include "wx/xrc/xmlres.h" class WXXMLDLLEXPORT wxBitmapXmlHandler : public wxXmlResourceHandler diff --git a/contrib/include/wx/xml/xh_bmpbt.h b/contrib/include/wx/xrc/xh_bmpbt.h similarity index 96% rename from contrib/include/wx/xml/xh_bmpbt.h rename to contrib/include/wx/xrc/xh_bmpbt.h index 5da3190191..7927585a2d 100644 --- a/contrib/include/wx/xml/xh_bmpbt.h +++ b/contrib/include/wx/xrc/xh_bmpbt.h @@ -15,7 +15,7 @@ #pragma interface "xh_bmpbt.h" #endif -#include "wx/xml/xmlres.h" +#include "wx/xrc/xmlres.h" class WXXMLDLLEXPORT wxBitmapButtonXmlHandler : public wxXmlResourceHandler diff --git a/contrib/include/wx/xml/xh_bttn.h b/contrib/include/wx/xrc/xh_bttn.h similarity index 96% rename from contrib/include/wx/xml/xh_bttn.h rename to contrib/include/wx/xrc/xh_bttn.h index 5e5df78b69..c6c89c34a1 100644 --- a/contrib/include/wx/xml/xh_bttn.h +++ b/contrib/include/wx/xrc/xh_bttn.h @@ -15,7 +15,7 @@ #pragma interface "xh_bttn.h" #endif -#include "wx/xml/xmlres.h" +#include "wx/xrc/xmlres.h" class WXXMLDLLEXPORT wxButtonXmlHandler : public wxXmlResourceHandler { diff --git a/contrib/include/wx/xml/xh_cald.h b/contrib/include/wx/xrc/xh_cald.h similarity index 96% rename from contrib/include/wx/xml/xh_cald.h rename to contrib/include/wx/xrc/xh_cald.h index 60b7f618f0..51d0cdab9f 100644 --- a/contrib/include/wx/xml/xh_cald.h +++ b/contrib/include/wx/xrc/xh_cald.h @@ -15,7 +15,7 @@ #pragma interface "xh_cald.h" #endif -#include "wx/xml/xmlres.h" +#include "wx/xrc/xmlres.h" class WXXMLDLLEXPORT wxCalendarCtrlXmlHandler : public wxXmlResourceHandler { diff --git a/contrib/include/wx/xml/xh_chckb.h b/contrib/include/wx/xrc/xh_chckb.h similarity index 96% rename from contrib/include/wx/xml/xh_chckb.h rename to contrib/include/wx/xrc/xh_chckb.h index e28f3502b3..07794b7eb0 100644 --- a/contrib/include/wx/xml/xh_chckb.h +++ b/contrib/include/wx/xrc/xh_chckb.h @@ -15,7 +15,7 @@ #pragma interface "xh_chckb.h" #endif -#include "wx/xml/xmlres.h" +#include "wx/xrc/xmlres.h" #include "wx/defs.h" #if wxUSE_CHECKBOX diff --git a/contrib/include/wx/xml/xh_chckl.h b/contrib/include/wx/xrc/xh_chckl.h similarity index 96% rename from contrib/include/wx/xml/xh_chckl.h rename to contrib/include/wx/xrc/xh_chckl.h index 9c42fa20be..30247ccf87 100644 --- a/contrib/include/wx/xml/xh_chckl.h +++ b/contrib/include/wx/xrc/xh_chckl.h @@ -15,7 +15,7 @@ #pragma interface "xh_chckl.h" #endif -#include "wx/xml/xmlres.h" +#include "wx/xrc/xmlres.h" class WXXMLDLLEXPORT wxCheckListXmlHandler : public wxXmlResourceHandler { diff --git a/contrib/include/wx/xml/xh_choic.h b/contrib/include/wx/xrc/xh_choic.h similarity index 96% rename from contrib/include/wx/xml/xh_choic.h rename to contrib/include/wx/xrc/xh_choic.h index 16a2e1a428..d2387781c5 100644 --- a/contrib/include/wx/xml/xh_choic.h +++ b/contrib/include/wx/xrc/xh_choic.h @@ -15,7 +15,7 @@ #pragma interface "xh_choic.h" #endif -#include "wx/xml/xmlres.h" +#include "wx/xrc/xmlres.h" class WXXMLDLLEXPORT wxChoiceXmlHandler : public wxXmlResourceHandler { diff --git a/contrib/include/wx/xml/xh_combo.h b/contrib/include/wx/xrc/xh_combo.h similarity index 96% rename from contrib/include/wx/xml/xh_combo.h rename to contrib/include/wx/xrc/xh_combo.h index 2c5dc402e2..2128d953b5 100644 --- a/contrib/include/wx/xml/xh_combo.h +++ b/contrib/include/wx/xrc/xh_combo.h @@ -15,7 +15,7 @@ #pragma interface "xh_combo.h" #endif -#include "wx/xml/xmlres.h" +#include "wx/xrc/xmlres.h" #if wxUSE_COMBOBOX diff --git a/contrib/include/wx/xml/xh_dlg.h b/contrib/include/wx/xrc/xh_dlg.h similarity index 96% rename from contrib/include/wx/xml/xh_dlg.h rename to contrib/include/wx/xrc/xh_dlg.h index 135e126eb0..3fd4d51076 100644 --- a/contrib/include/wx/xml/xh_dlg.h +++ b/contrib/include/wx/xrc/xh_dlg.h @@ -15,7 +15,7 @@ #pragma interface "xh_dlg.h" #endif -#include "wx/xml/xmlres.h" +#include "wx/xrc/xmlres.h" class WXXMLDLLEXPORT wxDialogXmlHandler : public wxXmlResourceHandler { diff --git a/contrib/include/wx/xml/xh_frame.h b/contrib/include/wx/xrc/xh_frame.h similarity index 96% rename from contrib/include/wx/xml/xh_frame.h rename to contrib/include/wx/xrc/xh_frame.h index f5b3bb1bef..47e203114c 100644 --- a/contrib/include/wx/xml/xh_frame.h +++ b/contrib/include/wx/xrc/xh_frame.h @@ -15,7 +15,7 @@ #pragma interface "xh_frame.h" #endif -#include "wx/xml/xmlres.h" +#include "wx/xrc/xmlres.h" class WXXMLDLLEXPORT wxFrameXmlHandler : public wxXmlResourceHandler { diff --git a/contrib/include/wx/xml/xh_gauge.h b/contrib/include/wx/xrc/xh_gauge.h similarity index 96% rename from contrib/include/wx/xml/xh_gauge.h rename to contrib/include/wx/xrc/xh_gauge.h index 8dfcccf7db..9c2a94017d 100644 --- a/contrib/include/wx/xml/xh_gauge.h +++ b/contrib/include/wx/xrc/xh_gauge.h @@ -19,7 +19,7 @@ #if wxUSE_GAUGE -#include "wx/xml/xmlres.h" +#include "wx/xrc/xmlres.h" class WXXMLDLLEXPORT wxGaugeXmlHandler : public wxXmlResourceHandler diff --git a/contrib/include/wx/xml/xh_html.h b/contrib/include/wx/xrc/xh_html.h similarity index 96% rename from contrib/include/wx/xml/xh_html.h rename to contrib/include/wx/xrc/xh_html.h index cf1a0603ca..daaa93dcc7 100644 --- a/contrib/include/wx/xml/xh_html.h +++ b/contrib/include/wx/xrc/xh_html.h @@ -15,7 +15,7 @@ #pragma interface "xh_html.h" #endif -#include "wx/xml/xmlres.h" +#include "wx/xrc/xmlres.h" #include "wx/defs.h" diff --git a/contrib/include/wx/xml/xh_listb.h b/contrib/include/wx/xrc/xh_listb.h similarity index 96% rename from contrib/include/wx/xml/xh_listb.h rename to contrib/include/wx/xrc/xh_listb.h index 5a7d8d24a2..c080442c8b 100644 --- a/contrib/include/wx/xml/xh_listb.h +++ b/contrib/include/wx/xrc/xh_listb.h @@ -15,7 +15,7 @@ #pragma interface "xh_listb.h" #endif -#include "wx/xml/xmlres.h" +#include "wx/xrc/xmlres.h" #if wxUSE_LISTBOX diff --git a/contrib/include/wx/xml/xh_listc.h b/contrib/include/wx/xrc/xh_listc.h similarity index 96% rename from contrib/include/wx/xml/xh_listc.h rename to contrib/include/wx/xrc/xh_listc.h index 77d184a6e4..8bd27632b1 100644 --- a/contrib/include/wx/xml/xh_listc.h +++ b/contrib/include/wx/xrc/xh_listc.h @@ -15,7 +15,7 @@ #pragma interface "xh_listc.h" #endif -#include "wx/xml/xmlres.h" +#include "wx/xrc/xmlres.h" class WXXMLDLLEXPORT wxListCtrlXmlHandler : public wxXmlResourceHandler { diff --git a/contrib/include/wx/xml/xh_menu.h b/contrib/include/wx/xrc/xh_menu.h similarity index 97% rename from contrib/include/wx/xml/xh_menu.h rename to contrib/include/wx/xrc/xh_menu.h index 070e9b2de5..3ba54e86a6 100644 --- a/contrib/include/wx/xml/xh_menu.h +++ b/contrib/include/wx/xrc/xh_menu.h @@ -15,7 +15,7 @@ #pragma interface "xh_menu.h" #endif -#include "wx/xml/xmlres.h" +#include "wx/xrc/xmlres.h" class WXXMLDLLEXPORT wxMenuXmlHandler : public wxXmlResourceHandler { diff --git a/contrib/include/wx/xml/xh_notbk.h b/contrib/include/wx/xrc/xh_notbk.h similarity index 96% rename from contrib/include/wx/xml/xh_notbk.h rename to contrib/include/wx/xrc/xh_notbk.h index 5ee74d85fd..bd066d32d5 100644 --- a/contrib/include/wx/xml/xh_notbk.h +++ b/contrib/include/wx/xrc/xh_notbk.h @@ -14,7 +14,7 @@ #pragma interface "xh_notbk.h" #endif -#include "wx/xml/xmlres.h" +#include "wx/xrc/xmlres.h" #if wxUSE_NOTEBOOK diff --git a/contrib/include/wx/xml/xh_panel.h b/contrib/include/wx/xrc/xh_panel.h similarity index 96% rename from contrib/include/wx/xml/xh_panel.h rename to contrib/include/wx/xrc/xh_panel.h index fd5afdc5c9..817e5ecc76 100644 --- a/contrib/include/wx/xml/xh_panel.h +++ b/contrib/include/wx/xrc/xh_panel.h @@ -15,7 +15,7 @@ #pragma interface "xh_panel.h" #endif -#include "wx/xml/xmlres.h" +#include "wx/xrc/xmlres.h" class WXXMLDLLEXPORT wxPanelXmlHandler : public wxXmlResourceHandler { diff --git a/contrib/include/wx/xml/xh_radbt.h b/contrib/include/wx/xrc/xh_radbt.h similarity index 96% rename from contrib/include/wx/xml/xh_radbt.h rename to contrib/include/wx/xrc/xh_radbt.h index 0658ff5f6f..98dc3c9758 100644 --- a/contrib/include/wx/xml/xh_radbt.h +++ b/contrib/include/wx/xrc/xh_radbt.h @@ -15,7 +15,7 @@ #pragma interface "xh_radbt.h" #endif -#include "wx/xml/xmlres.h" +#include "wx/xrc/xmlres.h" #include "wx/defs.h" #if wxUSE_RADIOBOX diff --git a/contrib/include/wx/xml/xh_radbx.h b/contrib/include/wx/xrc/xh_radbx.h similarity index 96% rename from contrib/include/wx/xml/xh_radbx.h rename to contrib/include/wx/xrc/xh_radbx.h index 7343d39f66..4edfd8b905 100644 --- a/contrib/include/wx/xml/xh_radbx.h +++ b/contrib/include/wx/xrc/xh_radbx.h @@ -15,7 +15,7 @@ #pragma interface "xh_radbx.h" #endif -#include "wx/xml/xmlres.h" +#include "wx/xrc/xmlres.h" #if wxUSE_RADIOBOX diff --git a/contrib/include/wx/xml/xh_scrol.h b/contrib/include/wx/xrc/xh_scrol.h similarity index 96% rename from contrib/include/wx/xml/xh_scrol.h rename to contrib/include/wx/xrc/xh_scrol.h index a190117556..d5a1f43788 100644 --- a/contrib/include/wx/xml/xh_scrol.h +++ b/contrib/include/wx/xrc/xh_scrol.h @@ -15,7 +15,7 @@ #pragma interface "xh_scrol.h" #endif -#include "wx/xml/xmlres.h" +#include "wx/xrc/xmlres.h" #include "wx/defs.h" diff --git a/contrib/include/wx/xml/xh_sizer.h b/contrib/include/wx/xrc/xh_sizer.h similarity index 96% rename from contrib/include/wx/xml/xh_sizer.h rename to contrib/include/wx/xrc/xh_sizer.h index 7210672bb2..fb5cd23670 100644 --- a/contrib/include/wx/xml/xh_sizer.h +++ b/contrib/include/wx/xrc/xh_sizer.h @@ -15,7 +15,7 @@ #pragma interface "xh_sizer.h" #endif -#include "wx/xml/xmlres.h" +#include "wx/xrc/xmlres.h" class WXDLLEXPORT wxSizer; diff --git a/contrib/include/wx/xml/xh_slidr.h b/contrib/include/wx/xrc/xh_slidr.h similarity index 97% rename from contrib/include/wx/xml/xh_slidr.h rename to contrib/include/wx/xrc/xh_slidr.h index 45be53ae66..32fb738b7b 100644 --- a/contrib/include/wx/xml/xh_slidr.h +++ b/contrib/include/wx/xrc/xh_slidr.h @@ -15,7 +15,7 @@ #pragma interface "xh_slidr.h" #endif -#include "wx/xml/xmlres.h" +#include "wx/xrc/xmlres.h" #include "wx/defs.h" #if wxUSE_SLIDER diff --git a/contrib/include/wx/xml/xh_spin.h b/contrib/include/wx/xrc/xh_spin.h similarity index 97% rename from contrib/include/wx/xml/xh_spin.h rename to contrib/include/wx/xrc/xh_spin.h index 871a249f06..9d44a0ffe9 100644 --- a/contrib/include/wx/xml/xh_spin.h +++ b/contrib/include/wx/xrc/xh_spin.h @@ -15,7 +15,7 @@ #pragma interface "xh_spin.h" #endif -#include "wx/xml/xmlres.h" +#include "wx/xrc/xmlres.h" #include "wx/defs.h" #if wxUSE_SPINBTN diff --git a/contrib/include/wx/xml/xh_stbmp.h b/contrib/include/wx/xrc/xh_stbmp.h similarity index 96% rename from contrib/include/wx/xml/xh_stbmp.h rename to contrib/include/wx/xrc/xh_stbmp.h index 1fa07a405e..34493cfc8e 100644 --- a/contrib/include/wx/xml/xh_stbmp.h +++ b/contrib/include/wx/xrc/xh_stbmp.h @@ -15,7 +15,7 @@ #pragma interface "xh_stbmp.h" #endif -#include "wx/xml/xmlres.h" +#include "wx/xrc/xmlres.h" class WXXMLDLLEXPORT wxStaticBitmapXmlHandler : public wxXmlResourceHandler diff --git a/contrib/include/wx/xml/xh_stbox.h b/contrib/include/wx/xrc/xh_stbox.h similarity index 96% rename from contrib/include/wx/xml/xh_stbox.h rename to contrib/include/wx/xrc/xh_stbox.h index f4055a2abf..509f3ae81c 100644 --- a/contrib/include/wx/xml/xh_stbox.h +++ b/contrib/include/wx/xrc/xh_stbox.h @@ -15,7 +15,7 @@ #pragma interface "xh_stbox.h" #endif -#include "wx/xml/xmlres.h" +#include "wx/xrc/xmlres.h" class WXXMLDLLEXPORT wxStaticBoxXmlHandler : public wxXmlResourceHandler diff --git a/contrib/include/wx/xml/xh_stlin.h b/contrib/include/wx/xrc/xh_stlin.h similarity index 96% rename from contrib/include/wx/xml/xh_stlin.h rename to contrib/include/wx/xrc/xh_stlin.h index cad1234c41..7f7d5d67e7 100644 --- a/contrib/include/wx/xml/xh_stlin.h +++ b/contrib/include/wx/xrc/xh_stlin.h @@ -15,7 +15,7 @@ #pragma interface "xh_stlin.h" #endif -#include "wx/xml/xmlres.h" +#include "wx/xrc/xmlres.h" #if wxUSE_STATLINE diff --git a/contrib/include/wx/xml/xh_sttxt.h b/contrib/include/wx/xrc/xh_sttxt.h similarity index 96% rename from contrib/include/wx/xml/xh_sttxt.h rename to contrib/include/wx/xrc/xh_sttxt.h index 713f29d443..94683b82f9 100644 --- a/contrib/include/wx/xml/xh_sttxt.h +++ b/contrib/include/wx/xrc/xh_sttxt.h @@ -15,7 +15,7 @@ #pragma interface "xh_sttxt.h" #endif -#include "wx/xml/xmlres.h" +#include "wx/xrc/xmlres.h" class WXXMLDLLEXPORT wxStaticTextXmlHandler : public wxXmlResourceHandler diff --git a/contrib/include/wx/xml/xh_text.h b/contrib/include/wx/xrc/xh_text.h similarity index 96% rename from contrib/include/wx/xml/xh_text.h rename to contrib/include/wx/xrc/xh_text.h index db8bbb5b7c..6bd2b7d285 100644 --- a/contrib/include/wx/xml/xh_text.h +++ b/contrib/include/wx/xrc/xh_text.h @@ -15,7 +15,7 @@ #pragma interface "xh_text.h" #endif -#include "wx/xml/xmlres.h" +#include "wx/xrc/xmlres.h" class WXXMLDLLEXPORT wxTextCtrlXmlHandler : public wxXmlResourceHandler diff --git a/contrib/include/wx/xml/xh_toolb.h b/contrib/include/wx/xrc/xh_toolb.h similarity index 96% rename from contrib/include/wx/xml/xh_toolb.h rename to contrib/include/wx/xrc/xh_toolb.h index 426b58cc64..c149b77753 100644 --- a/contrib/include/wx/xml/xh_toolb.h +++ b/contrib/include/wx/xrc/xh_toolb.h @@ -15,7 +15,7 @@ #pragma interface "xh_toolb.h" #endif -#include "wx/xml/xmlres.h" +#include "wx/xrc/xmlres.h" #if wxUSE_TOOLBAR diff --git a/contrib/include/wx/xml/xh_tree.h b/contrib/include/wx/xrc/xh_tree.h similarity index 96% rename from contrib/include/wx/xml/xh_tree.h rename to contrib/include/wx/xrc/xh_tree.h index 9c3fe46a1a..1d49a463dd 100644 --- a/contrib/include/wx/xml/xh_tree.h +++ b/contrib/include/wx/xrc/xh_tree.h @@ -15,7 +15,7 @@ #pragma interface "xh_tree.h" #endif -#include "wx/xml/xmlres.h" +#include "wx/xrc/xmlres.h" class WXXMLDLLEXPORT wxTreeCtrlXmlHandler : public wxXmlResourceHandler { diff --git a/contrib/include/wx/xml/xh_unkwn.h b/contrib/include/wx/xrc/xh_unkwn.h similarity index 96% rename from contrib/include/wx/xml/xh_unkwn.h rename to contrib/include/wx/xrc/xh_unkwn.h index 1506345ffd..28aa99a251 100644 --- a/contrib/include/wx/xml/xh_unkwn.h +++ b/contrib/include/wx/xrc/xh_unkwn.h @@ -15,7 +15,7 @@ #pragma interface "xh_unkwn.h" #endif -#include "wx/xml/xmlres.h" +#include "wx/xrc/xmlres.h" class WXXMLDLLEXPORT wxUnknownWidgetXmlHandler : public wxXmlResourceHandler diff --git a/contrib/include/wx/xml/xml.h b/contrib/include/wx/xrc/xml.h similarity index 100% rename from contrib/include/wx/xml/xml.h rename to contrib/include/wx/xrc/xml.h diff --git a/contrib/include/wx/xml/xmlio.h b/contrib/include/wx/xrc/xmlio.h similarity index 85% rename from contrib/include/wx/xml/xmlio.h rename to contrib/include/wx/xrc/xmlio.h index a38e8a54c5..265ba508f7 100644 --- a/contrib/include/wx/xml/xmlio.h +++ b/contrib/include/wx/xrc/xmlio.h @@ -17,7 +17,7 @@ #include "wx/defs.h" #include "wx/string.h" -#include "wx/xml/xml.h" +#include "wx/xrc/xml.h" class WXXMLDLLEXPORT wxXmlIOHandlerExpat : public wxXmlIOHandler @@ -28,7 +28,8 @@ public: virtual bool CanSave() { return FALSE; } virtual bool Load(wxInputStream& stream, wxXmlDocument& doc); - virtual bool Save(wxOutputStream& stream, const wxXmlDocument& doc) { (void)stream; (void)doc; return FALSE; } + virtual bool Save(wxOutputStream& WXUNUSED(stream), const wxXmlDocument& WXUNUSED(doc)) + { return FALSE; } }; @@ -36,10 +37,11 @@ class WXXMLDLLEXPORT wxXmlIOHandlerWriter : public wxXmlIOHandler { public: virtual wxXmlIOType GetType() { return wxXML_IO_TEXT_OUTPUT; } - virtual bool CanLoad(wxInputStream& stream) { (void)stream; return FALSE; } + virtual bool CanLoad(wxInputStream& WXUNUSED(stream)) { return FALSE; } virtual bool CanSave() { return TRUE; } - virtual bool Load(wxInputStream& stream, wxXmlDocument& doc) { (void)stream; (void)doc; return FALSE; } + virtual bool Load(wxInputStream& WXUNUSED(stream), wxXmlDocument& WXUNUSED(doc)) + { return FALSE; } virtual bool Save(wxOutputStream& stream, const wxXmlDocument& doc); }; diff --git a/contrib/include/wx/xml/xmlres.h b/contrib/include/wx/xrc/xmlres.h similarity index 99% rename from contrib/include/wx/xml/xmlres.h rename to contrib/include/wx/xrc/xmlres.h index 172de3007f..61247013fa 100644 --- a/contrib/include/wx/xml/xmlres.h +++ b/contrib/include/wx/xrc/xmlres.h @@ -25,7 +25,7 @@ #include "wx/bitmap.h" #include "wx/icon.h" -#include "wx/xml/xml.h" +#include "wx/xrc/xml.h" class WXDLLEXPORT wxMenu; class WXDLLEXPORT wxMenuBar; diff --git a/contrib/samples/Makefile.in b/contrib/samples/Makefile.in index af1e43ad6a..1133423958 100644 --- a/contrib/samples/Makefile.in +++ b/contrib/samples/Makefile.in @@ -1,6 +1,6 @@ # $Id$ -CONTRIB_SAMPLES=mmedia ogl stc gizmos canvas xml plot applet +CONTRIB_SAMPLES=mmedia ogl stc gizmos canvas xrc plot applet all: @for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE)); done diff --git a/contrib/samples/xml/Makefile.in b/contrib/samples/xrc/Makefile.in similarity index 83% rename from contrib/samples/xml/Makefile.in rename to contrib/samples/xrc/Makefile.in index 45ee21ad31..6d7da4cb7c 100644 --- a/contrib/samples/xml/Makefile.in +++ b/contrib/samples/xrc/Makefile.in @@ -7,13 +7,13 @@ top_srcdir = @top_srcdir@/.. top_builddir = ../../.. -program_dir = contrib/samples/xml +program_dir = contrib/samples/xrc -PROGRAM=xmldemo +PROGRAM=xrcdemo OBJECTS=$(PROGRAM).o -APPEXTRALIBS=$(top_builddir)/lib/libwxxml.@WX_TARGET_LIBRARY_TYPE@ +APPEXTRALIBS=$(top_builddir)/lib/libwxxrc.@WX_TARGET_LIBRARY_TYPE@ APPEXTRADEFS=-I$(top_srcdir)/contrib/include DATADIRS = rc diff --git a/contrib/samples/xml/XmlDemoVC.dsp b/contrib/samples/xrc/XmlDemoVC.dsp similarity index 96% rename from contrib/samples/xml/XmlDemoVC.dsp rename to contrib/samples/xrc/XmlDemoVC.dsp index 4b10e558a3..d17ec0f40c 100644 --- a/contrib/samples/xml/XmlDemoVC.dsp +++ b/contrib/samples/xrc/XmlDemoVC.dsp @@ -56,7 +56,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib wxxml.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/xmldemo.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib wxxrc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/xmldemo.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib" !ELSEIF "$(CFG)" == "XmlDemoVC - Win32 Debug" @@ -82,7 +82,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib wxxmld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/xmldemo.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib wxxrcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/xmldemo.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib" !ELSEIF "$(CFG)" == "XmlDemoVC - Win32 Debug DLL" @@ -108,7 +108,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxdlld.lib wxxmld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/xmldemo.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxdlld.lib wxxrcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/xmldemo.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib" !ELSEIF "$(CFG)" == "XmlDemoVC - Win32 Release DLL" @@ -135,7 +135,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxdll.lib wxxml.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/xmldemo.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxdll.lib wxxrc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/xmldemo.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib" !ENDIF diff --git a/contrib/samples/xml/XmlDemoVC.dsw b/contrib/samples/xrc/XmlDemoVC.dsw similarity index 100% rename from contrib/samples/xml/XmlDemoVC.dsw rename to contrib/samples/xrc/XmlDemoVC.dsw diff --git a/contrib/samples/xml/makefile.b32 b/contrib/samples/xrc/makefile.b32 similarity index 81% rename from contrib/samples/xml/makefile.b32 rename to contrib/samples/xrc/makefile.b32 index f24b64c46b..717e97799b 100644 --- a/contrib/samples/xml/makefile.b32 +++ b/contrib/samples/xrc/makefile.b32 @@ -9,9 +9,9 @@ WXDIR = $(WXWIN) -TARGET=xmldemo +TARGET=xrcdemo -EXTRALIBS=$(WXDIR)\lib\wxxml.lib +EXTRALIBS=$(WXDIR)\lib\wxxrc.lib OBJECTS = $(TARGET).obj !include $(WXDIR)\src\makeprog.b32 diff --git a/contrib/samples/xml/makefile.g95 b/contrib/samples/xrc/makefile.g95 similarity index 84% rename from contrib/samples/xml/makefile.g95 rename to contrib/samples/xrc/makefile.g95 index 8377fef413..c78a91f737 100644 --- a/contrib/samples/xml/makefile.g95 +++ b/contrib/samples/xrc/makefile.g95 @@ -5,10 +5,10 @@ WXDIR = ../../.. -TARGET = xmldemo +TARGET = xrcdemo OBJECTS = $(TARGET).o EXTRAINC = -I$(WXDIR)/contrib/include -EXTRALIBS = -lwxxml +EXTRALIBS = -lwxxrc include $(WXDIR)/src/makeprog.g95 diff --git a/contrib/samples/xml/makefile.vc b/contrib/samples/xrc/makefile.vc similarity index 76% rename from contrib/samples/xml/makefile.vc rename to contrib/samples/xrc/makefile.vc index 4c4acdd25a..e0130b2180 100644 --- a/contrib/samples/xml/makefile.vc +++ b/contrib/samples/xrc/makefile.vc @@ -4,10 +4,10 @@ # Updated: WXDIR = $(WXWIN) -PROGRAM = xmldemo +PROGRAM = xrcdemo OBJECTS = $(PROGRAM).obj -EXTRALIBS = $(WXDIR)\lib\wxxml$(LIBEXT).lib +EXTRALIBS = $(WXDIR)\lib\wxxrc$(LIBEXT).lib EXTRAINC = -I$(WXDIR)\contrib\include !include $(WXDIR)\src\makeprog.vc diff --git a/contrib/samples/xml/rc/appicon.ico b/contrib/samples/xrc/rc/appicon.ico similarity index 100% rename from contrib/samples/xml/rc/appicon.ico rename to contrib/samples/xrc/rc/appicon.ico diff --git a/contrib/samples/xml/rc/appicon.xpm b/contrib/samples/xrc/rc/appicon.xpm similarity index 100% rename from contrib/samples/xml/rc/appicon.xpm rename to contrib/samples/xrc/rc/appicon.xpm diff --git a/contrib/samples/xml/rc/fileopen.gif b/contrib/samples/xrc/rc/fileopen.gif similarity index 100% rename from contrib/samples/xml/rc/fileopen.gif rename to contrib/samples/xrc/rc/fileopen.gif diff --git a/contrib/samples/xml/rc/filesave.gif b/contrib/samples/xrc/rc/filesave.gif similarity index 100% rename from contrib/samples/xml/rc/filesave.gif rename to contrib/samples/xrc/rc/filesave.gif diff --git a/contrib/samples/xml/rc/fuzzy.gif b/contrib/samples/xrc/rc/fuzzy.gif similarity index 100% rename from contrib/samples/xml/rc/fuzzy.gif rename to contrib/samples/xrc/rc/fuzzy.gif diff --git a/contrib/samples/xml/rc/quotes.gif b/contrib/samples/xrc/rc/quotes.gif similarity index 100% rename from contrib/samples/xml/rc/quotes.gif rename to contrib/samples/xrc/rc/quotes.gif diff --git a/contrib/samples/xml/rc/resource.xrc b/contrib/samples/xrc/rc/resource.xrc similarity index 100% rename from contrib/samples/xml/rc/resource.xrc rename to contrib/samples/xrc/rc/resource.xrc diff --git a/contrib/samples/xml/rc/scanning.gif b/contrib/samples/xrc/rc/scanning.gif similarity index 100% rename from contrib/samples/xml/rc/scanning.gif rename to contrib/samples/xrc/rc/scanning.gif diff --git a/contrib/samples/xml/rc/update.gif b/contrib/samples/xrc/rc/update.gif similarity index 100% rename from contrib/samples/xml/rc/update.gif rename to contrib/samples/xrc/rc/update.gif diff --git a/contrib/samples/xml/xmldemo.cpp b/contrib/samples/xrc/xrcdemo.cpp similarity index 98% rename from contrib/samples/xml/xmldemo.cpp rename to contrib/samples/xrc/xrcdemo.cpp index 9564d25abd..7faaa1cda6 100644 --- a/contrib/samples/xml/xmldemo.cpp +++ b/contrib/samples/xrc/xrcdemo.cpp @@ -15,8 +15,8 @@ // headers // ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "xmldemo.cpp" - #pragma interface "xmldemo.cpp" + #pragma implementation "xrcdemo.cpp" + #pragma interface "xrcdemo.cpp" #endif // For compilers that support precompilation, includes "wx/wx.h". @@ -33,7 +33,7 @@ #endif #include "wx/image.h" -#include "wx/xml/xmlres.h" +#include "wx/xrc/xmlres.h" // ---------------------------------------------------------------------------- // resources diff --git a/contrib/samples/xml/xmldemo.rc b/contrib/samples/xrc/xrcdemo.rc similarity index 100% rename from contrib/samples/xml/xmldemo.rc rename to contrib/samples/xrc/xrcdemo.rc diff --git a/contrib/src/Makefile.in b/contrib/src/Makefile.in index b531e22864..15b4ebb5b0 100644 --- a/contrib/src/Makefile.in +++ b/contrib/src/Makefile.in @@ -1,6 +1,6 @@ # $Id$ -CONTRIB_SUBDIRS=ogl mmedia stc xml applet +CONTRIB_SUBDIRS=ogl mmedia stc xrc applet all: @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done diff --git a/contrib/src/xml/FORMAT.txt b/contrib/src/xml/FORMAT.txt deleted file mode 100644 index 6d93b5d28b..0000000000 --- a/contrib/src/xml/FORMAT.txt +++ /dev/null @@ -1,324 +0,0 @@ - - XML resources file format - =============================== - - 1. Basics ------------ - -XML resource is well-formed XML document, i.e. all tags are paired -and there is only one root node, which is always . - -In the following text, I will use standard XML terminology: - - - - - -Here, tag_one is a node (the word 'tag' refers to the type of the node), -prop1 and prop2 are properties and tag_two is a child node of tag_one. -Property's default value is the value that will be assigned to the property -if you do not specify it explicitly. - -I will use the term "primary node" to refer to nodes than represent controls, -dialogs etc. "Secondary nodes" are nodes used to store data: - - primary - Demo Dialog... secondary - 100,200d secondary - secondary - - - - -In the example above,