X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5273bf2fd3292ec3ab3da4f0c197b2f0e93df32e..f114b8580b980c54e7b6194fe6494a86cb833907:/include/wx/mac/listbox.h?ds=sidebyside diff --git a/include/wx/mac/listbox.h b/include/wx/mac/listbox.h index 0d1f1f7ad5..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 @@ -92,7 +92,7 @@ public: virtual void* DoGetItemClientData(int n) const; virtual void DoSetItemClientObject(int n, wxClientData* clientData); virtual wxClientData* DoGetItemClientObject(int n) const; - virtual void DoSetSize(int x, int y,int width, int height,int sizeFlags = wxSIZE_AUTO ) ; + virtual void DoSetSize(int x, int y,int width, int height,int sizeFlags = wxSIZE_AUTO ) ; // wxCheckListBox support #if wxUSE_OWNER_DRAWN @@ -108,38 +108,43 @@ public: // Windows callbacks - virtual void SetupColours(); - virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ; + 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 ; - wxListDataArray m_dataArray ; - wxArrayInt m_selectionPreImage ; - void MacSetRedraw( bool doDraw ) ; + void* m_macList ; + wxArrayString m_stringArray ; + wxListDataArray m_dataArray ; + wxArrayInt m_selectionPreImage ; + void MacSetRedraw( bool doDraw ) ; protected: - void MacDestroy() ; - void MacDelete( int n ) ; - void MacInsert( int n , const char * text) ; - void MacAppend( const char * text) ; - void MacSet( int n , const char *text ) ; - void MacClear() ; - void MacSetSelection( int n , bool select ) ; - int MacGetSelection() const ; - int MacGetSelections(wxArrayInt& aSelections) const ; - bool MacIsSelected( int n ) const ; - void MacScrollTo( int n ) ; - void OnSize( const wxSizeEvent &size ) ; - void MacDoClick() ; - void MacDoDoubleClick() ; + void MacDestroy() ; + void MacDelete( int n ) ; + void MacInsert( int n , const char * text) ; + void MacAppend( const char * text) ; + void MacSet( int n , const char *text ) ; + void MacClear() ; + void MacSetSelection( int n , bool select ) ; + int MacGetSelection() const ; + int MacGetSelections(wxArrayInt& aSelections) const ; + bool MacIsSelected( int n ) const ; + void MacScrollTo( int n ) ; + void OnSize( const wxSizeEvent &size ) ; + void MacDoClick() ; + void MacDoDoubleClick() ; // do we have multiple selections? 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; @@ -150,7 +155,7 @@ protected: private: DECLARE_DYNAMIC_CLASS(wxListBox) - DECLARE_EVENT_TABLE() + DECLARE_EVENT_TABLE() }; #endif