X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/159b66c02a8f1c724d1af3c768ad5d90f4c8a0e2..69c4481222795d89f470020b63ec788bb717c0b3:/include/wx/gtk1/combobox.h?ds=inline diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h index e7be38f91b..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; //----------------------------------------------------------------------------- @@ -108,6 +108,8 @@ public: // implementation + virtual void SetFocus(); + void OnSize( wxSizeEvent &event ); void OnChar( wxKeyEvent &event );