Changed WXDLLEXPORT's to WXXMLDLLEXPORT so the xmlres library can be

used from wx DLL without it being a DLL also.  Some work will still
need to be done for making xmlres be a DLL...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

contrib/include/wx/xml/xh_bmp.h

@@ -18,7 +18,7 @@
 #include "wx/xml/xmlres.h"
 
 
-class WXDLLEXPORT wxBitmapXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxBitmapXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxBitmapXmlHandler();
@@ -26,7 +26,7 @@ public:
     virtual bool CanHandle(wxXmlNode *node);
 };
 
-class WXDLLEXPORT wxIconXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxIconXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxIconXmlHandler();

contrib/include/wx/xml/xh_bmpbt.h

@@ -18,7 +18,7 @@
 #include "wx/xml/xmlres.h"
 
 
-class WXDLLEXPORT wxBitmapButtonXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxBitmapButtonXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxBitmapButtonXmlHandler();

contrib/include/wx/xml/xh_bttn.h

@@ -17,7 +17,7 @@
 
 #include "wx/xml/xmlres.h"
 
-class WXDLLEXPORT wxButtonXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxButtonXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxButtonXmlHandler();

contrib/include/wx/xml/xh_cald.h

@@ -17,7 +17,7 @@
 
 #include "wx/xml/xmlres.h"
 
-class WXDLLEXPORT wxCalendarCtrlXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxCalendarCtrlXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxCalendarCtrlXmlHandler();

contrib/include/wx/xml/xh_chckb.h

@@ -20,7 +20,7 @@
 
 #if wxUSE_CHECKBOX
 
-class WXDLLEXPORT wxCheckBoxXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxCheckBoxXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxCheckBoxXmlHandler();

contrib/include/wx/xml/xh_chckl.h

@@ -17,7 +17,7 @@
 
 #include "wx/xml/xmlres.h"
 
-class WXDLLEXPORT wxCheckListXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxCheckListXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxCheckListXmlHandler();

contrib/include/wx/xml/xh_choic.h

@@ -17,7 +17,7 @@
 
 #include "wx/xml/xmlres.h"
 
-class WXDLLEXPORT wxChoiceXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxChoiceXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxChoiceXmlHandler();

contrib/include/wx/xml/xh_combo.h

@@ -19,7 +19,7 @@
 
 #if wxUSE_COMBOBOX
 
-class WXDLLEXPORT wxComboBoxXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxComboBoxXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxComboBoxXmlHandler();

contrib/include/wx/xml/xh_dlg.h

@@ -17,7 +17,7 @@
 
 #include "wx/xml/xmlres.h"
 
-class WXDLLEXPORT wxDialogXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxDialogXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxDialogXmlHandler();

contrib/include/wx/xml/xh_frame.h

@@ -17,7 +17,7 @@
 
 #include "wx/xml/xmlres.h"
 
-class WXDLLEXPORT wxFrameXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxFrameXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxFrameXmlHandler();

contrib/include/wx/xml/xh_gauge.h

@@ -22,7 +22,7 @@
 #include "wx/xml/xmlres.h"
 
 
