X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/329e86bfdedacf2736fa77eea1ae171c3c732355..f5a1953b341d16396763bee067ccdd96108f3aad:/include/wx/generic/msgdlgg.h?ds=sidebyside

diff --git a/include/wx/generic/msgdlgg.h b/include/wx/generic/msgdlgg.h
index 62dddb1b87..89044616a5 100644
--- a/include/wx/generic/msgdlgg.h
+++ b/include/wx/generic/msgdlgg.h
@@ -1,18 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msgdlgg.h
+// Name:        wx/generic/msgdlgg.h
 // Purpose:     Generic wxMessageDialog
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c)
-// Licence:   	wxWindows licence
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __MSGDLGH_G__
 #define __MSGDLGH_G__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "msgdlgg.h"
 #endif
 
@@ -22,34 +22,27 @@
 // type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO
 // Returns wxYES/NO/OK/CANCEL
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxMessageBoxCaptionStr;
 
-class WXDLLEXPORT wxGenericMessageDialog: public wxDialog
+class WXDLLEXPORT wxGenericMessageDialog: public wxDialog, public wxMessageDialogBase
 {
 DECLARE_DYNAMIC_CLASS(wxGenericMessageDialog)
 
 public:
-    wxGenericMessageDialog(wxWindow *parent, const wxString& message, 
+    wxGenericMessageDialog(wxWindow *parent, const wxString& message,
         const wxString& caption = wxMessageBoxCaptionStr,
         long style = wxOK|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
 
     void OnYes(wxCommandEvent& event);
     void OnNo(wxCommandEvent& event);
     void OnCancel(wxCommandEvent& event);
-    
-private:
-    int     m_dialogStyle;
 
-DECLARE_EVENT_TABLE()
+private:
+    DECLARE_EVENT_TABLE()
 };
 
-#if !defined( __WXMSW__ ) && !defined( __WXMAC__)
+#if (!defined( __WXMSW__ ) && !defined( __WXMAC__) && !defined(__WXPM__)) || defined(__WXUNIVERSAL__)
 #define wxMessageDialog wxGenericMessageDialog
-
-int wxMessageBox(const wxString& message, const wxString& caption = wxMessageBoxCaptionStr, 
-  long style = wxOK|wxCENTRE, wxWindow *parent = (wxWindow *) NULL, int x = -1, int y = -1);
-
 #endif
 
-#endif
-	// __MSGDLGH_G__
+#endif // __MSGDLGH_G__