X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3d49ce4485af0c6ee498193519473cd8a830bbff..aab49a0b6a1786b9d4da1d1ca0dab96d24737cf9:/include/wx/generic/choicdgg.h diff --git a/include/wx/generic/choicdgg.h b/include/wx/generic/choicdgg.h index 9bba7c06db..683092a3ee 100644 --- a/include/wx/generic/choicdgg.h +++ b/include/wx/generic/choicdgg.h @@ -12,7 +12,7 @@ #ifndef __CHOICEDLGH_G__ #define __CHOICEDLGH_G__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "choicdgg.h" #endif @@ -105,7 +105,7 @@ public: void OnListBoxDClick(wxCommandEvent& event); // old, deprecated methods -#ifdef WXWIN_COMPATIBILITY_2 +#if WXWIN_COMPATIBILITY_2 wxSingleChoiceDialog(wxWindow *parent, const wxString& message, const wxString& caption, @@ -271,6 +271,8 @@ WXDLLEXPORT size_t wxGetMultipleChoices(wxArrayInt& selections, // deprecated // ---------------------------------------------------------------------------- +#if WXWIN_COMPATIBILITY_2 + WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message, const wxString& caption, int n, wxChar *choices[], @@ -302,5 +304,7 @@ WXDLLEXPORT void* wxGetSingleChoiceData(const wxString& message, int height = wxCHOICE_HEIGHT); +#endif // WXWIN_COMPATIBILITY_2 + #endif // __CHOICEDLGH_G__