/////////////////////////////////////////////////////////////////////////////
-// Name: src/mac/listctrl_mac.cpp
+// Name: src/osx/listctrl_mac.cpp
// Purpose: wxListCtrl
// Author: Julian Smart
// Modified by: Agron Selimaj
// Created: 04/01/98
-// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/hashmap.h"
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxListCtrlStyle )
-
-wxBEGIN_FLAGS( wxListCtrlStyle )
- // new style border flags, we put them first to
- // use them for streaming out
- wxFLAGS_MEMBER(wxBORDER_SIMPLE)
- wxFLAGS_MEMBER(wxBORDER_SUNKEN)
- wxFLAGS_MEMBER(wxBORDER_DOUBLE)
- wxFLAGS_MEMBER(wxBORDER_RAISED)
- wxFLAGS_MEMBER(wxBORDER_STATIC)
- wxFLAGS_MEMBER(wxBORDER_NONE)
-
- // old style border flags
- wxFLAGS_MEMBER(wxSIMPLE_BORDER)
- wxFLAGS_MEMBER(wxSUNKEN_BORDER)
- wxFLAGS_MEMBER(wxDOUBLE_BORDER)
- wxFLAGS_MEMBER(wxRAISED_BORDER)
- wxFLAGS_MEMBER(wxSTATIC_BORDER)
- wxFLAGS_MEMBER(wxBORDER)
-
- // standard window styles
- wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
- wxFLAGS_MEMBER(wxCLIP_CHILDREN)
- wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
- wxFLAGS_MEMBER(wxWANTS_CHARS)
- wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
- wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
- wxFLAGS_MEMBER(wxVSCROLL)
- wxFLAGS_MEMBER(wxHSCROLL)
-
- wxFLAGS_MEMBER(wxLC_LIST)
- wxFLAGS_MEMBER(wxLC_REPORT)
- wxFLAGS_MEMBER(wxLC_ICON)
- wxFLAGS_MEMBER(wxLC_SMALL_ICON)
- wxFLAGS_MEMBER(wxLC_ALIGN_TOP)
- wxFLAGS_MEMBER(wxLC_ALIGN_LEFT)
- wxFLAGS_MEMBER(wxLC_AUTOARRANGE)
- wxFLAGS_MEMBER(wxLC_USER_TEXT)
- wxFLAGS_MEMBER(wxLC_EDIT_LABELS)
- wxFLAGS_MEMBER(wxLC_NO_HEADER)
- wxFLAGS_MEMBER(wxLC_SINGLE_SEL)
- wxFLAGS_MEMBER(wxLC_SORT_ASCENDING)
- wxFLAGS_MEMBER(wxLC_SORT_DESCENDING)
- wxFLAGS_MEMBER(wxLC_VIRTUAL)
-
-wxEND_FLAGS( wxListCtrlStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxListCtrl, wxControl,"wx/listctrl.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxListCtrl)
- wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent )
-
- wxPROPERTY_FLAGS( WindowStyle , wxListCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxListCtrl)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_5( wxListCtrl , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
-
-/*
- TODO : Expose more information of a list's layout etc. via appropriate objects (￠ la NotebookPageInfo)
-*/
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl)
-#endif
-
-IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)
-IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
-
-IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
-
WX_DECLARE_HASH_MAP( int, wxListItem*, wxIntegerHash, wxIntegerEqual, wxListItemList );
#include "wx/listimpl.cpp"
cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ;
wxListCtrl *window = (wxListCtrl*) data ;
- wxListEvent le( wxEVT_COMMAND_LIST_COL_CLICK, window->GetId() );
+ wxListEvent le( wxEVT_LIST_COL_CLICK, window->GetId() );
le.SetEventObject( window );
switch ( GetEventKind( event ) )
if (result == kControlButtonPart){
DataBrowserPropertyID col;
GetDataBrowserSortProperty(controlRef, &col);
- int column = col - kMinColumnId;
+
+ DataBrowserTableViewColumnIndex column = 0;
+ verify_noerr( GetDataBrowserTableViewColumnPosition( controlRef, col, &column ) );
+
le.m_col = column;
// FIXME: we can't use the sort property for virtual listctrls
// so we need to find a better way to determine which column was clicked...
DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacListCtrlEventHandler )
-class wxMacListCtrlItem : public wxMacListBoxItem
+class wxMacListCtrlItem : public wxMacDataItem
{
public:
wxMacListCtrlItem();
// create a list item (can be a subclass of wxMacListBoxItem)
- virtual wxMacDataItem* CreateItem();
-
virtual void MacInsertItem( unsigned int n, wxListItem* item );
virtual void MacSetColumnInfo( unsigned int row, unsigned int column, wxListItem* item );
virtual void MacGetColumnInfo( unsigned int row, unsigned int column, wxListItem& item );
bool wxMacListCtrlEventDelegate::ProcessEvent( wxEvent& event )
{
+ int id = event.GetId();
+ wxObject* obj = event.GetEventObject();
+
// even though we use a generic list ctrl underneath, make sure
// we present ourselves as wxListCtrl.
event.SetEventObject( m_list );
if ( !event.IsKindOf( CLASSINFO( wxCommandEvent ) ) )
{
- if (m_list->HandleWindowEvent( event ))
+ if (m_list->GetEventHandler()->ProcessEvent( event ))
+ {
+ event.SetId(id);
+ event.SetEventObject(obj);
return true;
+ }
}
- return wxEvtHandler::ProcessEvent(event);
+ // Also try with the original id
+ bool success = wxEvtHandler::ProcessEvent(event);
+ event.SetId(id);
+ event.SetEventObject(obj);
+ if (!success && id != m_id)
+ success = wxEvtHandler::ProcessEvent(event);
+ return success;
}
//-----------------------------------------------------------------------------
wxPoint myPos = m_text->GetPosition();
wxSize mySize = m_text->GetSize();
int sx, sy;
- m_text->GetTextExtent(m_text->GetValue() + _T("MM"), &sx, &sy);
+ m_text->GetTextExtent(m_text->GetValue() + wxT("MM"), &sx, &sy);
if (myPos.x + sx > parentSize.x)
sx = parentSize.x - myPos.x;
if (mySize.x > sx)
event.Skip();
}
-BEGIN_EVENT_TABLE(wxListCtrl, wxControl)
- EVT_LEFT_DOWN(wxListCtrl::OnLeftDown)
- EVT_LEFT_DCLICK(wxListCtrl::OnDblClick)
- EVT_MIDDLE_DOWN(wxListCtrl::OnMiddleDown)
- EVT_RIGHT_DOWN(wxListCtrl::OnRightDown)
- EVT_CHAR(wxListCtrl::OnChar)
-END_EVENT_TABLE()
-
// ============================================================================
// implementation
// ============================================================================
-wxMacListControl* wxListCtrl::GetPeer() const
+wxMacDataBrowserListCtrlControl* wxListCtrl::GetListPeer() const
{
- wxMacDataBrowserListCtrlControl *lb = wxDynamicCast(m_peer,wxMacDataBrowserListCtrlControl);
- return lb ? wx_static_cast(wxMacListControl*,lb) : 0 ;
+ return dynamic_cast<wxMacDataBrowserListCtrlControl*> ( GetPeer() );
}
// ----------------------------------------------------------------------------
m_bgColor = wxNullColour;
m_textctrlWrapper = NULL;
m_current = -1;
- m_renameTimer = new wxListCtrlRenameTimer( this );
+ m_renameTimer = NULL;
}
class wxGenericListCtrlHook : public wxGenericListCtrl
int hitResult;
long current = HitTest(event.GetPosition(), hitResult);
if ((current == m_current) &&
- (hitResult == wxLIST_HITTEST_ONITEM) &&
+ (hitResult & wxLIST_HITTEST_ONITEMLABEL) &&
HasFlag(wxLC_EDIT_LABELS) )
{
- m_renameTimer->Start( 100, true );
+ if ( m_renameTimer )
+ m_renameTimer->Start( 250, true );
}
else
{
void wxListCtrl::OnDblClick(wxMouseEvent& event)
{
- m_current = -1;
+ if ( m_renameTimer && m_renameTimer->IsRunning() )
+ m_renameTimer->Stop();
event.Skip();
}
void wxListCtrl::OnRightDown(wxMouseEvent& event)
{
if (m_dbImpl)
- FireMouseEvent(wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, event.GetPosition());
+ FireMouseEvent(wxEVT_LIST_ITEM_RIGHT_CLICK, event.GetPosition());
event.Skip();
}
void wxListCtrl::OnMiddleDown(wxMouseEvent& event)
{
if (m_dbImpl)
- FireMouseEvent(wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK, event.GetPosition());
+ FireMouseEvent(wxEVT_LIST_ITEM_MIDDLE_CLICK, event.GetPosition());
event.Skip();
}
void wxListCtrl::OnChar(wxKeyEvent& event)
{
-
+
if (m_dbImpl)
{
- wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetId() );
+ wxListEvent le( wxEVT_LIST_KEY_DOWN, GetId() );
le.SetEventObject(this);
le.m_code = event.GetKeyCode();
le.m_itemIndex = -1;
-
+
if (m_current == -1)
{
// if m_current isn't set, check if there's been a selection
// made before continuing
m_current = GetNextItem(-1, wxLIST_NEXT_BELOW, wxLIST_STATE_SELECTED);
}
-
+
// We need to determine m_current ourselves when navigation keys
// are used. Note that PAGEUP and PAGEDOWN do not alter the current
// item on native Mac ListCtrl, so we only handle up and down keys.
m_current -= 1;
else
m_current = 0;
-
+
break;
case WXK_DOWN:
m_current += 1;
else
m_current = GetItemCount() - 1;
-
+
break;
}
&& (wxSystemOptions::GetOptionInt( wxMAC_ALWAYS_USE_GENERIC_LISTCTRL ) == 1)) ||
(style & wxLC_ICON) || (style & wxLC_SMALL_ICON) || (style & wxLC_LIST) )
{
- m_macIsUserPane = true;
-
long paneStyle = style;
paneStyle &= ~wxSIMPLE_BORDER;
paneStyle &= ~wxDOUBLE_BORDER;
else
{
- m_macIsUserPane = false;
+ DontCreatePeer();
if ( !wxWindow::Create(parent, id, pos, size, style & ~(wxHSCROLL | wxVSCROLL), name) )
return false;
m_dbImpl = new wxMacDataBrowserListCtrlControl( this, pos, size, style );
- m_peer = m_dbImpl;
+ SetPeer(m_dbImpl);
MacPostControlCreate( pos, size );
- InstallControlEventHandler( m_peer->GetControlRef() , GetwxMacListCtrlEventHandlerUPP(),
+ InstallControlEventHandler( GetPeer()->GetControlRef() , GetwxMacListCtrlEventHandlerUPP(),
GetEventTypeCount(eventList), eventList, this,
(EventHandlerRef *)&m_macListCtrlEventHandler);
+
+ m_renameTimer = new wxListCtrlRenameTimer( this );
+
+ Connect( wxID_ANY, wxEVT_CHAR, wxCharEventHandler(wxListCtrl::OnChar), NULL, this );
+ Connect( wxID_ANY, wxEVT_LEFT_DOWN, wxMouseEventHandler(wxListCtrl::OnLeftDown), NULL, this );
+ Connect( wxID_ANY, wxEVT_LEFT_DCLICK, wxMouseEventHandler(wxListCtrl::OnDblClick), NULL, this );
+ Connect( wxID_ANY, wxEVT_MIDDLE_DOWN, wxMouseEventHandler(wxListCtrl::OnMiddleDown), NULL, this );
+ Connect( wxID_ANY, wxEVT_RIGHT_DOWN, wxMouseEventHandler(wxListCtrl::OnRightDown), NULL, this );
}
return true;
delete m_imageListState;
delete m_renameTimer;
-
+
WX_CLEAR_LIST(wxColumnList, m_colsInfo);
}
attr.colFg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
attr.colBg = wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX );
- attr.font.MacCreateFromThemeFont(kThemeViewsFont);
+ static wxFont font = wxFont(wxOSX_SYSTEM_FONT_VIEWS);
+ attr.font = font;
return attr;
}
void wxListCtrl::DoSetSize( int x, int y, int width, int height, int sizeFlags )
{
- wxControl::DoSetSize(x, y, width, height, sizeFlags);
+ wxListCtrlBase::DoSetSize(x, y, width, height, sizeFlags);
if (m_genericImpl)
m_genericImpl->SetSize(0, 0, width, height, sizeFlags);
}
}
-wxSize wxListCtrl::DoGetBestSize() const
-{
- return wxWindow::DoGetBestSize();
-}
-
bool wxListCtrl::SetFont(const wxFont& font)
{
- bool rv = true;
- rv = wxControl::SetFont(font);
+ bool rv = wxListCtrlBase::SetFont(font);
if (m_genericImpl)
rv = m_genericImpl->SetFont(font);
return rv;
return rv;
}
-wxColour wxListCtrl::GetBackgroundColour()
+wxColour wxListCtrl::GetBackgroundColour() const
{
if (m_genericImpl)
return m_genericImpl->GetBackgroundColour();
return wxNullColour;
}
+void wxListCtrl::Freeze ()
+{
+ if (m_genericImpl)
+ m_genericImpl->Freeze();
+ wxListCtrlBase::Freeze();
+}
+
+void wxListCtrl::Thaw ()
+{
+ if (m_genericImpl)
+ m_genericImpl->Thaw();
+ wxListCtrlBase::Thaw();
+}
+
+void wxListCtrl::Update ()
+{
+ if (m_genericImpl)
+ m_genericImpl->Update();
+ wxListCtrlBase::Update();
+}
+
// ----------------------------------------------------------------------------
// accessors
// ----------------------------------------------------------------------------
if (m_dbImpl)
{
wxColumnList::compatibility_iterator node = m_colsInfo.Item( col );
- wxASSERT_MSG( node, _T("invalid column index in wxMacListCtrlItem") );
+ wxASSERT_MSG( node, wxT("invalid column index in wxMacListCtrlItem") );
wxListItem* column = node->GetData();
long mask = column->GetMask();
}
// Sets information about this column
-bool wxListCtrl::SetColumn(int col, wxListItem& item)
+bool wxListCtrl::SetColumn(int col, const wxListItem& item)
{
if (m_genericImpl)
return m_genericImpl->SetColumn(col, item);
if (m_dbImpl)
{
+ wxASSERT_MSG( col < (int)m_colsInfo.GetCount(), wxT("invalid column index in wxMacListCtrlItem") );
+
long mask = item.GetMask();
- if ( col >= (int)m_colsInfo.GetCount() )
- {
- wxListItem* listItem = new wxListItem(item);
- m_colsInfo.Append( listItem );
- }
- else
{
wxListItem listItem;
GetColumn( col, listItem );
// change the appearance in the databrowser.
DataBrowserListViewHeaderDesc columnDesc;
columnDesc.version=kDataBrowserListViewLatestHeaderDesc;
- verify_noerr( m_dbImpl->GetHeaderDesc( kMinColumnId + col, &columnDesc ) );
+
+ DataBrowserTableViewColumnID id = 0;
+ verify_noerr( m_dbImpl->GetColumnIDFromIndex( col, &id ) );
+ verify_noerr( m_dbImpl->GetHeaderDesc( id, &columnDesc ) );
/*
if (item.GetMask() & wxLIST_MASK_TEXT)
{
wxFontEncoding enc;
- if ( m_font.Ok() )
+ if ( m_font.IsOk() )
enc = GetFont().GetEncoding();
else
enc = wxLocale::GetSystemEncoding();
}
}
- verify_noerr( m_dbImpl->SetHeaderDesc( kMinColumnId + col, &columnDesc ) );
+ verify_noerr( m_dbImpl->SetHeaderDesc( id, &columnDesc ) );
}
return true;
if (info.m_itemId >= 0 && info.m_itemId < GetItemCount())
{
m_dbImpl->MacGetColumnInfo(info.m_itemId, info.m_col, info);
+ // MacGetColumnInfo returns erroneous information in the state field, so zero it.
+ info.SetState(0);
if (info.GetMask() & wxLIST_MASK_STATE)
{
DataBrowserItemID id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(info.m_itemId);
}
// Gets the item text
-wxString wxListCtrl::GetItemText(long item) const
+wxString wxListCtrl::GetItemText(long item, int column) const
{
if (m_genericImpl)
- return m_genericImpl->GetItemText(item);
+ return m_genericImpl->GetItemText(item, column);
wxListItem info;
info.m_mask = wxLIST_MASK_TEXT;
info.m_itemId = item;
+ info.m_col = column;
if (!GetItem(info))
return wxEmptyString;
wxRect wxListCtrl::GetViewRect() const
{
wxASSERT_MSG( !HasFlag(wxLC_REPORT | wxLC_LIST),
- _T("wxListCtrl::GetViewRect() only works in icon mode") );
+ wxT("wxListCtrl::GetViewRect() only works in icon mode") );
if (m_genericImpl)
return m_genericImpl->GetViewRect();
return rect;
}
+bool wxListCtrl::GetSubItemRect( long item, long subItem, wxRect& rect, int code ) const
+{
+ if (m_genericImpl)
+ return m_genericImpl->GetSubItemRect(item, subItem, rect, code);
+
+ // TODO: implement for DataBrowser implementation
+ return false;
+}
+
// Gets the item rectangle
bool wxListCtrl::GetItemRect(long item, wxRect& rect, int code) const
{
if (m_dbImpl)
{
DataBrowserItemID id;
- DataBrowserPropertyID col = kMinColumnId;
+
+ DataBrowserTableViewColumnID col = 0;
+ verify_noerr( m_dbImpl->GetColumnIDFromIndex( 0, &col ) );
+
Rect bounds;
DataBrowserPropertyPart part = kDataBrowserPropertyEnclosingPart;
if ( code == wxLIST_RECT_LABEL )
if ( !IsVirtual() )
id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(line);
+ if ( (state & wxLIST_STATE_FOCUSED) && (m_current == line))
+ return line;
+
if ( (state == wxLIST_STATE_DONTCARE ) )
return line;
if ( !IsVirtual() )
id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(line);
+ if ( (state & wxLIST_STATE_FOCUSED) && (m_current == line))
+ return line;
+
if ( (state == wxLIST_STATE_DONTCARE ) )
return line;
if (m_dbImpl)
{
m_dbImpl->MacDelete(item);
- wxListEvent event( wxEVT_COMMAND_LIST_DELETE_ITEM, GetId() );
+ wxListEvent event( wxEVT_LIST_DELETE_ITEM, GetId() );
event.SetEventObject( this );
event.m_itemIndex = item;
HandleWindowEvent( event );
// Deletes all items
bool wxListCtrl::DeleteAllItems()
{
+ m_current = -1;
if (m_genericImpl)
return m_genericImpl->DeleteAllItems();
if (m_dbImpl)
{
m_dbImpl->MacClear();
- wxListEvent event( wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, GetId() );
+ wxListEvent event( wxEVT_LIST_DELETE_ALL_ITEMS, GetId() );
event.SetEventObject( this );
HandleWindowEvent( event );
}
wxASSERT_MSG( textControlClass->IsKindOf(CLASSINFO(wxTextCtrl)),
wxT("EditLabel() needs a text control") );
- wxListEvent le( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, GetParent()->GetId() );
+ wxListEvent le( wxEVT_LIST_BEGIN_LABEL_EDIT, GetParent()->GetId() );
le.SetEventObject( this );
le.m_itemIndex = item;
le.m_col = 0;
return true; // m_genericImpl->EndEditLabel(cancel);
if (m_dbImpl)
- verify_noerr( SetDataBrowserEditItem(m_dbImpl->GetControlRef(), kDataBrowserNoItem, kMinColumnId) );
+ {
+ DataBrowserTableViewColumnID id = 0;
+ verify_noerr( m_dbImpl->GetColumnIDFromIndex( 0, &id ) );
+ verify_noerr( SetDataBrowserEditItem(m_dbImpl->GetControlRef(), kDataBrowserNoItem, id ) );
+ }
return true;
}
return -1;
}
+static void calculateCGDrawingBounds(CGRect inItemRect, CGRect *outIconRect, CGRect *outTextRect, bool hasIcon);
+
// Determines which item (if any) is at the specified point,
// giving details in 'flags' (see wxLIST_HITTEST_... flags above)
long
wxListCtrl::HitTest(const wxPoint& point, int& flags, long *ptrSubItem) const
{
+ if (ptrSubItem)
+ *ptrSubItem = -1;
+
if (m_genericImpl)
return m_genericImpl->HitTest(point, flags, ptrSubItem);
DataBrowserItemID id;
m_dbImpl->GetItemID( (DataBrowserTableViewRowIndex) row, &id );
- // TODO: Use GetDataBrowserItemPartBounds to return if we are in icon or label
- if ( !(GetWindowStyleFlag() & wxLC_VIRTUAL ) )
+ CGPoint click_point = CGPointMake( point.x, point.y );
+ if (row < GetItemCount() )
{
- wxMacListCtrlItem* lcItem;
- lcItem = (wxMacListCtrlItem*) id;
- if (lcItem)
+ short column;
+ for( column = 0; column < GetColumnCount(); column++ )
{
- flags = wxLIST_HITTEST_ONITEM;
- return row;
- }
- }
- else
- {
- if (row < GetItemCount() )
- {
- flags = wxLIST_HITTEST_ONITEM;
- return row;
- }
- }
-
+ Rect enclosingRect;
+ CGRect enclosingCGRect, iconCGRect, textCGRect;
+ int imgIndex = -1;
+ wxMacListCtrlItem* lcItem;
+
+ WXUNUSED_UNLESS_DEBUG( OSStatus status = ) m_dbImpl->GetItemPartBounds( id, kMinColumnId + column, kDataBrowserPropertyEnclosingPart, &enclosingRect );
+ wxASSERT( status == noErr );
+
+ enclosingCGRect = CGRectMake(enclosingRect.left,
+ enclosingRect.top,
+ enclosingRect.right - enclosingRect.left,
+ enclosingRect.bottom - enclosingRect.top);
+
+ if (column >= 0)
+ {
+ if ( !(GetWindowStyleFlag() & wxLC_VIRTUAL ) )
+ {
+ lcItem = (wxMacListCtrlItem*) id;
+ if (lcItem->HasColumnInfo(column))
+ {
+ wxListItem* item = lcItem->GetColumnInfo(column);
+
+ if (item->GetMask() & wxLIST_MASK_IMAGE)
+ {
+ imgIndex = item->GetImage();
+ }
+ }
+ }
+ else
+ {
+ long itemNum = (long)id-1;
+ if (itemNum >= 0 && itemNum < GetItemCount())
+ {
+ imgIndex = OnGetItemColumnImage( itemNum, column );
+ }
+ }
+ }
+
+ calculateCGDrawingBounds(enclosingCGRect, &iconCGRect, &textCGRect, (imgIndex != -1) );
+
+ if ( CGRectContainsPoint( iconCGRect, click_point ) )
+ {
+ flags = wxLIST_HITTEST_ONITEMICON;
+ if (ptrSubItem)
+ *ptrSubItem = column;
+ return row;
+ }
+ else if ( CGRectContainsPoint( textCGRect, click_point ) )
+ {
+ flags = wxLIST_HITTEST_ONITEMLABEL;
+ if (ptrSubItem)
+ *ptrSubItem = column;
+ return row;
+ }
+ }
+
+ if ( !(GetWindowStyleFlag() & wxLC_VIRTUAL ) )
+ {
+ wxMacListCtrlItem* lcItem;
+ lcItem = (wxMacListCtrlItem*) id;
+ if (lcItem)
+ {
+ flags = wxLIST_HITTEST_ONITEM;
+ if (ptrSubItem)
+ *ptrSubItem = column;
+ return row;
+ }
+ }
+ else
+ {
+ flags = wxLIST_HITTEST_ONITEM;
+ if (ptrSubItem)
+ *ptrSubItem = column;
+ return row;
+ }
+ }
+ else
+ {
+ if ( wxControl::HitTest( point ) )
+ flags = wxLIST_HITTEST_NOWHERE;
+ }
}
+
return -1;
}
// -1 otherwise.
long wxListCtrl::InsertItem(wxListItem& info)
{
- wxASSERT_MSG( !IsVirtual(), _T("can't be used with virtual controls") );
+ wxASSERT_MSG( !IsVirtual(), wxT("can't be used with virtual controls") );
if (m_genericImpl)
return m_genericImpl->InsertItem(info);
m_dbImpl->MacInsertItem(info.m_itemId, &info );
- wxListEvent event( wxEVT_COMMAND_LIST_INSERT_ITEM, GetId() );
+ wxListEvent event( wxEVT_LIST_INSERT_ITEM, GetId() );
event.SetEventObject( this );
event.m_itemIndex = info.m_itemId;
HandleWindowEvent( event );
}
// For list view mode (only), inserts a column.
-long wxListCtrl::InsertColumn(long col, wxListItem& item)
+long wxListCtrl::DoInsertColumn(long col, const wxListItem& item)
{
if (m_genericImpl)
return m_genericImpl->InsertColumn(col, item);
if (imageList && imageList->GetImageCount() > 0)
{
wxBitmap bmp = imageList->GetBitmap(0);
- //if (bmp.Ok())
+ //if (bmp.IsOk())
// type = kDataBrowserIconAndTextType;
}
just = teFlushRight;
}
m_dbImpl->InsertColumn(col, type, item.GetText(), just, width);
+
+ wxListItem* listItem = new wxListItem(item);
+ m_colsInfo.Insert( col, listItem );
SetColumn(col, item);
// set/remove options based on the wxListCtrl type.
return col;
}
-long wxListCtrl::InsertColumn(long col,
- const wxString& heading,
- int format,
- int width)
-{
- if (m_genericImpl)
- return m_genericImpl->InsertColumn(col, heading, format, width);
-
- wxListItem item;
- item.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_FORMAT;
- item.m_text = heading;
- if ( width > -1 )
- {
- item.m_mask |= wxLIST_MASK_WIDTH;
- item.m_width = width;
- }
- item.m_format = format;
-
- return InsertColumn(col, item);
-}
-
// scroll the control by the given number of pixels (exception: in list view,
// dx is interpreted as number of columns)
bool wxListCtrl::ScrollList(int dx, int dy)
if (m_dbImpl)
{
- m_dbImpl->SetScrollPosition(dx, dy);
+ // Notice that the parameter order is correct here: first argument is
+ // the "top" displacement, second one is the "left" one.
+ m_dbImpl->SetScrollPosition(dy, dx);
}
return true;
}
-bool wxListCtrl::SortItems(wxListCtrlCompare fn, long data)
+bool wxListCtrl::SortItems(wxListCtrlCompare fn, wxIntPtr data)
{
if (m_genericImpl)
return m_genericImpl->SortItems(fn, data);
bool wxListCtrl::OnRenameAccept(long itemEdit, const wxString& value)
{
- wxListEvent le( wxEVT_COMMAND_LIST_END_LABEL_EDIT, GetId() );
+ wxListEvent le( wxEVT_LIST_END_LABEL_EDIT, GetId() );
le.SetEventObject( this );
le.m_itemIndex = itemEdit;
void wxListCtrl::OnRenameCancelled(long itemEdit)
{
// let owner know that the edit was cancelled
- wxListEvent le( wxEVT_COMMAND_LIST_END_LABEL_EDIT, GetParent()->GetId() );
+ wxListEvent le( wxEVT_LIST_END_LABEL_EDIT, GetParent()->GetId() );
le.SetEditCanceled(true);
{
// this is a pure virtual function, in fact - which is not really pure
// because the controls which are not virtual don't need to implement it
- wxFAIL_MSG( _T("wxListCtrl::OnGetItemText not supposed to be called") );
+ wxFAIL_MSG( wxT("wxListCtrl::OnGetItemText not supposed to be called") );
return wxEmptyString;
}
return -1;
}
-wxListItemAttr *wxListCtrl::OnGetItemAttr(long WXUNUSED_UNLESS_DEBUG(item)) const
-{
- wxASSERT_MSG( item >= 0 && item < GetItemCount(),
- _T("invalid item index in OnGetItemAttr()") );
-
- // no attributes by default
- return NULL;
-}
-
void wxListCtrl::SetItemCount(long count)
{
- wxASSERT_MSG( IsVirtual(), _T("this is for virtual controls only") );
+ wxASSERT_MSG( IsVirtual(), wxT("this is for virtual controls only") );
if (m_genericImpl)
{
// we want to depend on as little as possible to make sure tear-down of controls is safe
if ( message == kDataBrowserItemRemoved)
{
- if ( lb != NULL && lb->GetClientDataType() == wxClientData_Object )
- {
- delete (wxClientData*) (m_data);
- }
-
delete this;
return;
}
{
bool trigger = false;
- wxListEvent event( wxEVT_COMMAND_LIST_ITEM_SELECTED, list->GetId() );
+ wxListEvent event( wxEVT_LIST_ITEM_SELECTED, list->GetId() );
bool isSingle = (list->GetWindowStyle() & wxLC_SINGLE_SEL) != 0;
event.SetEventObject( list );
switch (message)
{
case kDataBrowserItemDeselected:
- event.SetEventType(wxEVT_COMMAND_LIST_ITEM_DESELECTED);
+ event.SetEventType(wxEVT_LIST_ITEM_DESELECTED);
if ( !isSingle )
trigger = !lb->IsSelectionSuppressed();
break;
break;
case kDataBrowserItemDoubleClicked:
- event.SetEventType( wxEVT_COMMAND_LIST_ITEM_ACTIVATED );
+ event.SetEventType( wxEVT_LIST_ITEM_ACTIVATED );
trigger = true;
break;
case kDataBrowserEditStarted :
// TODO : how to veto ?
- event.SetEventType( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT ) ;
+ event.SetEventType( wxEVT_LIST_BEGIN_LABEL_EDIT ) ;
trigger = true ;
break ;
case kDataBrowserEditStopped :
// TODO probably trigger only upon the value store callback, because
// here IIRC we cannot veto
- event.SetEventType( wxEVT_COMMAND_LIST_END_LABEL_EDIT ) ;
+ event.SetEventType( wxEVT_LIST_END_LABEL_EDIT ) ;
trigger = true ;
break ;
static void calculateCGDrawingBounds(CGRect inItemRect, CGRect *outIconRect, CGRect *outTextRect, bool hasIcon = false)
{
float textBottom;
- float iconH, iconW = 0;
+ float iconW = 0;
float padding = kItemPadding;
if (hasIcon)
{
- iconH = kIconHeight;
iconW = kIconWidth;
padding = padding*2;
}
wxString text;
wxFont font = wxNullFont;
int imgIndex = -1;
- short listColumn = property - kMinColumnId;
+
+ DataBrowserTableViewColumnIndex listColumn = 0;
+ GetColumnPosition( property, &listColumn );
wxListCtrl* list = wxDynamicCast( GetWXPeer() , wxListCtrl );
wxMacListCtrlItem* lcItem;
if (!m_isVirtual)
{
lcItem = (wxMacListCtrlItem*) itemID;
- if (lcItem->HasColumnInfo(listColumn)){
+ if (lcItem->HasColumnInfo(listColumn))
+ {
wxListItem* item = lcItem->GetColumnInfo(listColumn);
// we always use the 0 column to get font and text/background colors.
if (bgColor == wxNullColour)
bgColor = listBgColor;
- if (!font.Ok())
+ if (!font.IsOk())
font = list->GetFont();
wxCFStringRef cfString( text, wxLocale::GetSystemEncoding() );
Boolean active;
ThemeDrawingState savedState = NULL;
CGContextRef context = (CGContextRef)list->MacGetDrawingContext();
+ wxMacCGContextStateSaver top_saver_cg( context );
+
RGBColor labelColor;
labelColor.red = 0;
labelColor.green = 0;
GetThemeBrushAsColor(kThemeBrushSecondaryHighlightColor, 32, true, &backgroundColor);
GetThemeTextColor(kThemeTextColorBlack, gdDepth, colorDevice, &labelColor);
}
- CGContextSaveGState(context);
+ wxMacCGContextStateSaver cg( context );
CGContextSetRGBFillColor(context, (CGFloat)backgroundColor.red / (CGFloat)USHRT_MAX,
(CGFloat)backgroundColor.green / (CGFloat)USHRT_MAX,
(CGFloat)backgroundColor.blue / (CGFloat)USHRT_MAX, (CGFloat) 1.0);
CGContextFillRect(context, enclosingCGRect);
-
- CGContextRestoreGState(context);
}
else
{
- if (color.Ok())
+ if (color.IsOk())
color.GetRGBColor(&labelColor);
- else if (list->GetTextColour().Ok())
+ else if (list->GetTextColour().IsOk())
list->GetTextColour().GetRGBColor(&labelColor);
- if (bgColor.Ok())
+ if (bgColor.IsOk())
{
bgColor.GetRGBColor(&backgroundColor);
CGContextSaveGState(context);
if (imgIndex != -1)
{
wxImageList* imageList = list->GetImageList(wxIMAGE_LIST_SMALL);
- if (imageList && imageList->GetImageCount() > 0){
+ if (imageList && imageList->GetImageCount() > 0)
+ {
wxBitmap bmp = imageList->GetBitmap(imgIndex);
IconRef icon = bmp.GetIconRef();
- CGContextSaveGState(context);
+ wxMacCGContextStateSaver cg( context );
+
CGContextTranslateCTM(context, 0,iconCGRect.origin.y + CGRectGetMaxY(iconCGRect));
CGContextScaleCTM(context,1.0f,-1.0f);
PlotIconRefInContext(context, &iconCGRect, kAlignNone,
active ? kTransformNone : kTransformDisabled, NULL,
kPlotIconRefNormalFlags, icon);
-
- CGContextRestoreGState(context);
}
}
{
info.version = kHIThemeTextInfoVersionOne;
info.fontID = kThemeViewsFont;
- if (font.Ok())
+ if (font.IsOk())
{
info.fontID = kThemeSpecifiedFont;
- info.font = (CTFontRef) font.MacGetCTFont();
+ info.font = (CTFontRef) font.OSXGetCTFont();
setup = true;
}
}
info.version = kHIThemeTextInfoVersionZero;
info.fontID = kThemeViewsFont;
- if (font.Ok())
+ if (font.IsOk())
{
info.fontID = font.MacGetThemeFontID();
- ::TextSize( (short)(font.MacGetFontSize()) ) ;
+ ::TextSize( (short)(font.GetPointSize()) ) ;
::TextFace( font.MacGetFontStyle() ) ;
}
}
info.truncationPosition = kHIThemeTextTruncationEnd;
info.truncationMaxLines = 1;
- CGContextSaveGState(context);
- CGContextSetRGBFillColor (context, (CGFloat)labelColor.red / (CGFloat)USHRT_MAX,
+ {
+ wxMacCGContextStateSaver cg( context );
+ CGContextSetRGBFillColor (context, (CGFloat)labelColor.red / (CGFloat)USHRT_MAX,
(CGFloat)labelColor.green / (CGFloat)USHRT_MAX,
(CGFloat)labelColor.blue / (CGFloat)USHRT_MAX, (CGFloat) 1.0);
- HIThemeDrawTextBox(cfString, &textCGRect, &info, context, kHIThemeOrientationNormal);
-
- CGContextRestoreGState(context);
+ HIThemeDrawTextBox(cfString, &textCGRect, &info, context, kHIThemeOrientationNormal);
+ }
#ifndef __LP64__
if (savedState != NULL)
{
wxString text;
int imgIndex = -1;
- short listColumn = property - kMinColumnId;
+
+ DataBrowserTableViewColumnIndex listColumn = 0;
+ verify_noerr( GetColumnPosition( property, &listColumn ) );
OSStatus err = errDataBrowserPropertyNotSupported;
wxListCtrl* list = wxDynamicCast( GetWXPeer() , wxListCtrl );
default:
if ( property >= kMinColumnId )
{
- short listColumn = property - kMinColumnId;
+ DataBrowserTableViewColumnIndex listColumn = 0;
+ verify_noerr( GetColumnPosition( property, &listColumn ) );
// TODO probably send the 'end edit' from here, as we
// can then deal with the veto
{
item = (wxMacListCtrlItem *) itemID;
}
-
+
// we want to depend on as little as possible to make sure tear-down of controls is safe
if ( message == kDataBrowserItemRemoved )
{
{
bool trigger = false;
- wxListEvent event( wxEVT_COMMAND_LIST_ITEM_SELECTED, list->GetId() );
+ wxListEvent event( wxEVT_LIST_ITEM_SELECTED, list->GetId() );
event.SetEventObject( list );
if ( !list->IsVirtual() )
switch (message)
{
case kDataBrowserItemDeselected:
- event.SetEventType(wxEVT_COMMAND_LIST_ITEM_DESELECTED);
+ event.SetEventType(wxEVT_LIST_ITEM_DESELECTED);
// as the generic implementation is also triggering this
// event for single selection, we do the same (different than listbox)
trigger = !IsSelectionSuppressed();
break;
case kDataBrowserItemDoubleClicked:
- event.SetEventType( wxEVT_COMMAND_LIST_ITEM_ACTIVATED );
+ event.SetEventType( wxEVT_LIST_ITEM_ACTIVATED );
trigger = true;
break;
case kDataBrowserEditStarted :
// TODO : how to veto ?
- event.SetEventType( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT ) ;
+ event.SetEventType( wxEVT_LIST_BEGIN_LABEL_EDIT ) ;
trigger = true ;
break ;
case kDataBrowserEditStopped :
// TODO probably trigger only upon the value store callback, because
// here IIRC we cannot veto
- event.SetEventType( wxEVT_COMMAND_LIST_END_LABEL_EDIT ) ;
+ event.SetEventType( wxEVT_LIST_END_LABEL_EDIT ) ;
trigger = true ;
break ;
long itemOrder;
long otherItemOrder;
- int colId = sortProperty - kMinColumnId;
+ DataBrowserTableViewColumnIndex colId = 0;
+ verify_noerr( GetColumnPosition( sortProperty, &colId ) );
wxListCtrl* list = wxDynamicCast( GetWXPeer() , wxListCtrl );
wxMacListCtrlItem* otherItem = (wxMacListCtrlItem*)itemTwoID;
itemOrder = item->GetOrder();
- otherItemOrder = item->GetOrder();
+ otherItemOrder = otherItem->GetOrder();
wxListCtrlCompare func = list->GetCompareFunc();
if (func != NULL)
{
+
long item1 = -1;
long item2 = -1;
if (item && item->HasColumnInfo(0))
void wxMacDataBrowserListCtrlControl::MacSetColumnInfo( unsigned int row, unsigned int column, wxListItem* item )
{
wxMacDataItem* dataItem = GetItemFromLine(row);
- wxASSERT_MSG( dataItem, _T("could not obtain wxMacDataItem for row in MacSetColumnInfo. Is row a valid wxListCtrl row?") );
+ wxASSERT_MSG( dataItem, wxT("could not obtain wxMacDataItem for row in MacSetColumnInfo. Is row a valid wxListCtrl row?") );
if (item)
{
- wxMacListCtrlItem* listItem = wx_static_cast(wxMacListCtrlItem*,dataItem);
+ wxMacListCtrlItem* listItem = static_cast<wxMacListCtrlItem *>(dataItem);
bool hasInfo = listItem->HasColumnInfo( column );
listItem->SetColumnInfo( column, item );
listItem->SetOrder(row);
// would be shown. Making sure not to update items until the control is visible
// seems to fix this issue.
if (hasInfo && list->IsShown())
- UpdateItem( wxMacDataBrowserRootContainer, listItem , kMinColumnId + column );
+ {
+ DataBrowserTableViewColumnID id = 0;
+ verify_noerr( GetColumnIDFromIndex( column, &id ) );
+ UpdateItem( wxMacDataBrowserRootContainer, listItem , id );
+ }
}
}
void wxMacDataBrowserListCtrlControl::MacGetColumnInfo( unsigned int row, unsigned int column, wxListItem& item )
{
wxMacDataItem* dataItem = GetItemFromLine(row);
- wxASSERT_MSG( dataItem, _T("could not obtain wxMacDataItem in MacGetColumnInfo. Is row a valid wxListCtrl row?") );
+ wxASSERT_MSG( dataItem, wxT("could not obtain wxMacDataItem in MacGetColumnInfo. Is row a valid wxListCtrl row?") );
// CS should this guard against dataItem = 0 ? , as item is not a pointer if (item) is not appropriate
//if (item)
{
- wxMacListCtrlItem* listItem =wx_static_cast(wxMacListCtrlItem*,dataItem);
+ wxMacListCtrlItem* listItem = static_cast<wxMacListCtrlItem *>(dataItem);
if (!listItem->HasColumnInfo( column ))
return;
void wxMacDataBrowserListCtrlControl::MacInsertItem( unsigned int n, wxListItem* item )
{
- wxMacDataItemBrowserControl::MacInsert(n, item->GetText());
- MacSetColumnInfo(n, 0, item);
-}
-wxMacDataItem* wxMacDataBrowserListCtrlControl::CreateItem()
-{
- return new wxMacListCtrlItem();
+ wxMacDataItemBrowserControl::MacInsert(n, new wxMacListCtrlItem() );
+ MacSetColumnInfo(n, 0, item);
}
wxMacListCtrlItem::wxMacListCtrlItem()
wxString wxMacListCtrlItem::GetColumnTextValue( unsigned int column )
{
+/* TODO CHECK REMOVE
if ( column == 0 )
return GetLabel();
-
+*/
if ( HasColumnInfo(column) )
return GetColumnInfo(column)->GetText();
if ( HasColumnInfo(column) )
GetColumnInfo(column)->SetText(text);
+/* TODO CHECK REMOVE
// for compatibility with superclass APIs
if ( column == 0 )
SetLabel(text);
+*/
}
wxListItem* wxMacListCtrlItem::GetColumnInfo( unsigned int column )
{
- wxASSERT_MSG( HasColumnInfo(column), _T("invalid column index in wxMacListCtrlItem") );
+ wxASSERT_MSG( HasColumnInfo(column), wxT("invalid column index in wxMacListCtrlItem") );
return m_rowItems[column];
}
projects / wxWidgets.git / blobdiff