Add wxFont ctor taking a single flags argument instead of style/weight/...

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

diff --git a/include/wx/motif/msgdlg.h b/include/wx/motif/msgdlg.h
index 008f64b8cd646f6d93b000e7667355cad2b72fa0..814a071c1c03098b406dc1f079fd0e312995bb6e 100644 (file)
--- a/include/wx/motif/msgdlg.h
+++ b/include/wx/motif/msgdlg.h
@@ -13,42 +13,32 @@
 #ifndef _WX_MSGBOXDLG_H_
 #define _WX_MSGBOXDLG_H_
 
 #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"
-

 // ----------------------------------------------------------------------------
 // Message box dialog
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // Message box dialog
 // ----------------------------------------------------------------------------
 

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

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxMessageDialog)
-

 public:
     wxMessageDialog(wxWindow *parent,
 public:
     wxMessageDialog(wxWindow *parent,

-        const wxString& message,
-        const wxString& caption = wxMessageBoxCaptionStr,
-        long style = wxOK | wxCENTRE,
-        const wxPoint& pos = wxDefaultPosition);
+                    const wxString& message,
+                    const wxString& caption = wxMessageBoxCaptionStr,
+                    long style = wxOK | wxCENTRE,
+                    const wxPoint& WXUNUSED(pos) = wxDefaultPosition)
+        : wxMessageDialogBase(parent, message, caption, style)
+    {
+    }

 
 

-    int ShowModal();
+    virtual int ShowModal();

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

-    wxString    m_caption;
-    wxString    m_message;
-    wxWindow *  m_parent;

     long        m_result;
     long        m_result;

+
+    DECLARE_DYNAMIC_CLASS(wxMessageDialog)

 };
 
 };
 

-#endif
-// _WX_MSGBOXDLG_H_
+#endif // _WX_MSGBOXDLG_H_