gtk notebook page style fixes (patch 984864)

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

diff --git a/include/wx/cocoa/choice.h b/include/wx/cocoa/choice.h
index 3f6370a6732bb64b20db72caccc2f6aaaa00ec33..55df3d4234ed1158133e46ce9c8da8bdaffbb2cd 100644 (file)
--- a/include/wx/cocoa/choice.h
+++ b/include/wx/cocoa/choice.h
@@ -6,7 +6,7 @@
 // Created:     2003/03/16
 // RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott
-// Licence:    wxWindows license
+// Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_CHOICE_H__
@@ -15,6 +15,8 @@
 //#include "wx/cocoa/NSPopUpButton.h"
 #include "wx/cocoa/NSMenu.h"
 
+class WXDLLIMPEXP_BASE wxSortedArrayString;
+
 // ========================================================================
 // wxChoice
 // ========================================================================
@@ -39,6 +41,17 @@ public:
         Init();
         Create(parent, winid,  pos, size, n, choices, style, validator, name);
     }
+    wxChoice(wxWindow *parent, wxWindowID winid,
+            const wxPoint& pos,
+            const wxSize& size,
+            const wxArrayString& choices,
+            long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxChoiceNameStr)
+    {
+        Init();
+        Create(parent, winid,  pos, size, choices, style, validator, name);
+    }
 
     bool Create(wxWindow *parent, wxWindowID winid,
             const wxPoint& pos = wxDefaultPosition,
@@ -47,6 +60,13 @@ public:
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxChoiceNameStr);
+    bool Create(wxWindow *parent, wxWindowID winid,
+            const wxPoint& pos,
+            const wxSize& size,
+            const wxArrayString& choices,
+            long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxChoiceNameStr);
     virtual ~wxChoice();
 protected:
     void Init();