-class WXDLLEXPORT wxGaugeXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxGaugeXmlHandler : public wxXmlResourceHandler
 {
     enum
     {

contrib/include/wx/xml/xh_html.h

@@ -21,7 +21,7 @@
 
 #if wxUSE_HTML
 
-class WXDLLEXPORT wxHtmlWindowXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxHtmlWindowXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxHtmlWindowXmlHandler();

contrib/include/wx/xml/xh_listb.h

@@ -19,7 +19,7 @@
 
 #if wxUSE_LISTBOX
 
-class WXDLLEXPORT wxListBoxXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxListBoxXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxListBoxXmlHandler();

contrib/include/wx/xml/xh_listc.h

@@ -17,7 +17,7 @@
 
 #include "wx/xml/xmlres.h"
 
-class WXDLLEXPORT wxListCtrlXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxListCtrlXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxListCtrlXmlHandler();

contrib/include/wx/xml/xh_menu.h

@@ -17,7 +17,7 @@
 
 #include "wx/xml/xmlres.h"
 
-class WXDLLEXPORT wxMenuXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxMenuXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxMenuXmlHandler();
@@ -28,7 +28,7 @@ private:
     bool m_insideMenu;
 };
 
-class WXDLLEXPORT wxMenuBarXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxMenuBarXmlHandler : public wxXmlResourceHandler
 {
     public:
         wxMenuBarXmlHandler();

contrib/include/wx/xml/xh_notbk.h

@@ -20,7 +20,7 @@
 
 class WXDLLEXPORT wxNotebook;
 
-class WXDLLEXPORT wxNotebookXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxNotebookXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxNotebookXmlHandler();

contrib/include/wx/xml/xh_panel.h

@@ -17,7 +17,7 @@
 
 #include "wx/xml/xmlres.h"
 
-class WXDLLEXPORT wxPanelXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxPanelXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxPanelXmlHandler();

contrib/include/wx/xml/xh_radbt.h

@@ -20,7 +20,7 @@
 
 #if wxUSE_RADIOBOX
 
-class WXDLLEXPORT wxRadioButtonXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxRadioButtonXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxRadioButtonXmlHandler();

contrib/include/wx/xml/xh_radbx.h

@@ -19,7 +19,7 @@
 
 #if wxUSE_RADIOBOX
 
-class WXDLLEXPORT wxRadioBoxXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxRadioBoxXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxRadioBoxXmlHandler();

contrib/include/wx/xml/xh_scrol.h

@@ -20,7 +20,7 @@
 
 
 
-class WXDLLEXPORT wxScrollBarXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxScrollBarXmlHandler : public wxXmlResourceHandler
 {
     enum
     {

contrib/include/wx/xml/xh_sizer.h

@@ -20,7 +20,7 @@
 
 class WXDLLEXPORT wxSizer;
 
-class WXDLLEXPORT wxSizerXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxSizerXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxSizerXmlHandler();

contrib/include/wx/xml/xh_slidr.h

@@ -20,7 +20,7 @@
 
 #if wxUSE_SLIDER
 
-class WXDLLEXPORT wxSliderXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxSliderXmlHandler : public wxXmlResourceHandler
 {
     enum
     {

contrib/include/wx/xml/xh_spin.h

@@ -19,7 +19,7 @@
 #include "wx/defs.h"
 
 #if wxUSE_SPINBTN
-class WXDLLEXPORT wxSpinButtonXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxSpinButtonXmlHandler : public wxXmlResourceHandler
 {
     enum
     {
@@ -36,7 +36,7 @@ public:
 #endif
 
 #if wxUSE_SPINCTRL
-class WXDLLEXPORT wxSpinCtrlXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxSpinCtrlXmlHandler : public wxXmlResourceHandler
 {
     enum
     {

contrib/include/wx/xml/xh_stbmp.h

@@ -18,7 +18,7 @@
 #include "wx/xml/xmlres.h"
 
 
-class WXDLLEXPORT wxStaticBitmapXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxStaticBitmapXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxStaticBitmapXmlHandler();

contrib/include/wx/xml/xh_stbox.h

@@ -18,7 +18,7 @@
 #include "wx/xml/xmlres.h"
 
 
-class WXDLLEXPORT wxStaticBoxXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxStaticBoxXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxStaticBoxXmlHandler();

contrib/include/wx/xml/xh_stlin.h

@@ -19,7 +19,7 @@
 
 #if wxUSE_STATLINE
 
-class WXDLLEXPORT wxStaticLineXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxStaticLineXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxStaticLineXmlHandler();

contrib/include/wx/xml/xh_sttxt.h

@@ -18,7 +18,7 @@
 #include "wx/xml/xmlres.h"
 
 
-class WXDLLEXPORT wxStaticTextXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxStaticTextXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxStaticTextXmlHandler();

contrib/include/wx/xml/xh_text.h

@@ -18,7 +18,7 @@
 #include "wx/xml/xmlres.h"
 
 
-class WXDLLEXPORT wxTextCtrlXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxTextCtrlXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxTextCtrlXmlHandler();

contrib/include/wx/xml/xh_toolb.h

@@ -21,7 +21,7 @@
 
 class WXDLLEXPORT wxToolBar;
 
-class WXDLLEXPORT wxToolBarXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxToolBarXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxToolBarXmlHandler();

contrib/include/wx/xml/xh_tree.h

@@ -17,7 +17,7 @@
 
 #include "wx/xml/xmlres.h"
 
-class WXDLLEXPORT wxTreeCtrlXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxTreeCtrlXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxTreeCtrlXmlHandler();

contrib/include/wx/xml/xh_unkwn.h

@@ -18,7 +18,7 @@
 #include "wx/xml/xmlres.h"
 
 
-class WXDLLEXPORT wxUnknownWidgetXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxUnknownWidgetXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxUnknownWidgetXmlHandler();

contrib/include/wx/xml/xml.h

@@ -20,11 +20,16 @@
 #include "wx/object.h"
 #include "wx/list.h"
 
+#ifdef WXXMLISDLL
+#define WXXMLDLLEXPORT WXDLLEXPORT
+#else
+#define WXXMLDLLEXPORT
+#endif
 
-class WXDLLEXPORT wxXmlNode;
-class WXDLLEXPORT wxXmlProperty;
-class WXDLLEXPORT wxXmlDocument;
-class WXDLLEXPORT wxXmlIOHandler;
+class WXXMLDLLEXPORT wxXmlNode;
+class WXXMLDLLEXPORT wxXmlProperty;
+class WXXMLDLLEXPORT wxXmlDocument;
+class WXXMLDLLEXPORT wxXmlIOHandler;
 class WXDLLEXPORT wxInputStream;
 class WXDLLEXPORT wxOutputStream;
 
@@ -65,7 +70,7 @@ enum wxXmlIOType
 // Example: in <img src="hello.gif" id="3"/> "src" is property with value
 //          "hello.gif" and "id" is prop. with value "3".
 
-class WXDLLEXPORT wxXmlProperty
+class WXXMLDLLEXPORT wxXmlProperty
 {
 public:
     wxXmlProperty() : m_next(NULL) {}
@@ -103,7 +108,7 @@ private:
 //     wxCSConv myConv("iso8859-2");
 //     wxString s(cMB2WC(node->GetContent().c_str()), myConv);
 
-class WXDLLEXPORT wxXmlNode
+class WXXMLDLLEXPORT wxXmlNode
 {
 public:
     wxXmlNode() : m_properties(NULL), m_parent(NULL),
@@ -175,7 +180,7 @@ private:
 // internal representation is independant on libxml and you can use
 // it without libxml (see Load/SaveBinary).
 
-class WXDLLEXPORT wxXmlDocument : public wxObject
+class WXXMLDLLEXPORT wxXmlDocument : public wxObject
 {
 public:
     wxXmlDocument() : wxObject(), m_version(wxT("1.0")), m_root(NULL)  {}
@@ -239,7 +244,7 @@ private:
 // wxXmlIOHandler takes care of loading and/or saving XML data.
 // see xmlio.h for available handlers
 
-class WXDLLEXPORT wxXmlIOHandler : public wxObject
+class WXXMLDLLEXPORT wxXmlIOHandler : public wxObject
 {
     public:
         wxXmlIOHandler() {}
@@ -254,6 +259,6 @@ class WXDLLEXPORT wxXmlIOHandler : public wxObject
 
 
 
-
+void wxXmlInitXmlModule();
 
 #endif // _WX_XML_H_

contrib/include/wx/xml/xmlio.h

@@ -20,7 +20,7 @@
 #include "wx/xml/xml.h"
 
 
-class WXDLLEXPORT wxXmlIOHandlerExpat : public wxXmlIOHandler
+class WXXMLDLLEXPORT wxXmlIOHandlerExpat : public wxXmlIOHandler
 {
 public:
     virtual wxXmlIOType GetType() { return wxXML_IO_EXPAT; }
@@ -32,7 +32,7 @@ public:
 };
 
 
-class WXDLLEXPORT wxXmlIOHandlerWriter : public wxXmlIOHandler
+class WXXMLDLLEXPORT wxXmlIOHandlerWriter : public wxXmlIOHandler
 {
 public:
     virtual wxXmlIOType GetType() { return wxXML_IO_TEXT_OUTPUT; }
@@ -44,7 +44,7 @@ public:
 };
 
 
-class WXDLLEXPORT wxXmlIOHandlerBin : public wxXmlIOHandler
+class WXXMLDLLEXPORT wxXmlIOHandlerBin : public wxXmlIOHandler
 {
 public:
     wxXmlIOHandlerBin() {}
@@ -65,7 +65,7 @@ protected:
 
 #if wxUSE_ZLIB
 
-class WXDLLEXPORT wxXmlIOHandlerBinZ : public wxXmlIOHandlerBin
+class WXXMLDLLEXPORT wxXmlIOHandlerBinZ : public wxXmlIOHandlerBin
 {
 public:
     wxXmlIOHandlerBinZ() {}

contrib/include/wx/xml/xmlres.h

@@ -25,6 +25,8 @@
 #include "wx/bitmap.h"
 #include "wx/icon.h"
 
+#include "wx/xml/xml.h"
+
 class WXDLLEXPORT wxMenu;
 class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxDialog;
@@ -33,9 +35,8 @@ class WXDLLEXPORT wxWindow;
 class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxToolBar;
 
-class WXDLLEXPORT wxXmlResourceHandler;
+class WXXMLDLLEXPORT wxXmlResourceHandler;
 
-#include "wx/xml/xml.h"
 
 // These macros indicate current version of XML resources (this information is
 // encoded in root node of XRC file as "version" property).
@@ -61,7 +62,7 @@ class WXDLLEXPORT wxXmlResourceHandler;
                  WX_XMLRES_CURRENT_VERSION_RELEASE * 256 + \
                  WX_XMLRES_CURRENT_VERSION_REVISION)
 
-class WXDLLEXPORT wxXmlResourceDataRecord
+class WXXMLDLLEXPORT wxXmlResourceDataRecord
 {
 public:
     wxXmlResourceDataRecord() : Doc(NULL), Time(wxDateTime::Now()) {}
@@ -72,13 +73,19 @@ public:
     wxDateTime Time;
 };
 
+
+#ifdef WXXMLISDLL
 WX_DECLARE_EXPORTED_OBJARRAY(wxXmlResourceDataRecord, wxXmlResourceDataRecords);
+#else
+WX_DECLARE_OBJARRAY(wxXmlResourceDataRecord, wxXmlResourceDataRecords);
+#endif
+
 
 // This class holds XML resources from one or more .xml files
 // (or derived forms, either binary or zipped -- see manual for
 // details).
 
-class WXDLLEXPORT wxXmlResource : public wxObject
+class WXXMLDLLEXPORT wxXmlResource : public wxObject
 {
 public:
     // Ctor. If use_locale is TRUE, translatable strings are
@@ -225,7 +232,7 @@ extern wxXmlResource *wxTheXmlResource;
 #endif
 
 
-class WXDLLEXPORT wxXmlResourceHandler : public wxObject
+class WXXMLDLLEXPORT wxXmlResourceHandler : public wxObject
 {
 public:
     wxXmlResourceHandler();
@@ -346,5 +353,6 @@ protected:
 #define ADD_STYLE(style) AddStyle(wxT(#style), style)
 
 
+void wxXmlInitResourceModule();
 
 #endif // _WX_XMLRES_H_