X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/17dff81c7141e142765b168ab225e5c61475669f..73302af6dddd667af4ebec69c800bc9de106f28e:/include/wx/msgdlg.h?ds=sidebyside

diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h
index e0f80d630c..2176ed6efb 100644
--- a/include/wx/msgdlg.h
+++ b/include/wx/msgdlg.h
@@ -1,19 +1,77 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/msgdlgg.h
+// Purpose:     common header and base class for wxMessageDialog
+// Author:      wxWidgets Team
+// Modified by:
+// Created:
+// RCS-ID:      $Id$
+// Copyright:   (c) wxWidgets
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_MSGDLG_H_BASE_
 #define _WX_MSGDLG_H_BASE_
 
-#if defined(__WXMSW__)
+#include "wx/defs.h"
+
+#if wxUSE_MSGDLG
+
+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(__WXPALMOS__)
+#include "wx/palmos/msgdlg.h"
+#elif defined(__WXMSW__)
 #include "wx/msw/msgdlg.h"
 #elif defined(__WXMOTIF__)
-#include "wx/generic/msgdlgg.h"
+#include "wx/motif/msgdlg.h"
+#elif defined(__WXGTK__) && defined(__WXGTK20__)
+#include "wx/gtk/msgdlg.h"
 #elif defined(__WXGTK__)
 #include "wx/generic/msgdlgg.h"
-#elif defined(__WXQT__)
-#include "wx/generic/msgdlgg.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/msgdlg.h"
-#elif defined(__WXSTUBS__)
+#elif defined(__WXCOCOA__)
 #include "wx/generic/msgdlgg.h"
+#elif defined(__WXPM__)
+#include "wx/os2/msgdlg.h"
 #endif
 
+// ----------------------------------------------------------------------------
+// wxMessageBox: the simplest way to use wxMessageDialog
+// ----------------------------------------------------------------------------
+
+int WXDLLEXPORT wxMessageBox(const wxString& message,
+                             const wxString& caption = wxMessageBoxCaptionStr,
+                             long style = wxOK | wxCENTRE,
+                             wxWindow *parent = NULL,
+                             int x = wxDefaultCoord, int y = wxDefaultCoord);
+
+#endif // wxUSE_MSGDLG
+
 #endif
     // _WX_MSGDLG_H_BASE_