Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make new wxCocoaMessageDialog suitable for backport to 2.8.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2007-11-09 18:26:21 +00:00
parent e9871aaf86
commit c4f2b985d7
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
include/wx/cocoa/msgdlg.h
View File

@@ -13,23 +13,38 @@
DECLARE_WXCOCOA_OBJC_CLASS(NSAlert); DECLARE_WXCOCOA_OBJC_CLASS(NSAlert);
#ifndef wxUSE_COCOA_NATIVE_MSGDLG
// trunk: Always use Cocoa dialog
// 2.8: Only use Cocoa dialog if ABI incompatible features is on
// Build both on both branches (there was no wxCocoaMessageDialog class so it's not an ABI issue)
#if 1/* wxUSE_ABI_INCOMPATIBLE_FEATURES */
#define wxUSE_COCOA_NATIVE_MSGDLG 1
#else
#define wxUSE_COCOA_NATIVE_MSGDLG 0
#endif
#endif
#if defined(__WX_COMPILING_COCOA_MSGDLG_MM__) || wxUSE_COCOA_NATIVE_MSGDLG
#define wxMessageDialog wxCocoaMessageDialog
#else
#include "wx/generic/msgdlgg.h"
#define wxMessageDialog wxGenericMessageDialog
#endif
#define wxMessageDialog wxCocoaMessageDialog
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
// wxMsgDialog // wxMsgDialog
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
class WXDLLEXPORT wxMessageDialog: public wxMessageDialogBase class WXDLLEXPORT wxCocoaMessageDialog: public wxMessageDialogBase
{ {
DECLARE_DYNAMIC_CLASS(wxMessageDialog) DECLARE_DYNAMIC_CLASS(wxCocoaMessageDialog)
DECLARE_NO_COPY_CLASS(wxMessageDialog) DECLARE_NO_COPY_CLASS(wxCocoaMessageDialog)
public: public:
wxMessageDialog(wxWindow *parent, wxCocoaMessageDialog(wxWindow *parent,
const wxString& message, const wxString& message,
const wxString& caption = wxMessageBoxCaptionStr, const wxString& caption = wxMessageBoxCaptionStr,
long style = wxOK|wxCENTRE, long style = wxOK|wxCENTRE,