declare wxEntry() as taking char **Argv, not char *argv[]

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

diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index 8e2b81b6b1ddfa763a4bddaa916b9adf6f0dbde8..3574f6837f6a986345c93aeb7409db423001a3d7 100644 (file)
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/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;
 
 //-----------------------------------------------------------------------------
@@ -114,6 +114,7 @@ public:
     bool     m_alreadySent;
     wxList   m_clientDataList;
     wxList   m_clientObjectList;
+    int      m_prevSelection;
 
     void DisableEvents();
     void EnableEvents();