#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
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxListbook, wxBookCtrlBase)
-IMPLEMENT_DYNAMIC_CLASS(wxListbookEvent, wxNotifyEvent)
-const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING = wxNewEventType();
-const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED = wxNewEventType();
+wxDEFINE_EVENT( wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, wxBookCtrlEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED, wxBookCtrlEvent );
BEGIN_EVENT_TABLE(wxListbook, wxBookCtrlBase)
EVT_SIZE(wxListbook::OnSize)
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
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
// ----------------------------------------------------------------------------
// under MSW, we'd finish with an ugly looking list control with both
// vertical and horizontal scrollbar (with one of them being added because
// the other one is not accounted for in client size computations)
- wxListView *list = GetListView();
- if (list) list->Arrange();
- wxBookCtrlBase::OnSize(event);
+ wxListView * const list = GetListView();
+ if ( list )
+ list->Arrange();
+
+ event.Skip();
}
int wxListbook::HitTest(const wxPoint& pt, long *flags) const
return size;
}
+void wxListbook::UpdateSize()
+{
+ // we should find a more elegant way to force a layout than generating this
+ // dummy event
+ wxSizeEvent sz(GetSize(), GetId());
+ GetEventHandler()->ProcessEvent(sz);
+}
// ----------------------------------------------------------------------------
// accessing the pages
void wxListbook::SetImageList(wxImageList *imageList)
{
+#ifdef CAN_USE_REPORT_VIEW
wxListView * const list = GetListView();
// If imageList presence has changed, we update the list control view
if ( (imageList != NULL) != (GetImageList() != NULL) )
{
- wxArrayString labels;
- labels.Alloc(GetPageCount());
-
- wxArrayInt imageIds;
- imageIds.Alloc(GetPageCount());
-
+ // Preserve the selection which is lost when changing the mode
const int oldSel = GetSelection();
- size_t i;
-
- // Grab snapshot of all list control items before changing the window
- // style (which deletes the items)
- for ( i = 0; i < GetPageCount(); i++ )
- {
- labels.Add(GetPageText(i));
- imageIds.Add(GetPageImage(i));
- }
// Update the style to use icon view for images, report view otherwise
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();
}
- // Add back the list control items
- for ( i = 0; i < GetPageCount(); i++ )
- {
- list->InsertItem(i, labels[i], imageIds[i]);
- }
+ list->SetWindowStyleFlag(style);
+ if ( !imageList )
+ list->InsertColumn(0, wxT("Pages"));
// Restore selection
if ( oldSel != wxNOT_FOUND )
}
list->SetImageList(imageList, wxIMAGE_LIST_NORMAL);
+#endif // CAN_USE_REPORT_VIEW
wxBookCtrlBase::SetImageList(imageList);
}
return m_selection;
}
-wxBookCtrlBaseEvent* wxListbook::CreatePageChangingEvent() const
+wxBookCtrlEvent* wxListbook::CreatePageChangingEvent() const
{
- return new wxListbookEvent(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, m_windowId);
+ return new wxBookCtrlEvent(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, m_windowId);
}
-void wxListbook::MakeChangedEvent(wxBookCtrlBaseEvent &event)
+void wxListbook::MakeChangedEvent(wxBookCtrlEvent &event)
{
event.SetEventType(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED);
}
if ( selNew != -1 )
SetSelection(selNew);
- wxSizeEvent sz(GetSize(), GetId());
- GetEventHandler()->ProcessEvent(sz);
-
+ UpdateSize();
+
return true;
}
}
GetListView()->Arrange();
- if (GetPageCount() == 0)
- {
- wxSizeEvent sz(GetSize(), GetId());
- GetEventHandler()->ProcessEvent(sz);
- }
+ UpdateSize();
}
return win;
m_selection = -1;
- wxSizeEvent sz(GetSize(), GetId());
- GetEventHandler()->ProcessEvent(sz);
+ UpdateSize();
return true;
}