X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/decb3a6a16ea5acf1dfcdb1b70cb6edaa09840c0..7f5d8b0085b0140f62fb49dd8a0e50ed895e4632:/contrib/include/wx/net/msg.h

diff --git a/contrib/include/wx/net/msg.h b/contrib/include/wx/net/msg.h
index ffc77727f5..4d487d34ec 100644
--- a/contrib/include/wx/net/msg.h
+++ b/contrib/include/wx/net/msg.h
@@ -9,30 +9,44 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "msg.h"
 #endif
 
 #ifndef _WX_MSG_H_
 #define _WX_MSG_H_
 
+#ifdef WXMAKINGDLL_NETUTILS
+    #define WXDLLIMPEXP_NETUTILS WXEXPORT
+    #define WXDLLIMPEXP_DATA_NETUTILS(type) WXEXPORT type
+#elif defined(WXUSINGDLL)
+    #define WXDLLIMPEXP_NETUTILS WXIMPORT
+    #define WXDLLIMPEXP_DATA_NETUTILS(type) WXIMPORT type
+#else // not making nor using DLL
+    #define WXDLLIMPEXP_NETUTILS
+    #define WXDLLIMPEXP_DATA_NETUTILS(type) type
+#endif
+
+
 /*
  * wxMailMessage
  * Encapsulates an email message
  */
 
-class wxMailMessage
+class WXDLLIMPEXP_NETUTILS wxMailMessage
 {
 public:
 
     // A common usage
     wxMailMessage(const wxString& subject, const wxString& to,
-        const wxString& body, const wxString& attachment = wxEmptyString,
+        const wxString& body, const wxString& from = wxEmptyString,
+        const wxString& attachment = wxEmptyString,
         const wxString& attachmentTitle = wxEmptyString)
     {
         m_to.Add(to);
         m_subject = subject;
         m_body = body;
+        m_from = from;
         if (!attachment.IsEmpty())
         {
             m_attachments.Add(attachment);
@@ -52,9 +66,11 @@ public:
 
     void SetSubject(const wxString& subject) { m_subject = subject; }
     void SetBody(const wxString& body) { m_body = body; }
+    void SetFrom(const wxString& from) { m_from = from; }
 
 public:
     wxArrayString  m_to;               //The To: Recipients
+    wxString       m_from;             //The From: email address (optional)
     wxArrayString  m_cc;               //The CC: Recipients
     wxArrayString  m_bcc;              //The BCC Recipients
     wxString       m_subject;         //The Subject of the message