X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fdc8ef94855ad7d32f9c654f0ef8ea1e16fa4392..cf6ae2907c365869b10b61cbe3bde2768facd4d8:/include/wx/mac/combobox.h

diff --git a/include/wx/mac/combobox.h b/include/wx/mac/combobox.h
index b787187d3b..a70341e7f6 100644
--- a/include/wx/mac/combobox.h
+++ b/include/wx/mac/combobox.h
@@ -1,26 +1,26 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        combobox.h
 // Purpose:     wxComboBox class
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COMBOBOX_H_
 #define _WX_COMBOBOX_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "combobox.h"
 #endif
 
 #include "wx/textctrl.h"
 #include "wx/choice.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxComboBoxNameStr;
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
+WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 
 // Combobox item
 class WXDLLEXPORT wxComboBox: public wxChoice
@@ -37,6 +37,7 @@ class WXDLLEXPORT wxComboBox: public wxChoice
     // forward these functions to all subcontrols
     virtual bool Enable(bool enable = TRUE);
     virtual bool Show(bool show = TRUE);
+    virtual void SetFocus();
 
     // callback functions
     virtual void DelegateTextChanged( const wxString& value );
@@ -90,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