Added possibility of 2-step initialisation, and wxWIZARD_EX_HELPBUTTON style.

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

diff --git a/include/wx/motif/msgdlg.h b/include/wx/motif/msgdlg.h
index 4e8b790290f81eeb6884600b39d9c5c103545955..4275fa287406c2efa8900e16882abc72941df5c5 100644 (file)
--- a/include/wx/motif/msgdlg.h
+++ b/include/wx/motif/msgdlg.h
@@ -7,7 +7,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSGBOXDLG_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSGBOXDLG_H_


@@ -20,31 +20,43 @@
 #include "wx/setup.h"
 #include "wx/dialog.h"
 
 #include "wx/setup.h"
 #include "wx/dialog.h"
 

-/*
- * Message box dialog
- */
+// ----------------------------------------------------------------------------
+// Message box dialog
+// ----------------------------------------------------------------------------

 
 WXDLLEXPORT_DATA(extern const char*) wxMessageBoxCaptionStr;
 
 class WXDLLEXPORT wxMessageDialog: public wxDialog
 {
 
 WXDLLEXPORT_DATA(extern const char*) wxMessageBoxCaptionStr;
 
 class WXDLLEXPORT wxMessageDialog: public wxDialog
 {

-DECLARE_DYNAMIC_CLASS(wxMessageDialog)
+    DECLARE_DYNAMIC_CLASS(wxMessageDialog)
+
+public:
+    wxMessageDialog(wxWindow *parent,
+                    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
+    void SetResult(long result) { m_result = result; }
+

 protected:
     wxString    m_caption;
     wxString    m_message;
     long        m_dialogStyle;
     wxWindow *  m_parent;
 protected:
     wxString    m_caption;
     wxString    m_message;
     long        m_dialogStyle;
     wxWindow *  m_parent;

-public:
-    wxMessageDialog(wxWindow *parent, const wxString& message, const wxString& caption = wxMessageBoxCaptionStr,
-        long style = wxOK|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
-
-    int ShowModal();
+    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);
+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_
 
 #endif
     // _WX_MSGBOXDLG_H_