X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2bda0e173844e8e0f8acf4e8ad8b5c26e5c6fe5d..fa9666fbe69e76f57042b46ba2c8ad5b18a527b6:/include/wx/msw/msgdlg.h diff --git a/include/wx/msw/msgdlg.h b/include/wx/msw/msgdlg.h index 7188bb2f62..6732bf7add 100644 --- a/include/wx/msw/msgdlg.h +++ b/include/wx/msw/msgdlg.h @@ -5,14 +5,14 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __MSGBOXDLGH__ -#define __MSGBOXDLGH__ +#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, - const long style = wxOK|wxCENTRE, - wxWindow *parent = NULL, const int x = -1, const int y = -1); #endif - // __MSGBOXDLGH__ + // _WX_MSGBOXDLG_H_