X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/371a5b4e62eb415107e045588f614fa49e866e78..6a8b0d458663e48152afcf6576a057f5b8ab8be3:/include/wx/generic/listctrl.h?ds=sidebyside diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h index 31c38e9638..0fd9ab4705 100644 --- a/include/wx/generic/listctrl.h +++ b/include/wx/generic/listctrl.h @@ -11,7 +11,7 @@ #ifndef __LISTCTRLH_G__ #define __LISTCTRLH_G__ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "listctrl.h" #endif @@ -37,7 +37,7 @@ class WXDLLEXPORT wxDropTarget; class WXDLLEXPORT wxListItem; class WXDLLEXPORT wxListEvent; -#if !defined(__WXMSW__) || defined(__WIN16__) || defined(__WXUNIVERSAL__) +#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__) class WXDLLEXPORT wxListCtrl; #define wxImageListType wxImageList #else @@ -67,19 +67,19 @@ class WXDLLEXPORT wxGenericListCtrl: public wxControl public: wxGenericListCtrl(); wxGenericListCtrl( wxWindow *parent, - wxWindowID id = -1, + wxWindowID winid = wxID_ANY, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, const wxString &name = wxT("listctrl") ) { - Create(parent, id, pos, size, style, validator, name); + Create(parent, winid, pos, size, style, validator, name); } ~wxGenericListCtrl(); bool Create( wxWindow *parent, - wxWindowID id = -1, + wxWindowID winid = wxID_ANY, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = wxLC_ICON, @@ -91,24 +91,25 @@ public: int GetColumnWidth( int col ) const; bool SetColumnWidth( int col, int width); int GetCountPerPage() const; // not the same in wxGLC as in Windows, I think + wxRect GetViewRect() const; bool GetItem( wxListItem& info ) const; bool SetItem( wxListItem& info ) ; 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 ); - int GetItemSpacing( bool isSmall ) const; + void SetItemSpacing( int spacing, bool isSmall = false ); + wxSize GetItemSpacing() const; void SetItemTextColour( long item, const wxColour& col); wxColour GetItemTextColour( long item ) const; void SetItemBackgroundColour( long item, const wxColour &col); @@ -118,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; @@ -139,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); @@ -148,26 +149,47 @@ public: long InsertItem( long index, int imageIndex ); long InsertItem( long index, const wxString& label, int imageIndex ); long InsertColumn( long col, wxListItem& info ); - long InsertColumn( long col, const wxString& heading, int format = wxLIST_FORMAT_LEFT, - int width = -1 ); + long InsertColumn( long col, const wxString& heading, + int format = wxLIST_FORMAT_LEFT, int width = -1 ); bool ScrollList( int dx, int dy ); bool SortItems( wxListCtrlCompare fn, long data ); bool Update( long item ); - // returns true if it is a virtual list control - bool IsVirtual() const { return (GetWindowStyle() & wxLC_VIRTUAL) != 0; } + // are we in report mode? + bool InReportView() const { return HasFlag(wxLC_REPORT); } + + // are we in virtual report mode? + bool IsVirtual() const { return HasFlag(wxLC_VIRTUAL); } + + // do we have a header window? + bool HasHeader() const + { return InReportView() && !HasFlag(wxLC_NO_HEADER); } // refresh items selectively (only useful for virtual list controls) void RefreshItem(long item); void RefreshItems(long itemFrom, long itemTo); + // obsolete, don't use + 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 // ------------------------------- - void OnIdle( wxIdleEvent &event ); + void OnInternalIdle( ); void OnSize( wxSizeEvent &event ); // We have to hand down a few functions + virtual void Refresh(bool eraseBackground = true, + const wxRect *rect = NULL); virtual void Freeze(); virtual void Thaw(); @@ -186,8 +208,11 @@ public: virtual bool DoPopupMenu( wxMenu *menu, int x, int y ); + virtual bool ShouldInheritColours() const { return false; } virtual void SetFocus(); + virtual wxSize DoGetBestSize() const; + // implementation // -------------- @@ -199,6 +224,7 @@ public: m_ownsImageListState; wxListHeaderWindow *m_headerWin; wxListMainWindow *m_mainWin; + wxCoord m_headerHeight; protected: // return the text for the given column of the given item @@ -220,6 +246,9 @@ private: // create the header window void CreateHeaderWindow(); + // calculate and set height of the header + void CalculateAndSetHeaderHeight(); + // reposition the header and the main window in the report view depending // on whether it should be shown or not void ResizeReportView(bool showHeader); @@ -228,7 +257,7 @@ private: DECLARE_DYNAMIC_CLASS(wxGenericListCtrl); }; -#if !defined(__WXMSW__) || defined(__WIN16__) || defined(__WXUNIVERSAL__) +#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__) /* * wxListCtrl has to be a real class or we have problems with * the run-time information. @@ -241,16 +270,16 @@ class WXDLLEXPORT wxListCtrl: public wxGenericListCtrl public: wxListCtrl() {} - wxListCtrl(wxWindow *parent, wxWindowID id = -1, + wxListCtrl(wxWindow *parent, wxWindowID winid = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxLC_ICON, const wxValidator &validator = wxDefaultValidator, const wxString &name = wxT("listctrl") ) - : wxGenericListCtrl(parent, id, pos, size, style, validator, name) + : wxGenericListCtrl(parent, winid, pos, size, style, validator, name) { } }; -#endif // !__WXMSW__ || __WIN16__ || __WXUNIVERSAL__ +#endif // !__WXMSW__ || __WXUNIVERSAL__ #endif // __LISTCTRLH_G__