Added intermediate state (m_showOnIdle) indicating that

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

diff --git a/include/wx/motif/msgdlg.h b/include/wx/motif/msgdlg.h
index 4275fa287406c2efa8900e16882abc72941df5c5..e479425a7012dd933b492f6fb6fa6c17133434ea 100644 (file)
--- a/include/wx/motif/msgdlg.h
+++ b/include/wx/motif/msgdlg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msgdlg.h
+// Name:        wx/motif/msgdlg.h
 // Purpose:     wxMessageDialog class. Use generic version if no
 //              platform-specific implementation.
 // Author:      Julian Smart
@@ -13,50 +13,38 @@
 #ifndef _WX_MSGBOXDLG_H_
 #define _WX_MSGBOXDLG_H_
 
-#ifdef __GNUG__
-#pragma interface "msgdlg.h"
-#endif
-
-#include "wx/setup.h"
+#include "wx/defs.h"
 #include "wx/dialog.h"
 
 // ----------------------------------------------------------------------------
 // Message box dialog
 // ----------------------------------------------------------------------------
 
-WXDLLEXPORT_DATA(extern const char*) wxMessageBoxCaptionStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxMessageBoxCaptionStr[];
 
-class WXDLLEXPORT wxMessageDialog: public wxDialog
+class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase
 {
     DECLARE_DYNAMIC_CLASS(wxMessageDialog)
 
 public:
     wxMessageDialog(wxWindow *parent,
-                    const wxString& message,
-                    const wxString& caption = wxMessageBoxCaptionStr,
-                    long style = wxOK | wxCENTRE,
-                    const wxPoint& pos = wxDefaultPosition);
+        const wxString& message,
+        const wxString& caption = wxMessageBoxCaptionStr,
+        long style = wxOK | wxCENTRE,
+        const wxPoint& pos = wxDefaultPosition);
 
     int ShowModal();
 
     // implementation only from now on
-        // called by the Motif callback
+    // called by the Motif callback
     void SetResult(long result) { m_result = result; }
 
 protected:
     wxString    m_caption;
     wxString    m_message;
-    long        m_dialogStyle;
     wxWindow *  m_parent;
     long        m_result;
 };
 
-
-int WXDLLEXPORT wxMessageBox(const wxString& message,
-                             const wxString& caption = wxMessageBoxCaptionStr,
-                             long style = wxOK | wxCENTRE,
-                             wxWindow *parent = NULL,
-                             int x = -1, int y = -1);
-
 #endif
-    // _WX_MSGBOXDLG_H_
+// _WX_MSGBOXDLG_H_