Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve specific listctrl wxQT, thanks @seandpagnier

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mariano Reingart
2014-09-29 04:21:26 +00:00
parent 47547703f7
commit 3b12797953
3 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/qt/listctrl.h
View File

@@ -182,12 +182,6 @@ public:
void SetImageList(wxImageList *imageList, int which); void SetImageList(wxImageList *imageList, int which);
void AssignImageList(wxImageList *imageList, int which); void AssignImageList(wxImageList *imageList, int which);
// are we in report mode?
bool InReportView() const;
// are we in virtual report mode?
bool IsVirtual() const;
// refresh items selectively (only useful for virtual list controls) // refresh items selectively (only useful for virtual list controls)
void RefreshItem(long item); void RefreshItem(long item);
void RefreshItems(long itemFrom, long itemTo); void RefreshItems(long itemFrom, long itemTo);

4
src/generic/listbkg.cpp
View File

@@ -142,6 +142,10 @@ long wxListbook::GetListCtrlFlags() const
{ {
flags |= wxLC_LIST; flags |= wxLC_LIST;
} }
#ifdef __WXQT__
flags |= wxLC_NO_HEADER;
#endif
} }
// Use single selection in any case. // Use single selection in any case.

17
src/qt/listctrl.cpp
View File

@@ -129,6 +129,11 @@ bool wxListCtrl::Create(wxWindow *parent,
{ {
m_qtTreeWidget = new wxQtTreeWidget( parent, this ); m_qtTreeWidget = new wxQtTreeWidget( parent, this );
if (style & wxLC_NO_HEADER)
m_qtTreeWidget->setHeaderHidden(true);
m_qtTreeWidget->setRootIsDecorated(false);
return QtCreateControl( parent, id, pos, size, style, validator, name ); return QtCreateControl( parent, id, pos, size, style, validator, name );
} }
@@ -311,7 +316,7 @@ bool wxListCtrl::SetItem(wxListItem& info)
{ {
if (info.m_image >= 0) if (info.m_image >= 0)
{ {
wxImageList *imglst = GetImageList(wxIMAGE_LIST_SMALL); wxImageList *imglst = GetImageList(wxIMAGE_LIST_NORMAL);
wxCHECK_MSG(imglst, false, "invalid listctrl imagelist"); wxCHECK_MSG(imglst, false, "invalid listctrl imagelist");
const wxBitmap* bitmap = imglst->GetBitmapPtr(info.m_image); const wxBitmap* bitmap = imglst->GetBitmapPtr(info.m_image);
if (bitmap != NULL) if (bitmap != NULL)
@@ -649,16 +654,6 @@ void wxListCtrl::AssignImageList(wxImageList *imageList, int which)
m_ownsImageListState = true; m_ownsImageListState = true;
} }
bool wxListCtrl::InReportView() const
{
return true;
}
bool wxListCtrl::IsVirtual() const
{
return false;
}
void wxListCtrl::RefreshItem(long WXUNUSED(item)) void wxListCtrl::RefreshItem(long WXUNUSED(item))
{ {
} }