X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/584ad2a32fec156c6049145d7ece9a33213aea28..222702b112dcc7bebe018d6f4d66fe469fefd02c:/src/os2/choice.cpp

diff --git a/src/os2/choice.cpp b/src/os2/choice.cpp
index b980792934..7a5cee5085 100644
--- a/src/os2/choice.cpp
+++ b/src/os2/choice.cpp
@@ -12,6 +12,10 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/defs.h"
+
+#if wxUSE_CHOICE
+
 #ifndef WX_PRECOMP
     #include "wx/choice.h"
     #include "wx/utils.h"
@@ -62,7 +66,7 @@ bool wxChoice::Create(
                        ,rValidator
                        ,rsName
                       ))
-        return FALSE;
+        return false;
     lSstyle = CBS_DROPDOWNLIST |
               WS_TABSTOP       |
               WS_VISIBLE;
@@ -79,7 +83,7 @@ bool wxChoice::Create(
     if (!OS2CreateControl( wxT("COMBOBOX")
                           ,lSstyle
                          ))
-        return FALSE;
+        return false;
 
     //
     // A choice/combobox normally has a white background (or other, depending
@@ -102,7 +106,7 @@ bool wxChoice::Create(
             ,rSize.y
            );
     delete pTextFont;
-    return TRUE;
+    return true;
 } // end of wxChoice::Create
 
 // ----------------------------------------------------------------------------
@@ -114,7 +118,7 @@ int wxChoice::DoAppend(
 )
 {
     int                             nIndex;
-    SHORT                           nIndexType = 0;
+    LONG                            nIndexType = 0;
 
     if (m_windowStyle & wxLB_SORT)
         nIndexType = LIT_SORTASCENDING;
@@ -140,7 +144,7 @@ int wxChoice::DoInsert(
         return DoAppend(rsItem);
 
     int                             nIndex;
-    SHORT                           nIndexType = 0;
+    LONG                            nIndexType = 0;
 
     if (m_windowStyle & wxLB_SORT)
         nIndexType = LIT_SORTASCENDING;
@@ -212,7 +216,7 @@ int wxChoice::FindString(
         nTextLength = (int)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXTLENGTH, (MPARAM)nPos, (MPARAM)0));
         zStr = new char[nTextLength + 1];
         ::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXT, MPFROM2SHORT((SHORT)nPos, (SHORT)nTextLength), (MPARAM)zStr);
-        if (rsStr == (char*)zStr)
+        if (rsStr == (wxChar*)zStr)
         {
             delete [] zStr;
             break;
@@ -227,7 +231,7 @@ void wxChoice::SetString(
 , const wxString&                   rsStr
 )
 {
-    SHORT                           nIndexType = 0;
+    LONG                            nIndexType = 0;
     void*                           pData;
 
     if ( m_clientDataItemsType != wxClientData_None )
@@ -263,14 +267,14 @@ wxString wxChoice::GetString(
   int                               n
 ) const
 {
-    size_t                          nLen = 0;
-    wxString                        sStr = "";
-    char*                           zBuf;
+    int                             nLen = 0;
+    wxString                        sStr = wxEmptyString;
+    wxChar*                         zBuf;
 
     nLen = (size_t)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXTLENGTH, (MPARAM)n, (MPARAM)0));
     if (nLen != LIT_ERROR && nLen > 0)
     {
-        zBuf = new char[nLen + 1];
+        zBuf = new wxChar[nLen + 1];
         ::WinSendMsg( GetHwnd()
                      ,LM_QUERYITEMTEXT
                      ,MPFROM2SHORT((SHORT)n, (SHORT)nLen)
@@ -334,7 +338,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.
     //
@@ -356,6 +360,7 @@ wxSize wxChoice::DoGetBestSize() const
     int                             nItems = GetCount();
     int                             nCx;
     int                             nCy;
+    wxFont                          vFont = (wxFont)GetFont();
 
     for (int i = 0; i < nItems; i++)
     {
@@ -382,7 +387,7 @@ wxSize wxChoice::DoGetBestSize() const
     wxGetCharSize( GetHWND()
                   ,&nCx
                   ,&nCy
-                  ,(wxFont*)&GetFont()
+                  ,&vFont
                  );
     nChoiceWidth += 5 * nCx;
 
@@ -419,7 +424,7 @@ bool wxChoice::OS2Command(
         //
         // "selection changed" is the only event we're after
         //
-        return FALSE;
+        return false;
     }
     int                             n = GetSelection();
 
@@ -431,14 +436,14 @@ bool wxChoice::OS2Command(
 
         vEvent.SetInt(n);
         vEvent.SetEventObject(this);
-        vEvent.SetString((char*)GetStringSelection().c_str());
+        vEvent.SetString(GetStringSelection());
         if (HasClientObjectData())
             vEvent.SetClientObject(GetClientObject(n));
         else if (HasClientUntypedData())
             vEvent.SetClientData(GetClientData(n));
         ProcessCommand(vEvent);
     }
-    return TRUE;
+    return true;
 } // end of wxChoice::OS2Command
 
 void wxChoice::Free()
@@ -452,4 +457,6 @@ void wxChoice::Free()
             delete GetClientObject(n);
         }
     }
-} // end of wxhoice::Free
+} // end of wxChoice::Free
+
+#endif // wxUSE_CHOICE