X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/584ad2a32fec156c6049145d7ece9a33213aea28..16640ba22621cb6d0ec7053c95357e05fd280d4b:/src/os2/choice.cpp diff --git a/src/os2/choice.cpp b/src/os2/choice.cpp index b980792934..2bb70c0599 100644 --- a/src/os2/choice.cpp +++ b/src/os2/choice.cpp @@ -114,7 +114,7 @@ int wxChoice::DoAppend( ) { int nIndex; - SHORT nIndexType = 0; + LONG nIndexType = 0; if (m_windowStyle & wxLB_SORT) nIndexType = LIT_SORTASCENDING; @@ -140,7 +140,7 @@ int wxChoice::DoInsert( return DoAppend(rsItem); int nIndex; - SHORT nIndexType = 0; + LONG nIndexType = 0; if (m_windowStyle & wxLB_SORT) nIndexType = LIT_SORTASCENDING; @@ -227,7 +227,7 @@ void wxChoice::SetString( , const wxString& rsStr ) { - SHORT nIndexType = 0; + LONG nIndexType = 0; void* pData; if ( m_clientDataItemsType != wxClientData_None ) @@ -263,7 +263,7 @@ wxString wxChoice::GetString( int n ) const { - size_t nLen = 0; + int nLen = 0; wxString sStr = ""; char* zBuf; @@ -334,7 +334,7 @@ void wxChoice::DoSetSize( // // Ignore height parameter because height doesn't mean 'initially // displayed' height, it refers to the drop-down menu as well. The - // wxWindows interpretation is different; also, getting the size returns + // wxWidgets interpretation is different; also, getting the size returns // the _displayed_ size (NOT the drop down menu size) so // setting-getting-setting size would not work. //