replace changes of r49890 by defining more compatibility operators in wxCmdLineArgsAr...

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

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

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

 // Purpose:     wxMessageDialog for GTK+2
 // Author:      Vaclav Slavik
 // Modified by:
 // Purpose:     wxMessageDialog for GTK+2
 // Author:      Vaclav Slavik
 // Modified by:


@@ -12,17 +12,13 @@
 #ifndef __MSGDLG_H__
 #define __MSGDLG_H__
 
 #ifndef __MSGDLG_H__
 #define __MSGDLG_H__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "msgdlg.h"
-#endif
-
-#include "wx/setup.h"
+#include "wx/defs.h"

 #include "wx/dialog.h"
 
 // type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO
 // Returns wxYES/NO/OK/CANCEL
 
 #include "wx/dialog.h"
 
 // type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO
 // Returns wxYES/NO/OK/CANCEL
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxMessageBoxCaptionStr[];

 
 class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase
 {
 
 class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase
 {


@@ -31,7 +27,7 @@ public:
                     const wxString& caption = wxMessageBoxCaptionStr,
                     long style = wxOK|wxCENTRE,
                     const wxPoint& pos = wxDefaultPosition);
                     const wxString& caption = wxMessageBoxCaptionStr,
                     long style = wxOK|wxCENTRE,
                     const wxPoint& pos = wxDefaultPosition);

-    ~wxMessageDialog();
+    virtual ~wxMessageDialog();

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