Updated version to 2.5.5

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

diff --git a/include/wx/gtk1/msgdlg.h b/include/wx/gtk1/msgdlg.h
index 1f142a6dce5cb35c10c7717293dd93dc31f1663b..edcfcedbf4889ab4a1e83cc3dc5d48a529c78a03 100644 (file)
--- a/include/wx/gtk1/msgdlg.h
+++ b/include/wx/gtk1/msgdlg.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msgdlg.h
+// Name:        wx/gtk/msgdlg.h

 // Purpose:     wxMessageDialog for GTK+2
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2003/02/28
 // RCS-ID:      $Id$
 // Copyright:   (c) Vaclav Slavik, 2003
 // Purpose:     wxMessageDialog for GTK+2
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2003/02/28
 // RCS-ID:      $Id$
 // Copyright:   (c) Vaclav Slavik, 2003

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __MSGDLG_H__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __MSGDLG_H__


@@ -24,13 +24,14 @@
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr;
 
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr;
 

-class WXDLLEXPORT wxMessageDialog: public wxDialog
+class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase

 {
 public:
     wxMessageDialog(wxWindow *parent, const wxString& message,
                     const wxString& caption = wxMessageBoxCaptionStr,
                     long style = wxOK|wxCENTRE,
                     const wxPoint& pos = wxDefaultPosition);
 {
 public:
     wxMessageDialog(wxWindow *parent, const wxString& message,
                     const wxString& caption = wxMessageBoxCaptionStr,
                     long style = wxOK|wxCENTRE,
                     const wxPoint& pos = wxDefaultPosition);

+    ~wxMessageDialog();

 
     int ShowModal();
     virtual bool Show( bool WXUNUSED(show) = true ) { return false; };
 
     int ShowModal();
     virtual bool Show( bool WXUNUSED(show) = true ) { return false; };


@@ -47,7 +48,6 @@ protected:
 private:
     wxString m_caption;
     wxString m_message;
 private:
     wxString m_caption;
     wxString m_message;

-    long m_dialogStyle;

 
     DECLARE_DYNAMIC_CLASS(wxMessageDialog)
 };
 
     DECLARE_DYNAMIC_CLASS(wxMessageDialog)
 };