fix for VC++ warnings about missing macro arguments

[wxWidgets.git] / include / wx / xrc / xml.h

diff --git a/include/wx/xrc/xml.h b/include/wx/xrc/xml.h
index c3122942e479845cc22599b3548993527ff349a6..c65d1364ff11519294b6ff5ee64b5c4f046e104e 100644 (file)
--- a/include/wx/xrc/xml.h
+++ b/include/wx/xrc/xml.h
@@ -20,16 +20,18 @@
 #include "wx/object.h"
 #include "wx/list.h"
 
 #include "wx/object.h"
 #include "wx/list.h"
 

-#ifdef WXXMLISDLL
-#define WXXMLDLLEXPORT WXDLLEXPORT
-#else
-#define WXXMLDLLEXPORT
+#ifdef WXMAKINGDLL_XRC
+    #define WXDLLIMPEXP_XRC WXEXPORT
+#elif defined(WXUSINGDLL)
+    #define WXDLLIMPEXP_XRC WXIMPORT
+#else // not making nor using DLL
+    #define WXDLLIMPEXP_XRC

 #endif
 
 #endif
 

-class WXXMLDLLEXPORT wxXmlNode;
-class WXXMLDLLEXPORT wxXmlProperty;
-class WXXMLDLLEXPORT wxXmlDocument;
-class WXXMLDLLEXPORT wxXmlIOHandler;
+class WXDLLIMPEXP_XRC wxXmlNode;
+class WXDLLIMPEXP_XRC wxXmlProperty;
+class WXDLLIMPEXP_XRC wxXmlDocument;
+class WXDLLIMPEXP_XRC wxXmlIOHandler;

 class WXDLLEXPORT wxInputStream;
 class WXDLLEXPORT wxOutputStream;
 
 class WXDLLEXPORT wxInputStream;
 class WXDLLEXPORT wxOutputStream;
 


@@ -58,7 +60,7 @@ enum wxXmlNodeType
 // Example: in <img src="hello.gif" id="3"/> "src" is property with value
 //          "hello.gif" and "id" is prop. with value "3".
 
 // Example: in <img src="hello.gif" id="3"/> "src" is property with value
 //          "hello.gif" and "id" is prop. with value "3".
 

-class WXXMLDLLEXPORT wxXmlProperty
+class WXDLLIMPEXP_XRC wxXmlProperty

 {
 public:
     wxXmlProperty() : m_next(NULL) {}
 {
 public:
     wxXmlProperty() : m_next(NULL) {}


@@ -91,7 +93,7 @@ private:
 // If wxUSE_UNICODE is 0, all strings are encoded in the encoding given to Load
 // (default is UTF-8).
 
 // If wxUSE_UNICODE is 0, all strings are encoded in the encoding given to Load
 // (default is UTF-8).
 

-class WXXMLDLLEXPORT wxXmlNode
+class WXDLLIMPEXP_XRC wxXmlNode

 {
 public:
     wxXmlNode() : m_properties(NULL), m_parent(NULL),
 {
 public:
     wxXmlNode() : m_properties(NULL), m_parent(NULL),


@@ -161,7 +163,7 @@ private:
 
 // This class holds XML data/document as parsed by XML parser.
 
 
 // This class holds XML data/document as parsed by XML parser.
 

-class WXXMLDLLEXPORT wxXmlDocument : public wxObject
+class WXDLLIMPEXP_XRC wxXmlDocument : public wxObject

 {
 public:
     wxXmlDocument();
 {
 public:
     wxXmlDocument();