Don't define __STRICT_ANSI__, we should build both with and without it.

[wxWidgets.git] / include / wx / msgdlg.h

diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h
index de2d6abe1bc060aee36ba40d32931230762769c3..8a234ac48fc1aafe09358d46abaf284b7fb060ef 100644 (file)
--- a/include/wx/msgdlg.h
+++ b/include/wx/msgdlg.h
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/msgdlgg.h
+// Name:        wx/msgdlg.h

 // Purpose:     common header and base class for wxMessageDialog
 // Author:      Julian Smart
 // Modified by:
 // Created:
 // Purpose:     common header and base class for wxMessageDialog
 // Author:      Julian Smart
 // Modified by:
 // Created:

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -19,7 +18,7 @@
 #include "wx/dialog.h"
 #include "wx/stockitem.h"
 
 #include "wx/dialog.h"
 #include "wx/stockitem.h"
 

-WXDLLIMPEXP_DATA_CORE(extern const char) wxMessageBoxCaptionStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxMessageBoxCaptionStr[];

 
 // ----------------------------------------------------------------------------
 // wxMessageDialogBase: base class defining wxMessageDialog interface
 
 // ----------------------------------------------------------------------------
 // wxMessageDialogBase: base class defining wxMessageDialog interface


@@ -84,7 +83,6 @@ public:
         const int m_stockId;
     };
 
         const int m_stockId;
     };
 

