Allow an app to call SetFont on a PS DC without assertion

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

diff --git a/include/wx/mac/listbox.h b/include/wx/mac/listbox.h
index d1ca11ca7a99e8378fb86708c494031e7388bc68..77c0f27209ffc97c07e43385b01f9c191ba923ca 100644 (file)
--- a/include/wx/mac/listbox.h
+++ b/include/wx/mac/listbox.h
@@ -21,7 +21,7 @@
 // simple types
 // ----------------------------------------------------------------------------
 #include  "wx/dynarray.h"
-
+#include  "wx/arrstr.h"
 
 #if wxUSE_OWNER_DRAWN
   class WXDLLEXPORT wxOwnerDrawn;
@@ -58,6 +58,16 @@ public:
     {
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
+    wxListBox(wxWindow *parent, wxWindowID id,
+            const wxPoint& pos,
+            const wxSize& size,
+            const wxArrayString& choices,
+            long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxListBoxNameStr)
+    {
+        Create(parent, id, pos, size, choices, style, validator, name);
+    }
 
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
@@ -66,6 +76,13 @@ public:
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxListBoxNameStr);
+    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 = wxListBoxNameStr);
 
     virtual ~wxListBox();
     virtual void Refresh(bool eraseBack = TRUE, const wxRect *rect = NULL);
@@ -132,7 +149,7 @@ protected:
     int             MacGetSelections(wxArrayInt& aSelections) const ;
     bool            MacIsSelected( int n ) const ;
     void            MacScrollTo( int n ) ;
-    void            OnSize( const wxSizeEvent &size ) ;
+    void            OnSize( wxSizeEvent &size ) ;
     void            MacDoClick() ;
     void            MacDoDoubleClick() ;