support metal appearance

[wxWidgets.git] / src / os2 / choice.cpp

diff --git a/src/os2/choice.cpp b/src/os2/choice.cpp
index 6098b3afa471faf797745c9081ea096616bdc5b6..793111d6b57caf85630abab30593f5c73d7635ce 100644 (file)
--- a/src/os2/choice.cpp
+++ b/src/os2/choice.cpp
@@ -23,6 +23,23 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 

+bool wxChoice::Create(
+  wxWindow*                         pParent
+, wxWindowID                        vId
+, const wxPoint&                    rPos
+, const wxSize&                     rSize
+, const wxArrayString&              asChoices
+, long                              lStyle
+, const wxValidator&                rValidator
+, const wxString&                   rsName
+)
+{
+    wxCArrayString chs(asChoices);
+
+    return Create(pParent, vId, rPos, rSize, chs.GetCount(), chs.GetStrings(),
+                  lStyle, rValidator, rsName);
+}
+

 bool wxChoice::Create(
   wxWindow*                         pParent
 , wxWindowID                        vId
 bool wxChoice::Create(
   wxWindow*                         pParent
 , wxWindowID                        vId


@@ -97,7 +114,7 @@ int wxChoice::DoAppend(
 )
 {
     int                             nIndex;
 )
 {
     int                             nIndex;

-    SHORT                           nIndexType = 0;
+    LONG                            nIndexType = 0;

 
     if (m_windowStyle & wxLB_SORT)
         nIndexType = LIT_SORTASCENDING;
 
     if (m_windowStyle & wxLB_SORT)
         nIndexType = LIT_SORTASCENDING;


@@ -123,7 +140,7 @@ int wxChoice::DoInsert(
         return DoAppend(rsItem);
 
     int                             nIndex;
         return DoAppend(rsItem);
 
     int                             nIndex;

-    SHORT                           nIndexType = 0;
+    LONG                            nIndexType = 0;

 
     if (m_windowStyle & wxLB_SORT)
         nIndexType = LIT_SORTASCENDING;
 
     if (m_windowStyle & wxLB_SORT)
         nIndexType = LIT_SORTASCENDING;


@@ -210,7 +227,7 @@ void wxChoice::SetString(
 , const wxString&                   rsStr
 )
 {
 , const wxString&                   rsStr
 )
 {

-    SHORT                           nIndexType = 0;
+    LONG                            nIndexType = 0;

     void*                           pData;
 
     if ( m_clientDataItemsType != wxClientData_None )
     void*                           pData;
 
     if ( m_clientDataItemsType != wxClientData_None )


@@ -246,7 +263,7 @@ wxString wxChoice::GetString(
   int                               n
 ) const
 {
   int                               n
 ) const
 {

-    size_t                          nLen = 0;
+    int                             nLen = 0;

     wxString                        sStr = "";
     char*                           zBuf;
 
     wxString                        sStr = "";
     char*                           zBuf;