update button style to include BS_MULTILINE when a multiline label is set

[wxWidgets.git] / src / common / arrstr.cpp

diff --git a/src/common/arrstr.cpp b/src/common/arrstr.cpp
index ec41806616123b2fba1c8776d5a3c0c80aec668a..fe36a74bf8e5883054ef1500a50f5f16936099a5 100644 (file)
--- a/src/common/arrstr.cpp
+++ b/src/common/arrstr.cpp
@@ -27,7 +27,16 @@
 // ArrayString
 // ============================================================================
 
 // ArrayString
 // ============================================================================
 

-wxArrayString::wxArrayString(size_t sz, const wxChar** a)
+wxArrayString::wxArrayString(size_t sz, const char** a)
+{
+#if !wxUSE_STL
+    Init(false);
+#endif
+    for (size_t i=0; i < sz; i++)
+        Add(a[i]);
+}
+
+wxArrayString::wxArrayString(size_t sz, const wchar_t** a)

 {
 #if !wxUSE_STL
     Init(false);
 {
 #if !wxUSE_STL
     Init(false);


@@ -355,7 +364,7 @@ void wxArrayString::RemoveAt(size_t nIndex, size_t nRemove)
 }
 
 // removes item from array (by value)
 }
 
 // removes item from array (by value)

-void wxArrayString::Remove(const wxChar *sz)
+void wxArrayString::Remove(const wxString& sz)

 {
   int iIndex = Index(sz);
 
 {
   int iIndex = Index(sz);