-

     // ctors
     wxMessageDialogBase() { m_dialogStyle = 0; }
     wxMessageDialogBase(wxWindow *parent,
     // ctors
     wxMessageDialogBase() { m_dialogStyle = 0; }
     wxMessageDialogBase(wxWindow *parent,


@@ -101,43 +99,22 @@ public:
     // virtual dtor for the base class
     virtual ~wxMessageDialogBase() { }
 
     // virtual dtor for the base class
     virtual ~wxMessageDialogBase() { }
 

-
-    // methods for setting up more custom message dialogs -- all functions
-    // return false if they're not implemented
-    virtual bool SetYesNoLabels(const ButtonLabel& WXUNUSED(yes),
-                                const ButtonLabel& WXUNUSED(no))
-    {
-        return false;
-    }
-
-    virtual bool SetYesNoCancelLabels(const ButtonLabel& WXUNUSED(yes),
-                                      const ButtonLabel& WXUNUSED(no),
-                                      const ButtonLabel& WXUNUSED(cancel))
-    {
-        return false;
-    }
-
-    virtual bool SetOKLabel(const ButtonLabel& WXUNUSED(ok))
-    {
-        return false;
-    }
-
-    virtual bool SetOKCancelLabels(const ButtonLabel& WXUNUSED(ok),
-                                   const ButtonLabel& WXUNUSED(cancel))
-    {
-        return false;
-    }
+    wxString GetCaption() const { return m_caption; }

 
     virtual void SetMessage(const wxString& message)
     {
         m_message = message;
     }
 
 
     virtual void SetMessage(const wxString& message)
     {
         m_message = message;
     }
 

-    virtual void SetExtendedMessage(const wxString& extendedMessage)
+    wxString GetMessage() const { return m_message; }
+
+    void SetExtendedMessage(const wxString& extendedMessage)

     {
         m_extendedMessage = extendedMessage;
     }
 
     {
         m_extendedMessage = extendedMessage;
     }
 

+    wxString GetExtendedMessage() const { return m_extendedMessage; }
+

     // change the dialog style flag
     void SetMessageDialogStyle(long style)
     {
     // change the dialog style flag
     void SetMessageDialogStyle(long style)
     {


@@ -147,8 +124,12 @@ public:
         wxASSERT_MSG( !(style & wxYES) || !(style & wxOK),
                       "wxOK and wxYES/wxNO can't be used together" );
 
         wxASSERT_MSG( !(style & wxYES) || !(style & wxOK),
                       "wxOK and wxYES/wxNO can't be used together" );
 

-        wxASSERT_MSG( (style & wxYES) || (style & wxOK),
-                      "one of wxOK and wxYES/wxNO must be used" );
+        // It is common to specify just the icon, without wxOK, in the existing
+        // code, especially one written by Windows programmers as MB_OK is 0
+        // and so they're used to omitting wxOK. Don't complain about it but
+        // just add wxOK implicitly for compatibility.
+        if ( !(style & wxYES) && !(style & wxOK) )
+            style |= wxOK;

 
         wxASSERT_MSG( (style & wxID_OK) != wxID_OK,
                       "wxMessageBox: Did you mean wxOK (and not wxID_OK)?" );
 
         wxASSERT_MSG( (style & wxID_OK) != wxID_OK,
                       "wxMessageBox: Did you mean wxOK (and not wxID_OK)?" );


@@ -165,74 +146,8 @@ public:
         m_dialogStyle = style;
     }
 
         m_dialogStyle = style;
     }
 

-protected:

     long GetMessageDialogStyle() const { return m_dialogStyle; }
 
     long GetMessageDialogStyle() const { return m_dialogStyle; }
 

-    // based on message dialog style, returns exactly one of: wxICON_NONE,
-    // wxICON_ERROR, wxICON_WARNING, wxICON_QUESTION, wxICON_INFORMATION
-    long GetEffectiveIcon() const
-    {
-        if ( m_dialogStyle & wxICON_NONE )
-            return wxICON_NONE;
-        else if ( m_dialogStyle & wxICON_ERROR )
-            return wxICON_ERROR;
-        else if ( m_dialogStyle & wxICON_WARNING )
-            return wxICON_WARNING;
-        else if ( m_dialogStyle & wxICON_QUESTION )
-            return wxICON_QUESTION;
-        else if ( m_dialogStyle & wxICON_INFORMATION )
-            return wxICON_INFORMATION;
-        else if ( m_dialogStyle & wxYES )
-            return wxICON_QUESTION;
-        else
-            return wxICON_INFORMATION;
-    }
-
-
-    // for the platforms not supporting separate main and extended messages
-    // this function should be used to combine both of them in a single string
-    wxString GetFullMessage() const
-    {
-        wxString msg = m_message;
-        if ( !m_extendedMessage.empty() )
-            msg << "\n\n" << m_extendedMessage;
-
-        return msg;
-    }
-
-    wxString m_message,
-             m_extendedMessage,
-             m_caption;
-    long m_dialogStyle;
-
-    wxDECLARE_NO_COPY_CLASS(wxMessageDialogBase);
-};
-
-// this is a helper class for native wxMessageDialog implementations which need
-// to store the custom button labels as member variables and then use them in
-// ShowModal() (there could conceivably be a port which would have some native
-// functions for setting these labels immediately and we also don't need to
-// store them at all if custom labels are not supported, which is why we do
-// this in a separate class and not wxMessageDialogBase itself)
-#if defined(__WXCOCOA__) || \
-    defined(__WXGTK20__) || \
-    defined(__WXMAC__) || \
-    defined(__WXMSW__)
-
-class WXDLLIMPEXP_CORE wxMessageDialogWithCustomLabels
-    : public wxMessageDialogBase
-{
-public:
-    // ctors
-    wxMessageDialogWithCustomLabels() { }
-    wxMessageDialogWithCustomLabels(wxWindow *parent,
-                                    const wxString& message,
-                                    const wxString& caption,
-                                    long style)
-        : wxMessageDialogBase(parent, message, caption, style)
-    {
-    }
-

     // customization of the message box buttons
     virtual bool SetYesNoLabels(const ButtonLabel& yes,const ButtonLabel& no)
     {
     // customization of the message box buttons
     virtual bool SetYesNoLabels(const ButtonLabel& yes,const ButtonLabel& no)
     {


@@ -265,11 +180,16 @@ public:
         return true;
     }
 
         return true;
     }
 

-protected:
+    virtual bool SetHelpLabel(const ButtonLabel& help)
+    {
+        DoSetCustomLabel(m_help, help);
+        return true;
+    }
+

     // test if any custom labels were set
     bool HasCustomLabels() const
     {
     // test if any custom labels were set
     bool HasCustomLabels() const
     {

-        return !(m_ok.empty() && m_cancel.empty() &&
+        return !(m_ok.empty() && m_cancel.empty() && m_help.empty() &&

                  m_yes.empty() && m_no.empty());
     }
 
                  m_yes.empty() && m_no.empty());
     }
 


@@ -284,6 +204,46 @@ protected:
         { return m_ok.empty() ? GetDefaultOKLabel() : m_ok; }
     wxString GetCancelLabel() const
         { return m_cancel.empty() ? GetDefaultCancelLabel() : m_cancel; }
         { return m_ok.empty() ? GetDefaultOKLabel() : m_ok; }
     wxString GetCancelLabel() const
         { return m_cancel.empty() ? GetDefaultCancelLabel() : m_cancel; }

+    wxString GetHelpLabel() const
+        { return m_help.empty() ? GetDefaultHelpLabel() : m_help; }
+
+    // based on message dialog style, returns exactly one of: wxICON_NONE,
+    // wxICON_ERROR, wxICON_WARNING, wxICON_QUESTION, wxICON_INFORMATION,
+    // wxICON_AUTH_NEEDED
+    virtual long GetEffectiveIcon() const
+    {
+        if ( m_dialogStyle & wxICON_NONE )
+            return wxICON_NONE;
+        else if ( m_dialogStyle & wxICON_ERROR )
+            return wxICON_ERROR;
+        else if ( m_dialogStyle & wxICON_WARNING )
+            return wxICON_WARNING;
+        else if ( m_dialogStyle & wxICON_QUESTION )
+            return wxICON_QUESTION;
+        else if ( m_dialogStyle & wxICON_INFORMATION )
+            return wxICON_INFORMATION;
+        else if ( m_dialogStyle & wxYES )
+            return wxICON_QUESTION;
+        else
+            return wxICON_INFORMATION;
+    }
+
+protected:
+    // for the platforms not supporting separate main and extended messages
+    // this function should be used to combine both of them in a single string
+    wxString GetFullMessage() const
+    {
+        wxString msg = m_message;
+        if ( !m_extendedMessage.empty() )
+            msg << "\n\n" << m_extendedMessage;
+
+        return msg;
+    }
+
+    wxString m_message,
+             m_extendedMessage,
+             m_caption;
+    long m_dialogStyle;

 
     // this function is called by our public SetXXXLabels() and should assign
     // the value to var with possibly some transformation (e.g. Cocoa version
 
     // this function is called by our public SetXXXLabels() and should assign
     // the value to var with possibly some transformation (e.g. Cocoa version


@@ -294,6 +254,17 @@ protected:
         var = label.GetAsString();
     }
 
         var = label.GetAsString();
     }
 

