X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d84afea9d1ec41ee4e2ebb3bf6b87926cf5f04d1..db16e5c3aae30ee4502d3e0d41eed500af365fe9:/include/wx/mac/listbox.h diff --git a/include/wx/mac/listbox.h b/include/wx/mac/listbox.h index 126567e96c..8158bf6731 100644 --- a/include/wx/mac/listbox.h +++ b/include/wx/mac/listbox.h @@ -13,7 +13,7 @@ #ifndef _WX_LISTBOX_H_ #define _WX_LISTBOX_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "listbox.h" #endif @@ -110,6 +110,8 @@ public: virtual void SetupColours(); virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ; + virtual bool MacCanFocus() const { return true ; } + void OnChar(wxKeyEvent& event); void* m_macList ; wxArrayString m_stringArray ; @@ -136,10 +138,13 @@ protected: bool HasMultipleSelection() const; // free memory (common part of Clear() and dtor) - void Free(); + // prevent collision with some BSD definitions of macro Free() + void FreeData(); int m_noItems; int m_selected; + wxString m_typeIn ; + long m_lastTypeIn ; virtual wxSize DoGetBestSize() const;