X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/69b85ca49b0ac601c285e84294ac50be9dfc5291..ba1e9d6cede4073faf42e3e290a030965a2205c3:/include/wx/mac/choice.h

diff --git a/include/wx/mac/choice.h b/include/wx/mac/choice.h
index 3f9909e031..4c10bab315 100644
--- a/include/wx/mac/choice.h
+++ b/include/wx/mac/choice.h
@@ -12,13 +12,14 @@
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "choice.h"
 #endif
 
 #include "wx/control.h"
 
-  #include  "wx/dynarray.h"
+#include  "wx/dynarray.h"
+#include  "wx/arrstr.h"
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr;
 
@@ -46,6 +47,16 @@ public:
   {
     Create(parent, id, pos, size, n, choices, style, validator, name);
   }
+  wxChoice(wxWindow *parent, wxWindowID id,
+           const wxPoint& pos,
+           const wxSize& size,
+           const wxArrayString& choices,
+           long style = 0,
+           const wxValidator& validator = wxDefaultValidator,
+           const wxString& name = wxChoiceNameStr)
+  {
+    Create(parent, id, pos, size, choices, style, validator, name);
+  }
 
   bool Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
@@ -54,6 +65,13 @@ public:
            long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxChoiceNameStr);
+  bool Create(wxWindow *parent, wxWindowID id,
+           const wxPoint& pos,
+           const wxSize& size,
+           const wxArrayString& choices,
+           long style = 0,
+           const wxValidator& validator = wxDefaultValidator,
+           const wxString& name = wxChoiceNameStr);
 
   // implement base class pure virtuals
   virtual int DoAppend(const wxString& item);
@@ -72,11 +90,14 @@ public:
 
 protected:
     virtual wxSize DoGetBestSize() const ;
+
+public: // for wxComboBox only
     virtual void DoSetItemClientData( int n, void* clientData );
     virtual void* DoGetItemClientData( int n ) const;
     virtual void DoSetItemClientObject( int n, wxClientData* clientData );
     virtual wxClientData* DoGetItemClientObject( int n ) const;
 
+protected:
     // free all memory we have (used by Clear() and dtor)
     // prevent collision with some BSD definitions of macro Free()   
     void FreeData();