Allow wxStaticText to have a custom fg without a custom bg

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

diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h
index eb0776ffe9f37b5ffdb9335d434db4de2cf10bc5..b16aa2569d57bfe25df9848cc6fd59a6a2528bc0 100644 (file)
--- a/include/wx/msgdlg.h
+++ b/include/wx/msgdlg.h
@@ -1,3 +1,14 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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_
 
@@ -5,8 +16,35 @@
 
 #if wxUSE_MSGDLG
 
-#if defined(__WXUNIVERSAL__)
+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__)
@@ -28,10 +66,10 @@
 // ----------------------------------------------------------------------------
 
 int WXDLLEXPORT wxMessageBox(const wxString& message,
-                            const wxString& caption = wxMessageBoxCaptionStr,
-                            long style = wxOK | wxCENTRE,
-                            wxWindow *parent = NULL,
-                            int x = -1, int y = -1);
+                             const wxString& caption = wxMessageBoxCaptionStr,
+                             long style = wxOK | wxCENTRE,
+                             wxWindow *parent = NULL,
+                             int x = wxDefaultCoord, int y = wxDefaultCoord);
 
 #endif // wxUSE_MSGDLG