X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbcdf8bc7ca806d8278c7cb6d09d5590378b67d8..fb8a56b77ce195d0bd9ac6984e3e5cbb7136faca:/include/wx/msw/msgdlg.h?ds=sidebyside diff --git a/include/wx/msw/msgdlg.h b/include/wx/msw/msgdlg.h index 51f7d0e39d..a82784cff6 100644 --- a/include/wx/msw/msgdlg.h +++ b/include/wx/msw/msgdlg.h @@ -12,7 +12,7 @@ #ifndef _WX_MSGBOXDLG_H_ #define _WX_MSGBOXDLG_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "msgdlg.h" #endif @@ -23,7 +23,7 @@ * Message box dialog */ -WXDLLEXPORT_DATA(extern const char*) wxMessageBoxCaptionStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr; class WXDLLEXPORT wxMessageDialog: public wxDialog { @@ -38,12 +38,10 @@ public: long style = wxOK|wxCENTRE, const wxPoint& pos = wxDefaultPosition); int ShowModal(void); -}; + DECLARE_NO_COPY_CLASS(wxMessageDialog) +}; -int WXDLLEXPORT wxMessageBox(const wxString& message, const wxString& caption = wxMessageBoxCaptionStr, - long style = wxOK|wxCENTRE, - wxWindow *parent = NULL, int x = -1, int y = -1); #endif // _WX_MSGBOXDLG_H_