X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af49c4b8a2d3553e733e71c7dd3911881f4c1a2a..2ba721aa6ca44ee826dfb5c9e16599aaf9e74908:/include/wx/mac/listbox.h diff --git a/include/wx/mac/listbox.h b/include/wx/mac/listbox.h index 8158bf6731..9e0bd5af33 100644 --- a/include/wx/mac/listbox.h +++ b/include/wx/mac/listbox.h @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// // Name: listbox.h // Purpose: wxListBox class -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: -// Created: ??/??/98 +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -20,6 +20,8 @@ // ---------------------------------------------------------------------------- // simple types // ---------------------------------------------------------------------------- +#include "wx/dynarray.h" + #if wxUSE_OWNER_DRAWN class WXDLLEXPORT wxOwnerDrawn; @@ -92,7 +94,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 @@ -109,8 +111,8 @@ public: // Windows callbacks virtual void SetupColours(); - virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ; - virtual bool MacCanFocus() const { return true ; } + virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ; + virtual bool MacCanFocus() const { return true ; } void OnChar(wxKeyEvent& event); void* m_macList ; @@ -121,9 +123,9 @@ public: 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 MacInsert( int n , const wxString& item) ; + void MacAppend( const wxString& item) ; + void MacSet( int n , const wxString& item ) ; void MacClear() ; void MacSetSelection( int n , bool select ) ; int MacGetSelection() const ; @@ -143,8 +145,8 @@ protected: int m_noItems; int m_selected; - wxString m_typeIn ; - long m_lastTypeIn ; + wxString m_typeIn ; + long m_lastTypeIn ; virtual wxSize DoGetBestSize() const;