X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ffecfa5aeb540b54914739dbb8603edbbd4c00a0..ba5787676d002f76b4c3944cb598b626f10f058d:/include/wx/msgdlg.h diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h index 4a9c57af73..8c367fb9b6 100644 --- a/include/wx/msgdlg.h +++ b/include/wx/msgdlg.h @@ -1,22 +1,60 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/msgdlgg.h +// Purpose: common header and base class for wxMessageDialog +// Author: Julian Smart +// Modified by: +// Created: +// RCS-ID: $Id$ +// 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 -#if defined(__WXUNIVERSAL__) || defined(__WXGPE__) +class WXDLLEXPORT wxMessageDialogBase +{ +protected: + // common validation of wxMessageDialog style + void SetMessageDialogStyle(long style) + { + wxASSERT_MSG( ((style & wxYES_NO) == wxYES_NO) || ((style & wxYES_NO) == 0), + _T("wxYES and wxNO may only be used together in wxMessageDialog") ); + + wxASSERT_MSG( (style & wxID_OK) != wxID_OK, + _T("wxMessageBox: Did you mean wxOK (and not wxID_OK)?") ); + + m_dialogStyle = style; + } + inline long GetMessageDialogStyle() const + { + return m_dialogStyle; + } + +private: + long m_dialogStyle; +}; + +#if defined(__WX_COMPILING_MSGDLGG_CPP__) +#include "wx/generic/msgdlgg.h" +#elif defined(__WXUNIVERSAL__) || defined(__WXGPE__) #include "wx/generic/msgdlgg.h" -#elif defined(__PALMOS__) +#elif defined(__WXPALMOS__) #include "wx/palmos/msgdlg.h" #elif defined(__WXMSW__) #include "wx/msw/msgdlg.h" #elif defined(__WXMOTIF__) #include "wx/motif/msgdlg.h" -#elif defined(__WXGTK__) && defined(__WXGTK20__) +#elif defined(__WXGTK20__) #include "wx/gtk/msgdlg.h" #elif defined(__WXGTK__) #include "wx/generic/msgdlgg.h" +#elif defined(__WXGTK__) +#include "wx/generic/msgdlgg.h" #elif defined(__WXMAC__) #include "wx/mac/msgdlg.h" #elif defined(__WXCOCOA__) @@ -30,10 +68,10 @@ // ---------------------------------------------------------------------------- int WXDLLEXPORT wxMessageBox(const wxString& message, - const wxString& caption = wxMessageBoxCaptionStr, - long style = wxOK | wxCENTRE, - wxWindow *parent = NULL, - int x = wxDefaultCoord, int y = wxDefaultCoord); + const wxString& caption = wxMessageBoxCaptionStr, + long style = wxOK | wxCENTRE, + wxWindow *parent = NULL, + int x = wxDefaultCoord, int y = wxDefaultCoord); #endif // wxUSE_MSGDLG