X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..6ba7c06eeeda47b88783025428ca0f290e3bf236:/include/wx/gtk/combobox.h?ds=sidebyside diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h index 8e2b81b6b1..3574f6837f 100644 --- 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();