From 48a94bc520a8ff55790b78c28d1c60c7bda51774 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Fri, 27 Dec 2013 11:52:54 +0100 Subject: [PATCH] mmg: append_combobox_items(): use Append for wxArrayString on wxWidgets > 3.0.0 --- src/mmg/helpers.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mmg/helpers.cpp b/src/mmg/helpers.cpp index a5b6e38bc..ab653e850 100644 --- a/src/mmg/helpers.cpp +++ b/src/mmg/helpers.cpp @@ -382,7 +382,7 @@ set_menu_label(wxFrame *frame, void append_combobox_items(wxMTX_COMBOBOX_TYPE *combo_box, wxArrayString const &items) { -#if defined(USE_WXBITMAPCOMBOBOX) +#if defined(USE_WXBITMAPCOMBOBOX) && (wxGENERIC_BITMAPCOMBOBOX || !wxCHECK_VERSION(3, 0, 0)) for (auto const &item : items) combo_box->Append(item); #else // defined(USE_WXBITMAPCOMBOBOX)