GCC 4.0 (Apple 4059) is a little bit pickier than 3.3.

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

diff --git a/include/wx/os2/msgdlg.h b/include/wx/os2/msgdlg.h
index af7a32d0466231870cae8c3613453943acd60d5a..b3e236e0129a421bef32cd7762358c8726298b07 100644 (file)
--- a/include/wx/os2/msgdlg.h
+++ b/include/wx/os2/msgdlg.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxMessageDialog class. Use generic version if no
 //              platform-specific implementation.
 // Author:      David Webster
 // Modified by:
 // Created:     10/12/99
 // RCS-ID:      $Id$
 // Purpose:     wxMessageDialog class. Use generic version if no
 //              platform-specific implementation.
 // Author:      David Webster
 // Modified by:
 // Created:     10/12/99
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) David Webster

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


@@ -20,9 +20,7 @@
  * Message box dialog
  */
 
  * Message box dialog
  */
 

-WXDLLEXPORT_DATA(extern const char*) wxMessageBoxCaptionStr;
-
-class WXDLLEXPORT wxMessageDialog : public wxDialog
+class WXDLLEXPORT wxMessageDialog : public wxDialog, public wxMessageDialogBase

 {
 DECLARE_DYNAMIC_CLASS(wxMessageDialog)
 public:
 {
 DECLARE_DYNAMIC_CLASS(wxMessageDialog)
 public:


@@ -38,18 +36,8 @@ public:
 protected:
     wxString                        m_sCaption;
     wxString                        m_sMessage;
 protected:
     wxString                        m_sCaption;
     wxString                        m_sMessage;

-    long                            m_lDialogStyle;

     wxWindow*                       m_pParent;
 }; // end of CLASS wxMessageDialog
 
     wxWindow*                       m_pParent;
 }; // end of CLASS wxMessageDialog
 

-
-int WXDLLEXPORT wxMessageBox( const wxString& rsMessage
-                             ,const wxString& rsCaption = wxMessageBoxCaptionStr
-                             ,long            lStyle = wxOK|wxCENTRE
-                             ,wxWindow*       pParent = NULL
-                             ,int             nX = -1
-                             ,int             nY = -1
-                            );
-

 #endif
     // _WX_MSGBOXDLG_H_
 #endif
     // _WX_MSGBOXDLG_H_