X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a685a06c96085e01d0b38432eac2ec0b887c2dcb..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/msgdlg.h?ds=sidebyside diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h index b16aa2569d..6f48c11f2b 100644 --- a/include/wx/msgdlg.h +++ b/include/wx/msgdlg.h @@ -1,23 +1,81 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/msgdlgg.h // Purpose: common header and base class for wxMessageDialog -// Author: wxWidgets Team +// Author: Julian Smart // Modified by: // Created: // RCS-ID: $Id$ -// Copyright: (c) wxWidgets +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_MSGDLG_H_BASE_ #define _WX_MSGDLG_H_BASE_ -#include "wx/setup.h" +#include "wx/defs.h" #if wxUSE_MSGDLG -class WXDLLEXPORT wxMessageDialogBase +#include "wx/dialog.h" + +WXDLLEXPORT_DATA(extern const wxChar) wxMessageBoxCaptionStr[]; + +class WXDLLEXPORT wxMessageDialogBase : public wxDialog { +public: + // ctors + wxMessageDialogBase() { m_dialogStyle = 0; } + wxMessageDialogBase(wxWindow *parent, + const wxString& message, + const wxString& caption, + long style) + : m_message(message), + m_caption(caption) + { + m_parent = parent; + SetMessageDialogStyle(style); + } + + // 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 wxString& WXUNUSED(yes), + const wxString& WXUNUSED(no)) + { + return false; + } + + virtual bool SetYesNoCancelLabels(const wxString& WXUNUSED(yes), + const wxString& WXUNUSED(no), + const wxString& WXUNUSED(cancel)) + { + return false; + } + + virtual bool SetOKLabel(const wxString& WXUNUSED(ok)) + { + return false; + } + + virtual bool SetOKCancelLabels(const wxString& WXUNUSED(ok), + const wxString& WXUNUSED(cancel)) + { + return false; + } + + virtual void SetMessage(const wxString& message) + { + m_message = message; + } + + virtual void SetExtendedMessage(const wxString& extendedMessage) + { + m_extendedMessage = extendedMessage; + } + protected: // common validation of wxMessageDialog style void SetMessageDialogStyle(long style) @@ -30,35 +88,46 @@ protected: m_dialogStyle = style; } - inline long GetMessageDialogStyle() const + + long GetMessageDialogStyle() const { return m_dialogStyle; } + + + // 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 { - return m_dialogStyle; + wxString msg = m_message; + if ( !m_extendedMessage.empty() ) + msg << "\n\n" << m_extendedMessage; + + return msg; } -private: + wxString m_message, + m_extendedMessage, + m_caption; long m_dialogStyle; }; -#if defined(__WX_COMPILING_MSGDLGG_CPP__) -#include "wx/generic/msgdlgg.h" -#elif defined(__WXUNIVERSAL__) || defined(__WXGPE__) -#include "wx/generic/msgdlgg.h" +#if defined(__WX_COMPILING_MSGDLGG_CPP__) || \ + defined(__WXUNIVERSAL__) || defined(__WXGPE__) || \ + defined(__WXCOCOA__) || \ + (defined(__WXGTK__) && !defined(__WXGTK20__)) + #include "wx/generic/msgdlgg.h" + + #define wxMessageDialog wxGenericMessageDialog #elif defined(__WXPALMOS__) -#include "wx/palmos/msgdlg.h" + #include "wx/palmos/msgdlg.h" #elif defined(__WXMSW__) -#include "wx/msw/msgdlg.h" + #include "wx/msw/msgdlg.h" #elif defined(__WXMOTIF__) -#include "wx/motif/msgdlg.h" -#elif defined(__WXGTK__) && defined(__WXGTK20__) -#include "wx/gtk/msgdlg.h" -#elif defined(__WXGTK__) -#include "wx/generic/msgdlgg.h" + #include "wx/motif/msgdlg.h" +#elif defined(__WXGTK20__) + #include "wx/gtk/msgdlg.h" #elif defined(__WXMAC__) -#include "wx/mac/msgdlg.h" -#elif defined(__WXCOCOA__) -#include "wx/generic/msgdlgg.h" + #include "wx/mac/msgdlg.h" #elif defined(__WXPM__) -#include "wx/os2/msgdlg.h" + #include "wx/os2/msgdlg.h" #endif // ---------------------------------------------------------------------------- @@ -73,5 +142,4 @@ int WXDLLEXPORT wxMessageBox(const wxString& message, #endif // wxUSE_MSGDLG -#endif - // _WX_MSGDLG_H_BASE_ +#endif // _WX_MSGDLG_H_BASE_