Fixed toolbar crash for MinGW/Cygwin

[wxWidgets.git] / contrib / include / wx / net / msg.h

diff --git a/contrib/include/wx/net/msg.h b/contrib/include/wx/net/msg.h
index ffc77727f59c387d9a79f8aa4e269e778e7f37b8..3350738898e2d84d856b326ac28155e9d41df7b0 100644 (file)
--- a/contrib/include/wx/net/msg.h
+++ b/contrib/include/wx/net/msg.h
@@ -27,12 +27,14 @@ public:
 
     // A common usage
     wxMailMessage(const wxString& subject, const wxString& to,
 
     // 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;
         const wxString& attachmentTitle = wxEmptyString)
     {
         m_to.Add(to);
         m_subject = subject;
         m_body = body;

+        m_from = from;

         if (!attachment.IsEmpty())
         {
             m_attachments.Add(attachment);
         if (!attachment.IsEmpty())
         {
             m_attachments.Add(attachment);


@@ -52,9 +54,11 @@ public:
 
     void SetSubject(const wxString& subject) { m_subject = subject; }
     void SetBody(const wxString& body) { m_body = body; }
 
     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
 
 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
     wxArrayString  m_cc;               //The CC: Recipients
     wxArrayString  m_bcc;              //The BCC Recipients
     wxString       m_subject;         //The Subject of the message