X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3399051ee9fa4dfa5fa7ac2dd9034062f4414d64..dd4e6da0e0abb643e10d3a2c83b063138bec0d69:/include/wx/motif/msgdlg.h

diff --git a/include/wx/motif/msgdlg.h b/include/wx/motif/msgdlg.h
index dca5d61fee..e479425a70 100644
--- 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,40 +13,35 @@
 #ifndef _WX_MSGBOXDLG_H_
 #define _WX_MSGBOXDLG_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#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);
-    
+
     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;
     long        m_result;
 };