Doc fixes A-M edition. Thanks to Arnout for pointing these out. Also I fixed some...

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

diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h
index 0ff9a81129b23e6902ef50226e78c40271eaa5ed..0223e2911561ce8776251b5560a83fc8abce6d75 100644 (file)
--- a/include/wx/msgdlg.h
+++ b/include/wx/msgdlg.h
@@ -1,19 +1,41 @@
 #ifndef _WX_MSGDLG_H_BASE_
 #define _WX_MSGDLG_H_BASE_
 
 #ifndef _WX_MSGDLG_H_BASE_
 #define _WX_MSGDLG_H_BASE_
 

-#if defined(__WXMSW__)
+#include "wx/setup.h"
+
+#if wxUSE_MSGDLG
+
+#if 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/msw/msgdlg.h"
 #elif defined(__WXMOTIF__)

-#include "wx/generic/msgdlgg.h"
-#elif defined(__WXGTK__)
+#include "wx/motif/msgdlg.h"
+#elif defined(__WXGTK__) && defined(__WXGTK20__)

 #include "wx/gtk/msgdlg.h"
 #include "wx/gtk/msgdlg.h"

-#elif defined(__WXQT__)
+#elif defined(__WXGTK__)

 #include "wx/generic/msgdlgg.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/msgdlg.h"
 #include "wx/generic/msgdlgg.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/msgdlg.h"

-#elif defined(__WXSTUBS__)
+#elif defined(__WXCOCOA__)

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

+#elif defined(__WXPM__)
+#include "wx/os2/msgdlg.h"

 #endif
 
 #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_
 #endif
     // _WX_MSGDLG_H_BASE_