avoid warning for duplicate defined wxEntry when compiling with the Apple

[wxWidgets.git] / include / wx / mac / combobox.h

diff --git a/include/wx/mac/combobox.h b/include/wx/mac/combobox.h
index eec2b6360a56e6d11268972ccf66a779bd3b22e8..4b10550e60f9de485e6962de3c56427c0a118c31 100644 (file)
--- a/include/wx/mac/combobox.h
+++ b/include/wx/mac/combobox.h
@@ -12,7 +12,7 @@
 #ifndef _WX_COMBOBOX_H_
 #define _WX_COMBOBOX_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "combobox.h"
 #endif
 
@@ -91,6 +91,7 @@ class WXDLLEXPORT wxComboBox: public wxChoice
   virtual void Remove(long from, long to);
   virtual void SetSelection(long from, long to);
   virtual void SetEditable(bool editable);
+  virtual int GetCount() const { return m_choice->GetCount() ; }
   void MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
 protected:
     // the subcontrols