don't evaluate assert expression unless the condition is false (patch 1450705)

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

diff --git a/src/os2/choice.cpp b/src/os2/choice.cpp
index 8235ed353217ecb2283c786fabe413f2f6025fa9..a6264e0f8d79befcaf66b4c03e6096a750eb553e 100644 (file)
--- a/src/os2/choice.cpp
+++ b/src/os2/choice.cpp
@@ -12,8 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #if wxUSE_CHOICE
 
 #ifndef WX_PRECOMP
@@ -94,18 +92,11 @@ bool wxChoice::Create(
     {
         Append(asChoices[i]);
     }
-    wxFont*                          pTextFont = new wxFont( 10
-                                                            ,wxMODERN
-                                                            ,wxNORMAL
-                                                            ,wxNORMAL
-                                                           );
-    SetFont(*pTextFont);
     SetSize( rPos.x
             ,rPos.y
             ,rSize.x
             ,rSize.y
            );
-    delete pTextFont;
     return true;
 } // end of wxChoice::Create
 
@@ -132,19 +123,16 @@ int wxChoice::DoAppend(
     return nIndex;
 } // end of wxChoice::DoAppend
 
-int wxChoice::DoInsert(
-  const wxString&                   rsItem,
-  int                               pos
-)
+int wxChoice::DoInsert( const wxString& rsItem, int pos )
 {
     wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list"));
-    wxCHECK_MSG((pos>=0) && (pos<=GetCount()), -1, wxT("invalid index"));
+    wxCHECK_MSG(IsValidInsert(pos), -1, wxT("invalid index"));
 
-    if (pos == GetCount())
+    if ((size_t)pos == GetCount())
         return DoAppend(rsItem);
 
-    int                             nIndex;
-    LONG                            nIndexType = 0;
+    int  nIndex;
+    LONG nIndexType = 0;
 
     if (m_windowStyle & wxLB_SORT)
         nIndexType = LIT_SORTASCENDING;
@@ -158,11 +146,9 @@ int wxChoice::DoInsert(
     return nIndex;
 } // end of wxChoice::DoInsert
 
-void wxChoice::Delete(
-  int                               n
-)
+void wxChoice::Delete( int n )
 {
-    wxCHECK_RET( n < GetCount(), wxT("invalid item index in wxChoice::Delete") );
+    wxCHECK_RET( IsValid(n), wxT("invalid item index in wxChoice::Delete") );
     ::WinSendMsg(GetHwnd(), LM_DELETEITEM, (MPARAM)n, (MPARAM)0);
 } // end of wxChoice::Delete
 
@@ -196,9 +182,9 @@ void wxChoice::SetSelection(
 // string list functions
 // ----------------------------------------------------------------------------
 
-int wxChoice::GetCount() const
+size_t wxChoice::GetCount() const
 {
-    return((int)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMCOUNT, (MPARAM)0, (MPARAM)0)));
+    return((size_t)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMCOUNT, (MPARAM)0, (MPARAM)0)));
 } // end of wxChoice::GetCount
 
 void wxChoice::SetString( int n, const wxString& rsStr )
@@ -323,21 +309,18 @@ wxSize wxChoice::DoGetBestSize() const
     //
     // Find the widest string
     //
-    int                             nLineWidth;
-    int                             nChoiceWidth = 0;
-    int                             nItems = GetCount();
-    int                             nCx;
-    int                             nCy;
-    wxFont                          vFont = (wxFont)GetFont();
-
-    for (int i = 0; i < nItems; i++)
-    {
-        wxString                    sStr(GetString(i));
+    int    nLineWidth;
+    int    nChoiceWidth = 0;
+    int    nCx;
+    int    nCy;
+    wxFont vFont = (wxFont)GetFont();
+
+    const size_t nItems = GetCount();
 
-        GetTextExtent( sStr
-                      ,&nLineWidth
-                      ,NULL
-                     );
+    for (size_t i = 0; i < nItems; i++)
+    {
+        wxString sStr(GetString(i));
+        GetTextExtent( sStr, &nLineWidth, NULL );
         if (nLineWidth > nChoiceWidth)
             nChoiceWidth = nLineWidth;
     }
@@ -352,11 +335,7 @@ wxSize wxChoice::DoGetBestSize() const
     //
     // The combobox should be larger than the widest string
     //
-    wxGetCharSize( GetHWND()
-                  ,&nCx
-                  ,&nCy
-                  ,&vFont
-                 );
+    wxGetCharSize( GetHWND(), &nCx, &nCy, &vFont );
     nChoiceWidth += 5 * nCx;
 
     //
@@ -418,7 +397,7 @@ void wxChoice::Free()
 {
     if (HasClientObjectData())
     {
-        size_t                      nCount = GetCount();
+        const size_t nCount = GetCount();
 
         for (size_t n = 0; n < nCount; n++)
         {