X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3d49ce4485af0c6ee498193519473cd8a830bbff..50bea100324dcbeebf400eb65869fd4eae476171:/include/wx/generic/choicdgg.h

diff --git a/include/wx/generic/choicdgg.h b/include/wx/generic/choicdgg.h
index 9bba7c06db..c2e3cc51dc 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
 
@@ -28,7 +28,8 @@ class WXDLLEXPORT wxListBox;
 #define wxCHOICE_HEIGHT 150
 #define wxCHOICE_WIDTH 200
 
-#define wxCHOICEDLG_STYLE (wxDEFAULT_DIALOG_STYLE|wxOK | wxCANCEL | wxCENTRE)
+#define wxCHOICEDLG_STYLE \
+    (wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxOK | wxCANCEL | wxCENTRE)
 
 // ----------------------------------------------------------------------------
 // wxAnyChoiceDialog: a base class for dialogs containing a listbox
@@ -61,6 +62,8 @@ public:
 
 protected:
     wxListBox  *m_listbox;
+
+    DECLARE_NO_COPY_CLASS(wxAnyChoiceDialog)
 };
 
 // ----------------------------------------------------------------------------
@@ -105,7 +108,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 +274,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 +307,7 @@ WXDLLEXPORT void* wxGetSingleChoiceData(const wxString& message,
                                         int height = wxCHOICE_HEIGHT);
 
 
+#endif // WXWIN_COMPATIBILITY_2
+
 #endif // __CHOICEDLGH_G__