Trying to commit wxDirDialog patch.

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

diff --git a/include/wx/os2/msgdlg.h b/include/wx/os2/msgdlg.h
index ab513036708395e027f84f13d281cc8aa5c9fae0..0a08854cbf4b169a7ded5fd0a71e518cd17e0346 100644 (file)
--- a/include/wx/os2/msgdlg.h
+++ b/include/wx/os2/msgdlg.h
@@ -1,28 +1,26 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSGBOXDLG_H_
 #define _WX_MSGBOXDLG_H_
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSGBOXDLG_H_
 #define _WX_MSGBOXDLG_H_
 

-#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;
-
-class WXDLLEXPORT wxMessageDialog : public wxDialog
+class WXDLLEXPORT wxMessageDialog : public wxDialog, public wxMessageDialogBase

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


@@ -38,7 +36,6 @@ 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