added wxIsSameDouble() which wraps double comparison in a pragmas disabling icc warni...

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

diff --git a/src/cocoa/combobox.mm b/src/cocoa/combobox.mm
index 0ab39f3f76dd963b57870443b29fdf4f82f36413..46187fbd3494b32a28cd83c31c3712a79f5e8b35 100644 (file)
--- a/src/cocoa/combobox.mm
+++ b/src/cocoa/combobox.mm
@@ -9,15 +9,15 @@
 // Licence:    wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/wxprec.h"
+// #include "wx/wxprec.h"

 
 //
 // Impl notes:
 
 //
 // Impl notes:

-// There is no custom data source because doing so unneccesaraly sacrifices
+// There is no custom data source because doing so unnecessarily sacrifices

 // some native autocompletion behavior (we would have to make our own - 
 // the SimpleComboBox sample does so in the developer folder that
 // comes with OSX).  One reason you might want this would be to have
 // some native autocompletion behavior (we would have to make our own - 
 // the SimpleComboBox sample does so in the developer folder that
 // comes with OSX).  One reason you might want this would be to have

-// only one array or be able to display numbers by returned an NSNumber
+// only one array or be able to display numbers returned by an NSNumber

 // from the methods.
 //
 // One problem though is that wxCB_SORT isn't implemented...
 // from the methods.
 //
 // One problem though is that wxCB_SORT isn't implemented...


@@ -67,7 +67,6 @@
     return (candidate ? candidate : inputString);
 }
 */
     return (candidate ? candidate : inputString);
 }
 */

-#if wxUSE_COMBOBOX

 
 /////////////////////////////////////////////////////////////////////////////
 // Name:        cocoa/NSComboBox.mm
 
 /////////////////////////////////////////////////////////////////////////////
 // Name:        cocoa/NSComboBox.mm


@@ -89,6 +88,8 @@
 // ----------------------------------------------------------------------------
 
 #include "wx/wxprec.h"
 // ----------------------------------------------------------------------------
 
 #include "wx/wxprec.h"

+#if wxUSE_COMBOBOX
+

 #ifndef WX_PRECOMP
     #include "wx/window.h"
 #endif // WX_PRECOMP
 #ifndef WX_PRECOMP
     #include "wx/window.h"
 #endif // WX_PRECOMP