X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2049ba38adafa0ec146880de29f26e32dd69a125..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/generic/msgdlgg.h diff --git a/include/wx/generic/msgdlgg.h b/include/wx/generic/msgdlgg.h index 724d4c6e9d..864bffd367 100644 --- a/include/wx/generic/msgdlgg.h +++ b/include/wx/generic/msgdlgg.h @@ -12,7 +12,7 @@ #ifndef __MSGDLGH_G__ #define __MSGDLGH_G__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "msgdlgg.h" #endif @@ -22,30 +22,29 @@ // type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO // Returns wxYES/NO/OK/CANCEL -WXDLLEXPORT_DATA(extern const char*) wxMessageBoxCaptionStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr; class WXDLLEXPORT wxGenericMessageDialog: public wxDialog { DECLARE_DYNAMIC_CLASS(wxGenericMessageDialog) -protected: - long m_dialogStyle; + public: - wxGenericMessageDialog(wxWindow *parent, const wxString& message, const wxString& caption = wxMessageBoxCaptionStr, + wxGenericMessageDialog(wxWindow *parent, const wxString& message, + const wxString& caption = wxMessageBoxCaptionStr, long style = wxOK|wxCENTRE, const wxPoint& pos = wxDefaultPosition); void OnYes(wxCommandEvent& event); void OnNo(wxCommandEvent& event); void OnCancel(wxCommandEvent& event); -DECLARE_EVENT_TABLE() +private: + long m_dialogStyle; + + DECLARE_EVENT_TABLE() }; -#ifndef __WXMSW__ +#if (!defined( __WXMSW__ ) && !defined( __WXMAC__) && !defined(__WXPM__)) || defined(__WXUNIVERSAL__) #define wxMessageDialog wxGenericMessageDialog - -int wxMessageBox(const wxString& message, const wxString& caption = wxMessageBoxCaptionStr, - long style = wxOK|wxCENTRE, wxWindow *parent = NULL, int x = -1, int y = -1); - #endif #endif