X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/96e169b5230964b7aa6244a5696c1b2aafad8b96..7c11806499166993dffcbb99139d5b248a2c6c82:/include/wx/motif/msgdlg.h diff --git a/include/wx/motif/msgdlg.h b/include/wx/motif/msgdlg.h index dfb16cbf2f..008f64b8cd 100644 --- 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,7 +13,7 @@ #ifndef _WX_MSGBOXDLG_H_ #define _WX_MSGBOXDLG_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "msgdlg.h" #endif @@ -26,30 +26,29 @@ WXDLLEXPORT_DATA(extern const char*) 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); + 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 + // 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; }; #endif - // _WX_MSGBOXDLG_H_ +// _WX_MSGBOXDLG_H_