unTABbed

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

diff --git a/src/os2/choice.cpp b/src/os2/choice.cpp
index b980792934bc8a4037ee4f858c7e6517e05b1f48..793111d6b57caf85630abab30593f5c73d7635ce 100644 (file)
--- a/src/os2/choice.cpp
+++ b/src/os2/choice.cpp
@@ -114,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;


@@ -140,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;


@@ -227,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 )


@@ -263,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;