X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3a5bcc4db0851bf8cd3063917511b0b17c7f9679..6a8b0d458663e48152afcf6576a057f5b8ab8be3:/include/wx/generic/listctrl.h diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h index 47ba79defe..0fd9ab4705 100644 --- a/include/wx/generic/listctrl.h +++ b/include/wx/generic/listctrl.h @@ -67,7 +67,7 @@ class WXDLLEXPORT wxGenericListCtrl: public wxControl public: wxGenericListCtrl(); wxGenericListCtrl( wxWindow *parent, - wxWindowID winid = -1, + wxWindowID winid = wxID_ANY, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = wxLC_ICON, @@ -79,7 +79,7 @@ public: ~wxGenericListCtrl(); bool Create( wxWindow *parent, - wxWindowID winid = -1, + wxWindowID winid = wxID_ANY, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = wxLC_ICON, @@ -98,17 +98,17 @@ public: long SetItem( long index, int col, const wxString& label, int imageId = -1 ); int GetItemState( long item, long stateMask ) const; bool SetItemState( long item, long state, long stateMask); - bool SetItemImage( long item, int image, int selImage); + bool SetItemImage( long item, int image, int selImage = -1 ); wxString GetItemText( long item ) const; void SetItemText( long item, const wxString& str ); - long GetItemData( long item ) const; + wxUIntPtr GetItemData( long item ) const; bool SetItemData( long item, long data ); bool GetItemRect( long item, wxRect& rect, int code = wxLIST_RECT_BOUNDS ) const; bool GetItemPosition( long item, wxPoint& pos ) const; bool SetItemPosition( long item, const wxPoint& pos ); // not supported in wxGLC int GetItemCount() const; int GetColumnCount() const; - void SetItemSpacing( int spacing, bool isSmall = FALSE ); + void SetItemSpacing( int spacing, bool isSmall = false ); wxSize GetItemSpacing() const; void SetItemTextColour( long item, const wxColour& col); wxColour GetItemTextColour( long item ) const; @@ -119,7 +119,7 @@ public: void SetTextColour(const wxColour& col); long GetTopItem() const; - void SetSingleStyle( long style, bool add = TRUE ) ; + void SetSingleStyle( long style, bool add = true ) ; void SetWindowStyleFlag( long style ); void RecreateWindow() {} long GetNextItem( long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE ) const; @@ -140,8 +140,8 @@ public: void Edit( long item ); bool EnsureVisible( long item ); - long FindItem( long start, const wxString& str, bool partial = FALSE ); - long FindItem( long start, long data ); + long FindItem( long start, const wxString& str, bool partial = false ); + long FindItem( long start, wxUIntPtr data ); long FindItem( long start, const wxPoint& pt, int direction ); // not supported in wxGLC long HitTest( const wxPoint& point, int& flags); long InsertItem(wxListItem& info); @@ -173,6 +173,14 @@ public: wxDEPRECATED( int GetItemSpacing( bool isSmall ) const ); + virtual wxVisualAttributes GetDefaultAttributes() const + { + return GetClassDefaultAttributes(GetWindowVariant()); + } + + static wxVisualAttributes + GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); + // implementation only from now on // ------------------------------- @@ -180,7 +188,7 @@ public: void OnSize( wxSizeEvent &event ); // We have to hand down a few functions - virtual void Refresh(bool eraseBackground = TRUE, + virtual void Refresh(bool eraseBackground = true, const wxRect *rect = NULL); virtual void Freeze(); @@ -203,6 +211,8 @@ public: virtual bool ShouldInheritColours() const { return false; } virtual void SetFocus(); + virtual wxSize DoGetBestSize() const; + // implementation // -------------- @@ -260,7 +270,7 @@ class WXDLLEXPORT wxListCtrl: public wxGenericListCtrl public: wxListCtrl() {} - wxListCtrl(wxWindow *parent, wxWindowID winid = -1, + wxListCtrl(wxWindow *parent, wxWindowID winid = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxLC_ICON,