X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0cc1d4ff2a0c78666f35bbfa34fcc609d7862709..2263a14efc121f52675be4408f26185779838c96:/include/wx/motif/choice.h

diff --git a/include/wx/motif/choice.h b/include/wx/motif/choice.h
index e2ce50b03c..7cd969839a 100644
--- a/include/wx/motif/choice.h
+++ b/include/wx/motif/choice.h
@@ -12,14 +12,18 @@
 #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/clntdata.h"
-#include "wx/dynarray.h"
 
-WX_DEFINE_ARRAY(WXWidget, wxWidgetArray);
+#ifndef wxWIDGET_ARRAY_DEFINED
+    #define wxWIDGET_ARRAY_DEFINED
+
+    #include "wx/dynarray.h"
+    WX_DEFINE_ARRAY_PTR(WXWidget, wxWidgetArray);
+#endif
 
 // Choice item
 class WXDLLEXPORT wxChoice: public wxChoiceBase
@@ -42,6 +46,18 @@ 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)
+    {
+        Init();
+        Create(parent, id, pos, size, choices, style, validator, name);
+    }
+
     bool Create(wxWindow *parent, wxWindowID id,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
@@ -50,6 +66,14 @@ public:
         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);
+
     // implementation of wxControlWithItems
     virtual int GetCount() const;
     virtual int DoAppend(const wxString& item);
@@ -76,7 +100,7 @@ public:
     void SetFocus();
     
     // Implementation
-    virtual void ChangeFont(bool keepOriginalSize = TRUE);
+    virtual void ChangeFont(bool keepOriginalSize = true);
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
     WXWidget GetTopWidget() const { return m_formWidget; }