AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

disable report view mode under Mac as it hangs the native wxListCtrl implementation (continuation of #9484)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2008-06-21 16:10:52 +00:00
parent 8ca1b2c502
commit 1a9a6eed36
2 changed files with 44 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/listbook.h
View File

@ -97,6 +97,10 @@ protected:
wxBookCtrlBaseEvent* CreatePageChangingEvent() const;
void MakeChangedEvent(wxBookCtrlBaseEvent &event);
// get flags for different list control modes
long GetListCtrlIconViewFlags() const;
long GetListCtrlReportViewFlags() const;
// event handlers
void OnListSelected(wxListEvent& event);
void OnSize(wxSizeEvent& event);

47
src/generic/listbkg.cpp
View File

@ -36,6 +36,12 @@
#include "wx/statline.h"
#include "wx/imaglist.h"
// FIXME: native OS X wxListCtrl hangs if this code is used for it so disable
// it for now
#if !defined(__WXMAC__)
#define CAN_USE_REPORT_VIEW
#endif
// ----------------------------------------------------------------------------
// various wxWidgets macros
// ----------------------------------------------------------------------------
@ -103,10 +109,17 @@ wxListbook::Create(wxWindow *parent,
wxID_ANY,
wxDefaultPosition,
wxDefaultSize,
wxLC_SINGLE_SEL | wxLC_REPORT | wxLC_NO_HEADER
wxLC_SINGLE_SEL |
#ifdef CAN_USE_REPORT_VIEW
GetListCtrlReportViewFlags()
#else // !CAN_USE_REPORT_VIEW
GetListCtrlIconViewFlags()
#endif // CAN_USE_REPORT_VIEW/!CAN_USE_REPORT_VIEW
);
#ifdef CAN_USE_REPORT_VIEW
GetListView()->InsertColumn(0, wxT("Pages"));
#endif // CAN_USE_REPORT_VIEW
#ifdef __WXMSW__
// On XP with themes enabled the GetViewRect used in GetControllerSize() to
@ -121,6 +134,24 @@ wxListbook::Create(wxWindow *parent,
return true;
}
// ----------------------------------------------------------------------------
// wxListCtrl flags
// ----------------------------------------------------------------------------
long wxListbook::GetListCtrlIconViewFlags() const
{
return (IsVertical() ? wxLC_ALIGN_LEFT : wxLC_ALIGN_TOP) | wxLC_ICON;
}
#ifdef CAN_USE_REPORT_VIEW
long wxListbook::GetListCtrlReportViewFlags() const
{
return wxLC_REPORT | wxLC_NO_HEADER;
}
#endif // CAN_USE_REPORT_VIEW
// ----------------------------------------------------------------------------
// wxListbook geometry management
// ----------------------------------------------------------------------------
@ -261,6 +292,7 @@ void wxListbook::SetImageList(wxImageList *imageList)
{
wxListView * const list = GetListView();
#ifdef CAN_USE_REPORT_VIEW
// If imageList presence has changed, we update the list control view
if ( (imageList != NULL) != (GetImageList() != NULL) )
{
@ -285,17 +317,17 @@ void wxListbook::SetImageList(wxImageList *imageList)
long style = wxLC_SINGLE_SEL;
if ( imageList )
{
list->SetWindowStyleFlag(style |
(IsVertical() ? wxLC_ALIGN_LEFT
: wxLC_ALIGN_TOP) |
wxLC_ICON);
style |= GetListCtrlIconViewFlags();
}
else // no image list
{
list->SetWindowStyleFlag(style | wxLC_REPORT | wxLC_NO_HEADER);
list->InsertColumn(0, wxT("Pages"));
style |= GetListCtrlReportViewFlags();
}
list->SetWindowStyleFlag(style);
if ( !imageList )
list->InsertColumn(0, wxT("Pages"));
// Add back the list control items
for ( i = 0; i < GetPageCount(); i++ )
{
@ -308,6 +340,7 @@ void wxListbook::SetImageList(wxImageList *imageList)
}
list->SetImageList(imageList, wxIMAGE_LIST_NORMAL);
#endif // CAN_USE_REPORT_VIEW
wxBookCtrlBase::SetImageList(imageList);
}