X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f68586e51b20dccee3fd5645aeaca7cc8ff298c2..e2b87f38d9092b56591728558f2cc13cac6a58af:/include/wx/gtk1/combobox.h

diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h
index f48a786405..6fc045a704 100644
--- a/include/wx/gtk1/combobox.h
+++ b/include/wx/gtk1/combobox.h
@@ -12,7 +12,7 @@
 #ifndef __GTKCOMBOBOXH__
 #define __GTKCOMBOBOXH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "combobox.h"
 #endif
 
@@ -33,7 +33,7 @@ class wxComboBox;
 // global data
 //-----------------------------------------------------------------------------
 
-extern const char* wxComboBoxNameStr;
+extern const wxChar* wxComboBoxNameStr;
 extern const wxChar* wxEmptyString;
 
 //-----------------------------------------------------------------------------
@@ -86,6 +86,7 @@ public:
     int GetSelection() const;
     wxString GetString( int n ) const;
     wxString GetStringSelection() const;
+    int GetCount() const { return Number(); }
     int Number() const;
     void SetSelection( int n );
     void SetStringSelection( const wxString &string );
@@ -107,12 +108,15 @@ public:
   
     // implementation
     
+    virtual void SetFocus();
+    
     void OnSize( wxSizeEvent &event );
     void OnChar( wxKeyEvent &event );
   
     bool     m_alreadySent;
     wxList   m_clientDataList;
     wxList   m_clientObjectList;
+    int      m_prevSelection;
 
     void DisableEvents();
     void EnableEvents();