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/include/wx/xml/xh_all.h

@@ -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_

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_

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

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

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
 {

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
 {

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

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
 {

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
 {

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
 

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
 {

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
 {

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

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"
 

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
 

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
 {

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
 {

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
 

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
 {

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

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
 

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"
 
 

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;

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

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

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

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

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
 

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

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

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
 

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
 {

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

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);
 };
 

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;