blind attempt to fix wxMac compilation (__UNIX__ defined on OS X?)

[wxWidgets.git] / include / wx / mac / choice.h

diff --git a/include/wx/mac/choice.h b/include/wx/mac/choice.h
index 26ac3359c0766f78447bcd7b9bc4b7c3fbc77eb8..4c10bab315ef2574864ab567a4f30ebd731c291b 100644 (file)
--- a/include/wx/mac/choice.h
+++ b/include/wx/mac/choice.h
@@ -18,7 +18,8 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

-  #include  "wx/dynarray.h"
+#include  "wx/dynarray.h"
+#include  "wx/arrstr.h"

 
 WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr;
 
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr;
 


@@ -46,6 +47,16 @@ public:
   {
     Create(parent, id, pos, size, n, choices, style, validator, name);
   }
   {
     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,
 
   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);
            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);
 
   // implement base class pure virtuals
   virtual int DoAppend(const wxString& item);