X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/15b24b148ad8ceadc501893ce34df3867f519a41..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/generic/msgdlgg.h diff --git a/include/wx/generic/msgdlgg.h b/include/wx/generic/msgdlgg.h index a545631340..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 @@ -29,27 +29,22 @@ class WXDLLEXPORT wxGenericMessageDialog: public wxDialog DECLARE_DYNAMIC_CLASS(wxGenericMessageDialog) public: - wxGenericMessageDialog(wxWindow *parent, const wxString& message, + 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); - + private: - wxList m_buttons; - int m_dialogStyle; + long m_dialogStyle; -DECLARE_EVENT_TABLE() + DECLARE_EVENT_TABLE() }; -#if !defined( __WXMSW__ ) && !defined( __WXMAC__) +#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 = (wxWindow *) NULL, int x = -1, int y = -1); - #endif #endif