Applied patch [ 1382552 ] Fixes GDI-ressource leak in wxStaticBitmap

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

diff --git a/include/wx/motif/msgdlg.h b/include/wx/motif/msgdlg.h
index b8724d271fae71b2b2f6ee818f30ee5af5d6bad5..12e013922cf2ba52e53ba5a3eb27218a5a2fe2ac 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
@@ -13,10 +13,6 @@
 #ifndef _WX_MSGBOXDLG_H_
 #define _WX_MSGBOXDLG_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "msgdlg.h"
-#endif
-
 #include "wx/setup.h"
 #include "wx/dialog.h"
 
@@ -24,29 +20,28 @@
 // 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)
-        
+
 public:
     wxMessageDialog(wxWindow *parent,
         const wxString& message,
         const wxString& caption = wxMessageBoxCaptionStr,
         long style = wxOK | wxCENTRE,
         const wxPoint& pos = wxDefaultPosition);
-    
+
     int ShowModal();
-    
+
     // implementation only from now on
     // called by the Motif callback
     void SetResult(long result) { m_result = result; }
-    
+
 protected:
     wxString    m_caption;
     wxString    m_message;
-    long        m_dialogStyle;
     wxWindow *  m_parent;
     long        m_result;
 };