X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/70ad0e06f0e5aec6f1f5f158977cf8420723f3ed..3abc7566452fa210285254a2ea04c15fd5653afe:/include/wx/generic/listctrl.h?ds=sidebyside diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h index e8ca93d6db..7d4b995b15 100644 --- a/include/wx/generic/listctrl.h +++ b/include/wx/generic/listctrl.h @@ -8,64 +8,37 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __LISTCTRLH_G__ -#define __LISTCTRLH_G__ - -#include "wx/defs.h" -#include "wx/object.h" -#ifdef __WXMAC__ -#include "wx/imaglist.h" -#else -#include "wx/generic/imaglist.h" -#endif +#ifndef _WX_GENERIC_LISTCTRL_H_ +#define _WX_GENERIC_LISTCTRL_H_ -#include "wx/control.h" -#include "wx/timer.h" -#include "wx/dcclient.h" -#include "wx/scrolwin.h" -#include "wx/settings.h" -#include "wx/listbase.h" #include "wx/textctrl.h" +class WXDLLIMPEXP_FWD_CORE wxImageList; + #if wxUSE_DRAG_AND_DROP -class WXDLLEXPORT wxDropTarget; +class WXDLLIMPEXP_FWD_CORE wxDropTarget; #endif -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLEXPORT wxListItem; -class WXDLLEXPORT wxListEvent; +// ---------------------------------------------------------------------------- +// constants +// ---------------------------------------------------------------------------- -#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__) -class WXDLLEXPORT wxListCtrl; -#define wxImageListType wxImageList -#else -#define wxImageListType wxGenericImageList -#endif //----------------------------------------------------------------------------- // internal classes //----------------------------------------------------------------------------- -class WXDLLEXPORT wxListHeaderData; -class WXDLLEXPORT wxListItemData; -class WXDLLEXPORT wxListLineData; - -class WXDLLEXPORT wxListHeaderWindow; -class WXDLLEXPORT wxListMainWindow; - -class WXDLLEXPORT wxListRenameTimer; -class WXDLLEXPORT wxListTextCtrl; +class WXDLLIMPEXP_FWD_CORE wxListHeaderWindow; +class WXDLLIMPEXP_FWD_CORE wxListMainWindow; //----------------------------------------------------------------------------- // wxListCtrl //----------------------------------------------------------------------------- -class WXDLLEXPORT wxGenericListCtrl: public wxControl +class WXDLLIMPEXP_CORE wxGenericListCtrl: public wxControl { public: + wxGenericListCtrl(); wxGenericListCtrl( wxWindow *parent, wxWindowID winid = wxID_ANY, @@ -77,7 +50,7 @@ public: { Create(parent, winid, pos, size, style, validator, name); } - ~wxGenericListCtrl(); + virtual ~wxGenericListCtrl(); bool Create( wxWindow *parent, wxWindowID winid = wxID_ANY, @@ -100,10 +73,12 @@ public: int GetItemState( long item, long stateMask ) const; bool SetItemState( long item, long state, long stateMask); bool SetItemImage( long item, int image, int selImage = -1 ); + bool SetItemColumnImage( long item, long column, int image ); wxString GetItemText( long item ) const; void SetItemText( long item, const wxString& str ); wxUIntPtr GetItemData( long item ) const; - bool SetItemData( long item, long data ); + bool SetItemPtrData(long item, wxUIntPtr data); + bool SetItemData(long item, long data) { return SetItemPtrData(item, 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 @@ -126,9 +101,9 @@ public: void SetWindowStyleFlag( long style ); void RecreateWindow() {} long GetNextItem( long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE ) const; - wxImageListType *GetImageList( int which ) const; - void SetImageList( wxImageListType *imageList, int which ); - void AssignImageList( wxImageListType *imageList, int which ); + wxImageList *GetImageList( int which ) const; + void SetImageList( wxImageList *imageList, int which ); + void AssignImageList( wxImageList *imageList, int which ); bool Arrange( int flag = wxLIST_ALIGN_DEFAULT ); // always wxLIST_ALIGN_LEFT in wxGLC void ClearAll(); @@ -148,7 +123,7 @@ public: 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 HitTest( const wxPoint& point, int& flags, long *pSubItem = NULL ) const; long InsertItem(wxListItem& info); long InsertItem( long index, const wxString& label ); long InsertItem( long index, int imageIndex ); @@ -176,9 +151,10 @@ public: void RefreshItem(long item); void RefreshItems(long itemFrom, long itemTo); +#if WXWIN_COMPATIBILITY_2_6 // obsolete, don't use wxDEPRECATED( int GetItemSpacing( bool isSmall ) const ); - +#endif // WXWIN_COMPATIBILITY_2_6 virtual wxVisualAttributes GetDefaultAttributes() const { @@ -198,9 +174,6 @@ public: virtual void Refresh(bool eraseBackground = true, const wxRect *rect = NULL); - virtual void Freeze(); - virtual void Thaw(); - virtual bool SetBackgroundColour( const wxColour &colour ); virtual bool SetForegroundColour( const wxColour &colour ); virtual wxColour GetBackgroundColour() const; @@ -208,6 +181,9 @@ public: virtual bool SetFont( const wxFont &font ); virtual bool SetCursor( const wxCursor &cursor ); + virtual int GetScrollPos(int orient) const; + virtual void SetScrollPos(int orient, int pos, bool refresh = true); + #if wxUSE_DRAG_AND_DROP virtual void SetDropTarget( wxDropTarget *dropTarget ); virtual wxDropTarget *GetDropTarget() const; @@ -219,9 +195,9 @@ public: // implementation // -------------- - wxImageListType *m_imageListNormal; - wxImageListType *m_imageListSmall; - wxImageListType *m_imageListState; // what's that ? + wxImageList *m_imageListNormal; + wxImageList *m_imageListSmall; + wxImageList *m_imageListState; // what's that ? bool m_ownsImageListNormal, m_ownsImageListSmall, m_ownsImageListState; @@ -243,7 +219,7 @@ protected: virtual wxString OnGetItemText(long item, long column) const; // return the icon for the given item. In report view, OnGetItemImage will - // only be called for the first column. See OnGetItemColumnImage for + // only be called for the first column. See OnGetItemColumnImage for // details. virtual int OnGetItemImage(long item) const; @@ -254,7 +230,7 @@ protected: virtual wxListItemAttr *OnGetItemAttr(long item) const; // it calls our OnGetXXX() functions - friend class WXDLLEXPORT wxListMainWindow; + friend class WXDLLIMPEXP_FWD_CORE wxListMainWindow; private: // create the header window @@ -271,13 +247,13 @@ private: DECLARE_DYNAMIC_CLASS(wxGenericListCtrl) }; -#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__) +#if (!defined(__WXMSW__) || defined(__WXUNIVERSAL__)) && (!defined(__WXMAC__) || defined(__WXUNIVERSAL__)) /* * wxListCtrl has to be a real class or we have problems with * the run-time information. */ -class WXDLLEXPORT wxListCtrl: public wxGenericListCtrl +class WXDLLIMPEXP_CORE wxListCtrl: public wxGenericListCtrl { DECLARE_DYNAMIC_CLASS(wxListCtrl) @@ -293,7 +269,8 @@ public: : wxGenericListCtrl(parent, winid, pos, size, style, validator, name) { } + }; #endif // !__WXMSW__ || __WXUNIVERSAL__ -#endif // __LISTCTRLH_G__ +#endif // _WX_GENERIC_LISTCTRL_H_