Workaround to broken WinCE directory scanning for all includes (#ifdefed for other...

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

diff --git a/src/cocoa/combobox.mm b/src/cocoa/combobox.mm
index 9be77501acda5c54c921d86df919f19e0dc93162..406bce80e443fb7d8ad97af280c39699782e6ab6 100644 (file)
--- a/src/cocoa/combobox.mm
+++ b/src/cocoa/combobox.mm
@@ -80,6 +80,8 @@
 
 #ifndef WX_PRECOMP
     #include "wx/window.h"
+    #include "wx/log.h"
+    #include "wx/app.h"
 #endif // WX_PRECOMP
 
 #include "wx/cocoa/ObjcPose.h"
@@ -158,9 +160,7 @@ void wxCocoaNSComboBox::DisassociateNSComboBox(WX_NSComboBox cocoaNSComboBox)
 
 @end // implementation wxPoserNSComboBox
 
-#include "wx/app.h"
 #include "wx/combobox.h"
-#include "wx/log.h"
 
 #include "wx/cocoa/autorelease.h"
 #include "wx/cocoa/string.h"
@@ -255,23 +255,23 @@ void wxComboBox::Clear()
     m_Datas.Clear();
 }
 
-void wxComboBox::Delete(int nIndex)
+void wxComboBox::Delete(unsigned int n)
 {
-    [GetNSComboBox() removeItemAtIndex:nIndex];
-    m_Datas.RemoveAt(nIndex);
+    [GetNSComboBox() removeItemAtIndex:n];
+    m_Datas.RemoveAt(n);
 }
 
-size_t wxComboBox::GetCount() const
+unsigned int wxComboBox::GetCount() const
 {
-    return (size_t)[GetNSComboBox() numberOfItems];
+    return (unsigned int)[GetNSComboBox() numberOfItems];
 }
 
-wxString wxComboBox::GetString(int nIndex) const
+wxString wxComboBox::GetString(unsigned int nIndex) const
 {
     return wxStringWithNSString([GetNSComboBox() itemObjectValueAtIndex:nIndex]);
 }
 
-void wxComboBox::SetString(int nIndex, const wxString& szString)
+void wxComboBox::SetString(unsigned int nIndex, const wxString& szString)
 {
     wxAutoNSAutoreleasePool pool;
     //FIXME:  There appears to be no "set item data" method - maybe
@@ -299,30 +299,30 @@ int wxComboBox::DoAppend(const wxString& szItem)
     return [GetNSComboBox() numberOfItems];
 }
 
-int wxComboBox::DoInsert(const wxString& szItem, int nIndex)
+int wxComboBox::DoInsert(const wxString& szItem, unsigned int nIndex)
 {
     m_Datas.Insert(NULL, nIndex);
     wxAutoNSAutoreleasePool pool;
     [GetNSComboBox() insertItemWithObjectValue:wxNSStringWithWxString(szItem) atIndex:nIndex];
-    return nIndex;
+    return (int)nIndex;
 }
 
-void wxComboBox::DoSetItemClientData(int nIndex, void* pData)
+void wxComboBox::DoSetItemClientData(unsigned int nIndex, void* pData)
 {
     m_Datas[nIndex] = pData;
 }
 
-void* wxComboBox::DoGetItemClientData(int nIndex) const
+void* wxComboBox::DoGetItemClientData(unsigned int nIndex) const
 {
     return m_Datas[nIndex];
 }
 
-void wxComboBox::DoSetItemClientObject(int nIndex, wxClientData* pClientData)
+void wxComboBox::DoSetItemClientObject(unsigned int nIndex, wxClientData* pClientData)
 {
     m_Datas[nIndex] = (void*) pClientData;
 }
 
-wxClientData* wxComboBox::DoGetItemClientObject(int nIndex) const
+wxClientData* wxComboBox::DoGetItemClientObject(unsigned int nIndex) const
 {
     return (wxClientData*) m_Datas[nIndex];
 }