X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2179d57968969c418e7e4b26bbb152e8b1564de7..ba8c1601448fa16d64c4e75a095f1cb037909c5b:/include/wx/generic/msgdlgg.h diff --git a/include/wx/generic/msgdlgg.h b/include/wx/generic/msgdlgg.h index f5a75bf124..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 @@ -38,22 +38,13 @@ public: void OnCancel(wxCommandEvent& event); private: - int m_dialogStyle; + long m_dialogStyle; -DECLARE_EVENT_TABLE() + DECLARE_EVENT_TABLE() }; -#if !defined( __WXMSW__ ) && !defined( __WXMAC__) && !defined(__WXPM__) +#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