wxUSE_NEW_GRID is no longer used

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

diff --git a/include/wx/gtk/msgdlg.h b/include/wx/gtk/msgdlg.h
index a545631340a290070112883f1de158054435bcbb..8d310153e9849838892c8bed6dd4c1bfa7bffb9d 100644 (file)
--- a/include/wx/gtk/msgdlg.h
+++ b/include/wx/gtk/msgdlg.h
@@ -1,19 +1,19 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msgdlgg.h
-// Purpose:     Generic wxMessageDialog
-// Author:      Julian Smart
+// Name:        msgdlg.h
+// Purpose:     wxMessageDialog for GTK+2
+// Author:      Vaclav Slavik

 // Modified by:
 // Modified by:

-// Created:     01/02/97
+// Created:     2003/02/28

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c)
+// Copyright:   (c) Vaclav Slavik, 2003

 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __MSGDLGH_G__
-#define __MSGDLGH_G__
+#ifndef __MSGDLG_H__
+#define __MSGDLG_H__

 
 

-#ifdef __GNUG__
-#pragma interface "msgdlgg.h"
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "msgdlg.h"

 #endif
 
 #include "wx/setup.h"
 #endif
 
 #include "wx/setup.h"


@@ -24,33 +24,23 @@
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr;
 
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr;
 

-class WXDLLEXPORT wxGenericMessageDialog: public wxDialog
+class WXDLLEXPORT wxMessageDialog: public wxDialog

 {
 {

-DECLARE_DYNAMIC_CLASS(wxGenericMessageDialog)
-

 public:
 public:

-    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:
-    wxList  m_buttons;
-    int     m_dialogStyle;
-
-DECLARE_EVENT_TABLE()
-};
+    wxMessageDialog(wxWindow *parent, const wxString& message,
+                    const wxString& caption = wxMessageBoxCaptionStr,
+                    long style = wxOK|wxCENTRE,
+                    const wxPoint& pos = wxDefaultPosition);

 
 

-#if !defined( __WXMSW__ ) && !defined( __WXMAC__)
-#define wxMessageDialog wxGenericMessageDialog
+    int ShowModal();

 
 

-int wxMessageBox(const wxString& message, const wxString& caption = wxMessageBoxCaptionStr, 
-  long style = wxOK|wxCENTRE, wxWindow *parent = (wxWindow *) NULL, int x = -1, int y = -1);
+private:
+    wxString m_caption;
+    wxString m_message;
+    long m_dialogStyle;
+    wxWindow *m_parent;

 
 

-#endif
+    DECLARE_DYNAMIC_CLASS(wxMessageDialog)
+};

 
 #endif
 
 #endif

-       // __MSGDLGH_G__