always let the multiline text control process the Enter key presses

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

diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h
index 0771b4631b307453b6c7fb8f46bb18c871fe4f21..58ce76e40a71193c0ff26ba8533cd095ad09f8f4 100644 (file)
--- a/include/wx/msgdlg.h
+++ b/include/wx/msgdlg.h
@@ -1,13 +1,35 @@
-#ifndef __MSGDLGH_BASE__
-#define __MSGDLGH_BASE__
+#ifndef _WX_MSGDLG_H_BASE_
+#define _WX_MSGDLG_H_BASE_

 
 

-#if defined(__WINDOWS__)
+#if wxUSE_MSGDLG
+
+#if defined(__WXUNIVERSAL__)
+#include "wx/generic/msgdlgg.h"
+#elif defined(__WXMSW__)

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

-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
+#include "wx/motif/msgdlg.h"
+#elif defined(__WXGTK__)

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

-#elif defined(__GTK__)
+#elif defined(__WXMAC__)
+#include "wx/mac/msgdlg.h"
+#elif defined(__WXPM__)
+#include "wx/os2/msgdlg.h"
+#elif defined(__WXSTUBS__)

 #include "wx/generic/msgdlgg.h"
 #endif
 
 #include "wx/generic/msgdlgg.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 = -1, int y = -1);
+
+#endif // wxUSE_MSGDLG
+

 #endif
 #endif

-    // __MSGDLGH_BASE__
+    // _WX_MSGDLG_H_BASE_