+    // these functions return the custom label or empty string and should be
+    // used only in specific circumstances such as creating the buttons with
+    // these labels (in which case it makes sense to only use a custom label if
+    // it was really given and fall back on stock label otherwise), use the
+    // Get{Yes,No,OK,Cancel}Label() methods above otherwise
+    const wxString& GetCustomYesLabel() const { return m_yes; }
+    const wxString& GetCustomNoLabel() const { return m_no; }
+    const wxString& GetCustomOKLabel() const { return m_ok; }
+    const wxString& GetCustomHelpLabel() const { return m_help; }
+    const wxString& GetCustomCancelLabel() const { return m_cancel; }
+

 private:
     // these functions may be overridden to provide different defaults for the
     // default button labels (this is used by wxGTK)
 private:
     // these functions may be overridden to provide different defaults for the
     // default button labels (this is used by wxGTK)


@@ -301,29 +272,28 @@ private:
     virtual wxString GetDefaultNoLabel() const { return wxGetTranslation("No"); }
     virtual wxString GetDefaultOKLabel() const { return wxGetTranslation("OK"); }
     virtual wxString GetDefaultCancelLabel() const { return wxGetTranslation("Cancel"); }
     virtual wxString GetDefaultNoLabel() const { return wxGetTranslation("No"); }
     virtual wxString GetDefaultOKLabel() const { return wxGetTranslation("OK"); }
     virtual wxString GetDefaultCancelLabel() const { return wxGetTranslation("Cancel"); }

+    virtual wxString GetDefaultHelpLabel() const { return wxGetTranslation("Help"); }

 
     // labels for the buttons, initially empty meaning that the defaults should
     // be used, use GetYes/No/OK/CancelLabel() to access them
     wxString m_yes,
              m_no,
              m_ok,
 
     // labels for the buttons, initially empty meaning that the defaults should
     // be used, use GetYes/No/OK/CancelLabel() to access them
     wxString m_yes,
              m_no,
              m_ok,

-             m_cancel;
+             m_cancel,
+             m_help;

 
 

-    wxDECLARE_NO_COPY_CLASS(wxMessageDialogWithCustomLabels);
+    wxDECLARE_NO_COPY_CLASS(wxMessageDialogBase);

 };
 
 };
 

-#endif // ports needing wxMessageDialogWithCustomLabels
+#include "wx/generic/msgdlgg.h"

 
 #if defined(__WX_COMPILING_MSGDLGG_CPP__) || \
     defined(__WXUNIVERSAL__) || defined(__WXGPE__) || \
     (defined(__WXGTK__) && !defined(__WXGTK20__))
 
 #if defined(__WX_COMPILING_MSGDLGG_CPP__) || \
     defined(__WXUNIVERSAL__) || defined(__WXGPE__) || \
     (defined(__WXGTK__) && !defined(__WXGTK20__))

-    #include "wx/generic/msgdlgg.h"

 
     #define wxMessageDialog wxGenericMessageDialog
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/msgdlg.h"
 
     #define wxMessageDialog wxGenericMessageDialog
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/msgdlg.h"

-#elif defined(__WXPALMOS__)
-    #include "wx/palmos/msgdlg.h"

 #elif defined(__WXMSW__)
     #include "wx/msw/msgdlg.h"
 #elif defined(__WXMOTIF__)
 #elif defined(__WXMSW__)
     #include "wx/msw/msgdlg.h"
 #elif defined(__WXMOTIF__)