On OSX don't propogate the alignment setting from column to renderer if it is a custo...

[wxWidgets.git] / src / osx / cocoa / combobox.mm

diff --git a/src/osx/cocoa/combobox.mm b/src/osx/cocoa/combobox.mm
index d98f0a331e526f52a279d3c0b81d0e8f47da66d4..3ae05278d7f86cab45809dc49266882988cdc2a5 100644 (file)
--- a/src/osx/cocoa/combobox.mm
+++ b/src/osx/cocoa/combobox.mm
@@ -24,6 +24,17 @@
 
 // work in progress
 
+@interface wxNSTableDataSource : NSObject wxOSX_10_6_AND_LATER(<NSComboBoxDataSource>)
+{
+    wxNSComboBoxControl* impl;
+}
+
+- (NSInteger)numberOfItemsInComboBox:(NSComboBox *)aComboBox;
+- (id)comboBox:(NSComboBox *)aComboBox objectValueForItemAtIndex:(NSInteger)index;
+
+@end
+
+
 @interface wxNSComboBox : NSComboBox
 {
 }
@@ -144,9 +155,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;
 }