Tinderbox build fix for wxUnivGTK build.

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

diff --git a/include/wx/motif/msgdlg.h b/include/wx/motif/msgdlg.h
index cc4d9e9a3fadfb0fe223f385b36de05cc68b62e4..e479425a7012dd933b492f6fb6fa6c17133434ea 100644 (file)
--- 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
 // 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_
 
 #ifndef _WX_MSGBOXDLG_H_
 #define _WX_MSGBOXDLG_H_
 

-#ifdef __GNUG__
-#pragma interface "msgdlg.h"
-#endif
-
-#include "wx/setup.h"
+#include "wx/defs.h"

 #include "wx/dialog.h"
 
 // ----------------------------------------------------------------------------
 // Message box dialog
 // ----------------------------------------------------------------------------
 
 #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)
 {
     DECLARE_DYNAMIC_CLASS(wxMessageDialog)

-        
+

 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);

-    
+

     int ShowModal();
     int ShowModal();

-    
+

     // implementation only from now on
     // called by the Motif callback
     void SetResult(long result) { m_result = result; }
     // implementation only from now on
     // called by the Motif callback
     void SetResult(long result) { m_result = result; }

-    
+

 protected:
     wxString    m_caption;
     wxString    m_message;
 protected:
     wxString    m_caption;
     wxString    m_message;

-    long        m_dialogStyle;

     wxWindow *  m_parent;
     long        m_result;
 };
     wxWindow *  m_parent;
     long        m_result;
 };