From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Mon, 22 Nov 2010 16:38:44 +0000 (+0000)
Subject: fixing 64 bit ranger error
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/79323592eba8d44320ecd1cde789315255668a23

fixing 64 bit ranger error

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/osx/cocoa/combobox.mm b/src/osx/cocoa/combobox.mm
index d98f0a331e..4aec03feb3 100644
--- a/src/osx/cocoa/combobox.mm
+++ b/src/osx/cocoa/combobox.mm
@@ -144,9 +144,13 @@ wxString wxNSComboBoxControl::GetStringAtIndex(int pos) const
 
 int wxNSComboBoxControl::FindString(const wxString& text) const
 {
-    int result = [m_comboBox indexOfItemWithObjectValue:wxCFStringRef( text , m_wxPeer->GetFont().GetEncoding() ).AsNSString()];
-    if (result == NSNotFound)
+    NSInteger nsresult = [m_comboBox indexOfItemWithObjectValue:wxCFStringRef( text , m_wxPeer->GetFont().GetEncoding() ).AsNSString()];
+
+    int result;
+    if (nsresult == NSNotFound)
         result = wxNOT_FOUND;
+    else
+        result = (int) nsresult;
     return result;
 }