Correct compilation conditions for wxURL::SetProxy.

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

diff --git a/include/wx/os2/msgdlg.h b/include/wx/os2/msgdlg.h
index d5fda7dc58b3815a9a445e913c96f41928e48e0e..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,7 +20,7 @@
  * Message box dialog
  */
 
  * Message box dialog
  */
 

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

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


@@ -36,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