wxDIB::Create(wxBitmap) shouldn't do any conversions if the bitmap is already a DIB...

[wxWidgets.git] / include / wx / generic / choicdgg.h

diff --git a/include/wx/generic/choicdgg.h b/include/wx/generic/choicdgg.h
index fcd13f46bd630864f3a8964c933b87044c548c77..b342683bb8aba5094c4144fc7abaf352395ed651 100644 (file)
--- 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
 
@@ -61,6 +61,8 @@ public:
 
 protected:
     wxListBox  *m_listbox;
+
+    DECLARE_NO_COPY_CLASS(wxAnyChoiceDialog)
 };
 
 // ----------------------------------------------------------------------------
@@ -105,7 +107,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,7 +273,7 @@ WXDLLEXPORT size_t wxGetMultipleChoices(wxArrayInt& selections,
 // deprecated
 // ----------------------------------------------------------------------------
 
-#ifdef WXWIN_COMPATIBILITY_2
+#if WXWIN_COMPATIBILITY_2
 
 WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message,
                                        const wxString& caption,