#include "wx/statline.h"
#include "wx/imaglist.h"
+#include "wx/sysopt.h"
+
+namespace
+{
+
+// FIXME: This function exists because native OS X wxListCtrl seems to have
+// problems with report view, either imperfect display or reported hanging, so
+// disable it for now (but it should be fixed, and this function removed).
+bool CanUseReportView()
+{
+#if defined(__WXMAC__) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON
+ if (wxSystemOptions::GetOptionInt(wxMAC_ALWAYS_USE_GENERIC_LISTCTRL) == 0)
+ return false;
+ else
+#endif
+ return true;
+}
+
+} // anonymous namespace
+
// ----------------------------------------------------------------------------
// various wxWidgets macros
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxListbook, wxBookCtrlBase)
-IMPLEMENT_DYNAMIC_CLASS(wxListbookEvent, wxNotifyEvent)
-#if !WXWIN_COMPATIBILITY_EVENT_TYPES
-const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING = wxNewEventType();
-const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED = wxNewEventType();
-#endif
-const int wxID_LISTBOOKLISTVIEW = wxNewId();
+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)
- EVT_LIST_ITEM_SELECTED(wxID_LISTBOOKLISTVIEW, wxListbook::OnListSelected)
+ EVT_LIST_ITEM_SELECTED(wxID_ANY, wxListbook::OnListSelected)
END_EVENT_TABLE()
// ============================================================================
// wxListbook creation
// ----------------------------------------------------------------------------
-void wxListbook::Init()
-{
- m_selection = wxNOT_FOUND;
-}
-
bool
wxListbook::Create(wxWindow *parent,
wxWindowID id,
m_bookctrl = new wxListView
(
this,
- wxID_LISTBOOKLISTVIEW,
+ wxID_ANY,
wxDefaultPosition,
wxDefaultSize,
- wxLC_ICON | wxLC_SINGLE_SEL |
- (IsVertical() ? wxLC_ALIGN_LEFT : wxLC_ALIGN_TOP)
+ wxLC_SINGLE_SEL |
+ (CanUseReportView() ? GetListCtrlReportViewFlags()
+ : GetListCtrlIconViewFlags())
);
+ if ( CanUseReportView() )
+ GetListView()->InsertColumn(0, wxT("Pages"));
+
#ifdef __WXMSW__
// On XP with themes enabled the GetViewRect used in GetControllerSize() to
// determine the space needed for the list view will incorrectly return
}
// ----------------------------------------------------------------------------
-// wxListbook geometry management
+// wxListCtrl flags
// ----------------------------------------------------------------------------
-wxSize wxListbook::GetControllerSize() const
+long wxListbook::GetListCtrlIconViewFlags() const
{
- const wxSize sizeClient = GetClientSize(),
- sizeBorder = m_bookctrl->GetSize() - m_bookctrl->GetClientSize(),
- sizeList = GetListView()->GetViewRect().GetSize() + sizeBorder;
-
- wxSize size;
-
- if ( IsVertical() )
- {
- size.x = sizeClient.x;
- size.y = sizeList.y;
- }
- else // left/right aligned
- {
- size.x = sizeList.x;
- size.y = sizeClient.y;
- }
+ return (IsVertical() ? wxLC_ALIGN_LEFT : wxLC_ALIGN_TOP) | wxLC_ICON;
+}
- return size;
+long wxListbook::GetListCtrlReportViewFlags() const
+{
+ return wxLC_REPORT | wxLC_NO_HEADER;
}
+// ----------------------------------------------------------------------------
+// wxListbook geometry management
+// ----------------------------------------------------------------------------
+
void wxListbook::OnSize(wxSizeEvent& event)
{
// arrange the icons before calling SetClientSize(), otherwise it wouldn't
// 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
int pagePos = wxNOT_FOUND;
if ( flags )
- *flags = wxNB_HITTEST_NOWHERE;
+ *flags = wxBK_HITTEST_NOWHERE;
// convert from listbook control coordinates to list control coordinates
const wxListView * const list = GetListView();
const wxPoint listPt = list->ScreenToClient(ClientToScreen(pt));
// is the point inside list control?
- if ( wxRect(list->GetSize()).Inside(listPt) )
+ if ( wxRect(list->GetSize()).Contains(listPt) )
{
int flagsList;
pagePos = list->HitTest(listPt, flagsList);
if ( flagsList & (wxLIST_HITTEST_ONITEMICON |
wxLIST_HITTEST_ONITEMSTATEICON ) )
- *flags |= wxNB_HITTEST_ONICON;
+ *flags |= wxBK_HITTEST_ONICON;
if ( flagsList & wxLIST_HITTEST_ONITEMLABEL )
- *flags |= wxNB_HITTEST_ONLABEL;
+ *flags |= wxBK_HITTEST_ONLABEL;
}
}
else // not over list control at all
{
- if ( flags && GetPageRect().Inside(pt) )
- *flags |= wxNB_HITTEST_ONPAGE;
+ if ( flags && GetPageRect().Contains(pt) )
+ *flags |= wxBK_HITTEST_ONPAGE;
}
return pagePos;
}
-wxSize wxListbook::CalcSizeFromPage(const wxSize& sizePage) const
+void wxListbook::UpdateSize()
{
- // we need to add the size of the list control and the border between
- const wxSize sizeList = GetControllerSize();
-
- wxSize size = sizePage;
- if ( IsVertical() )
- {
- size.y += sizeList.y + GetInternalBorder();
- }
- else // left/right aligned
- {
- size.x += sizeList.x + GetInternalBorder();
- }
-
- return size;
+ // 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
// ----------------------------------------------------------------------------
return GetListView()->GetItemText(n);
}
-int wxListbook::GetPageImage(size_t WXUNUSED(n)) const
+int wxListbook::GetPageImage(size_t n) const
{
- wxFAIL_MSG( _T("wxListbook::GetPageImage() not implemented") );
+ wxListItem item;
+ item.SetId(n);
- return wxNOT_FOUND;
+ if (GetListView()->GetItem(item))
+ {
+ return item.GetImage();
+ }
+ else
+ {
+ return wxNOT_FOUND;
+ }
}
bool wxListbook::SetPageImage(size_t n, int imageId)
void wxListbook::SetImageList(wxImageList *imageList)
{
- GetListView()->SetImageList(imageList, wxIMAGE_LIST_NORMAL);
+ if ( CanUseReportView() )
+ {
+ wxListView * const list = GetListView();
+
+ // If imageList presence has changed, we update the list control view
+ if ( (imageList != NULL) != (GetImageList() != NULL) )
+ {
+ // Preserve the selection which is lost when changing the mode
+ const int oldSel = GetSelection();
+
+ // Update the style to use icon view for images, report view otherwise
+ long style = wxLC_SINGLE_SEL;
+ if ( imageList )
+ {
+ style |= GetListCtrlIconViewFlags();
+ }
+ else // no image list
+ {
+ style |= GetListCtrlReportViewFlags();
+ }
+
+ list->SetWindowStyleFlag(style);
+ if ( !imageList )
+ list->InsertColumn(0, wxT("Pages"));
+
+ // Restore selection
+ if ( oldSel != wxNOT_FOUND )
+ SetSelection(oldSel);
+ }
+
+ list->SetImageList(imageList, wxIMAGE_LIST_NORMAL);
+ }
wxBookCtrlBase::SetImageList(imageList);
}
// selection
// ----------------------------------------------------------------------------
-int wxListbook::GetSelection() const
+void wxListbook::UpdateSelectedPage(size_t newsel)
{
- return m_selection;
+ m_selection = newsel;
+ GetListView()->Select(newsel);
+ GetListView()->Focus(newsel);
}
-int wxListbook::SetSelection(size_t n)
+wxBookCtrlEvent* wxListbook::CreatePageChangingEvent() const
{
- wxCHECK_MSG( IS_VALID_PAGE(n), wxNOT_FOUND,
- wxT("invalid page index in wxListbook::SetSelection()") );
-
- const int oldSel = m_selection;
-
- if ( int(n) != m_selection )
- {
- wxListbookEvent event(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, m_windowId);
- event.SetSelection(n);
- event.SetOldSelection(m_selection);
- event.SetEventObject(this);
- if ( !GetEventHandler()->ProcessEvent(event) || event.IsAllowed() )
- {
- if ( m_selection != wxNOT_FOUND )
- m_pages[m_selection]->Hide();
-
- wxWindow *page = m_pages[n];
- page->SetSize(GetPageRect());
- page->Show();
-
- // change m_selection now to ignore the selection change event
- m_selection = n;
- GetListView()->Select(n);
- GetListView()->Focus(n);
-
- // program allows the page change
- event.SetEventType(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED);
- (void)GetEventHandler()->ProcessEvent(event);
- }
- }
+ return new wxBookCtrlEvent(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, m_windowId);
+}
- return oldSel;
+void wxListbook::MakeChangedEvent(wxBookCtrlEvent &event)
+{
+ event.SetEventType(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED);
}
+
// ----------------------------------------------------------------------------
// adding/removing the pages
// ----------------------------------------------------------------------------
GetListView()->Focus(m_selection);
}
- // some page should be selected: either this one or the first one if there
- // is still no selection
- int selNew = -1;
- if ( bSelect )
- selNew = n;
- else if ( m_selection == -1 )
- selNew = 0;
-
- if ( selNew != m_selection )
+ if ( !DoSetSelectionAfterInsertion(n, bSelect) )
page->Hide();
- if ( selNew != -1 )
- SetSelection(selNew);
-
- InvalidateBestSize();
- // GetListView()->InvalidateBestSize();
- GetListView()->Arrange();
+ UpdateSize();
- if (GetPageCount() == 1)
- {
- wxSizeEvent sz(GetSize(), GetId());
- ProcessEvent(sz);
- }
return true;
}
int sel = m_selection - 1;
if (page_count == 1)
sel = wxNOT_FOUND;
- else if ((page_count == 2) || (sel == -1))
+ else if ((page_count == 2) || (sel == wxNOT_FOUND))
sel = 0;
// force sel invalid if deleting current page - don't try to hide it
}
GetListView()->Arrange();
- if (GetPageCount() == 0)
- {
- wxSizeEvent sz(GetSize(), GetId());
- ProcessEvent(sz);
- }
+ UpdateSize();
}
return win;
if (!wxBookCtrlBase::DeleteAllPages())
return false;
- m_selection = -1;
-
- wxSizeEvent sz(GetSize(), GetId());
- ProcessEvent(sz);
+ UpdateSize();
return true;
}
void wxListbook::OnListSelected(wxListEvent& eventList)
{
+ if ( eventList.GetEventObject() != m_bookctrl )
+ {
+ eventList.Skip();
+ return;
+ }
+
const int selNew = eventList.GetIndex();
if ( selNew == m_selection )
projects / wxWidgets.git / blobdiff