#include "wx/sysopt.h"
#include "wx/timer.h"
-#define wxMAC_ALWAYS_USE_GENERIC_LISTCTRL wxT("mac.listctrl.always_use_generic")
+#include "wx/hashmap.h"
#if wxUSE_EXTENDED_RTTI
WX_DEFINE_FLAGS( wxListCtrlStyle )
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)
+ TODO : Expose more information of a list's layout etc. via appropriate objects (￠ la NotebookPageInfo)
*/
#else
IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
-WX_DECLARE_EXPORTED_LIST(wxListItem, wxListItemList);
+WX_DECLARE_HASH_MAP( int, wxListItem*, wxIntegerHash, wxIntegerEqual, wxListItemList );
+
#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxListItemList)
WX_DEFINE_LIST(wxColumnList)
// so we can check for column clicks
wxListCtrl *window = (wxListCtrl*) data ;
wxListEvent le( wxEVT_COMMAND_LIST_COL_CLICK, window->GetId() );
le.SetEventObject( window );
-
+
switch ( GetEventKind( event ) )
{
// check if the column was clicked on and fire an event if so
GetDataBrowserSortProperty(controlRef, &col);
int column = col - kMinColumnId;
le.m_col = column;
- window->GetEventHandler()->ProcessEvent( le );
+ // 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...
+ if (!window->IsVirtual())
+ window->HandleWindowEvent( le );
}
result = CallNextEventHandler(handler, event);
- break;
+ break;
}
case kEventControlDraw:
{
break ;
}
-
+
return result ;
}
virtual bool HasColumnInfo( unsigned int column );
virtual void SetColumnTextValue( unsigned int column, const wxString& text );
- virtual const wxString& GetColumnTextValue( unsigned int column );
+ virtual wxString GetColumnTextValue( unsigned int column );
virtual int GetColumnImageValue( unsigned int column );
virtual void SetColumnImageValue( unsigned int column, int imageIndex );
{
public:
wxMacDataBrowserListCtrlControl( wxWindow *peer, const wxPoint& pos, const wxSize& size, long style );
+ wxMacDataBrowserListCtrlControl() {}
virtual ~wxMacDataBrowserListCtrlControl();
// create a list item (can be a subclass of wxMacListBoxItem)
virtual void MacSetColumnInfo( unsigned int row, unsigned int column, wxListItem* item );
virtual void MacGetColumnInfo( unsigned int row, unsigned int column, wxListItem& item );
virtual void UpdateState(wxMacDataItem* dataItem, wxListItem* item);
+ int GetFlags() { return m_flags; }
protected:
// we need to override to provide specialized handling for virtual wxListCtrls
const Rect *theRect,
SInt16 gdDepth,
Boolean colorDevice);
-
+
virtual void DrawItem(DataBrowserItemID itemID,
DataBrowserPropertyID property,
DataBrowserItemState itemState,
Rect *maxEditTextRect,
Boolean *shrinkToFit);
- static pascal Boolean DataBrowserHitTestProc(ControlRef browser,
- DataBrowserItemID itemID,
- DataBrowserPropertyID property,
- const Rect *theRect,
- const Rect *mouseRect) { return true; }
+ static pascal Boolean DataBrowserHitTestProc(ControlRef WXUNUSED(browser),
+ DataBrowserItemID WXUNUSED(itemID),
+ DataBrowserPropertyID WXUNUSED(property),
+ const Rect *WXUNUSED(theRect),
+ const Rect *WXUNUSED(mouseRect)) { return true; }
virtual bool ConfirmEditText(DataBrowserItemID item,
DataBrowserPropertyID property,
Rect *maxEditTextRect,
Boolean *shrinkToFit);
-
+
wxClientDataType m_clientDataItemsType;
bool m_isVirtual;
-
+ int m_flags;
+ DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacDataBrowserListCtrlControl)
};
-class wxMacListCtrlEventDelegate : public wxEvtHandler
+class wxMacListCtrlEventDelegate : public wxEvtHandler
{
public:
wxMacListCtrlEventDelegate( wxListCtrl* list, int id );
virtual bool ProcessEvent( wxEvent& event );
-
+
private:
wxListCtrl* m_list;
int m_id;
// we present ourselves as wxListCtrl.
event.SetEventObject( m_list );
event.SetId( m_id );
-
+
if ( !event.IsKindOf( CLASSINFO( wxCommandEvent ) ) )
{
- if (m_list->GetEventHandler()->ProcessEvent( event ))
+ if (m_list->HandleWindowEvent( event ))
return true;
- }
+ }
return wxEvtHandler::ProcessEvent(event);
}
m_aboutToFinish = false;
wxRect rectLabel;
+ int offset = 8;
owner->GetItemRect(itemEdit, rectLabel);
m_text->Create(owner, wxID_ANY, m_startValue,
- wxPoint(rectLabel.x+8,rectLabel.y),
- wxSize(rectLabel.width,rectLabel.height));
+ wxPoint(rectLabel.x+offset,rectLabel.y),
+ wxSize(rectLabel.width-offset,rectLabel.height));
m_text->SetFocus();
m_text->PushEventHandler(this);
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()
// ============================================================================
wxMacListControl* wxListCtrl::GetPeer() const
{
- return dynamic_cast<wxMacListControl*>(m_peer);
+ wxMacDataBrowserListCtrlControl *lb = wxDynamicCast(m_peer,wxMacDataBrowserListCtrlControl);
+ return lb ? wx_static_cast(wxMacListControl*,lb) : 0 ;
}
// ----------------------------------------------------------------------------
m_current = -1;
m_textctrlWrapper->AcceptChangesAndFinish();
}
-
+
int hitResult;
long current = HitTest(event.GetPosition(), hitResult);
if ((current == m_current) &&
event.Skip();
}
+#if wxABI_VERSION >= 20801
+void wxListCtrl::OnRightDown(wxMouseEvent& event)
+{
+ if (m_dbImpl)
+ FireMouseEvent(wxEVT_COMMAND_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());
+ event.Skip();
+}
+
+void wxListCtrl::FireMouseEvent(wxEventType eventType, wxPoint position)
+{
+ wxListEvent le( eventType, GetId() );
+ le.SetEventObject(this);
+ le.m_pointDrag = position;
+ le.m_itemIndex = -1;
+
+ int flags;
+ long item = HitTest(position, flags);
+ if (flags & wxLIST_HITTEST_ONITEM)
+ {
+ le.m_itemIndex = item;
+ le.m_item.m_itemId = item;
+ GetItem(le.m_item);
+ HandleWindowEvent(le);
+ }
+}
+
+void wxListCtrl::OnChar(wxKeyEvent& event)
+{
+
+
+ if (m_dbImpl)
+ {
+ wxListEvent le( wxEVT_COMMAND_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.
+ switch ( event.GetKeyCode() )
+ {
+ case WXK_UP:
+ if ( m_current > 0 )
+ m_current -= 1;
+ else
+ m_current = 0;
+
+ break;
+
+ case WXK_DOWN:
+ if ( m_current < GetItemCount() - 1 )
+ m_current += 1;
+ else
+ m_current = GetItemCount() - 1;
+
+ break;
+ }
+
+ if (m_current != -1)
+ {
+ le.m_itemIndex = m_current;
+ le.m_item.m_itemId = m_current;
+ GetItem(le.m_item);
+ HandleWindowEvent(le);
+ }
+ }
+ event.Skip();
+}
+#endif
+
bool wxListCtrl::Create(wxWindow *parent,
wxWindowID id,
const wxPoint& pos,
// for now, we'll always use the generic list control for ICON and LIST views,
// because they dynamically change the number of columns on resize.
// Also, allow the user to set it to use the list ctrl as well.
- // Also, use generic list control in VIRTUAL mode.
if ( (wxSystemOptions::HasOption( wxMAC_ALWAYS_USE_GENERIC_LISTCTRL )
&& (wxSystemOptions::GetOptionInt( wxMAC_ALWAYS_USE_GENERIC_LISTCTRL ) == 1)) ||
(style & wxLC_ICON) || (style & wxLC_SMALL_ICON) || (style & wxLC_LIST) )
{
m_macIsUserPane = true;
- if ( !wxWindow::Create(parent, id, pos, size, style & wxNO_BORDER, name) )
+ long paneStyle = style;
+ paneStyle &= ~wxSIMPLE_BORDER;
+ paneStyle &= ~wxDOUBLE_BORDER;
+ paneStyle &= ~wxSUNKEN_BORDER;
+ paneStyle &= ~wxRAISED_BORDER;
+ paneStyle &= ~wxSTATIC_BORDER;
+ if ( !wxWindow::Create(parent, id, pos, size, paneStyle | wxNO_BORDER, name) )
return false;
- m_genericImpl = new wxGenericListCtrlHook(this, id, pos, size, style, validator, name);
+
+ // since the generic control is a child, make sure we position it at 0, 0
+ m_genericImpl = new wxGenericListCtrlHook(this, id, wxPoint(0, 0), size, style, validator, name);
m_genericImpl->PushEventHandler( new wxMacListCtrlEventDelegate( this, GetId() ) );
return true;
}
else
{
m_macIsUserPane = false;
-
- if ( !wxWindow::Create(parent, id, pos, size, style, name) )
+ 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;
-
+
MacPostControlCreate( pos, size );
-
+
InstallControlEventHandler( m_peer->GetControlRef() , GetwxMacListCtrlEventHandlerUPP(),
GetEventTypeCount(eventList), eventList, this,
(EventHandlerRef *)&m_macListCtrlEventHandler);
{
if (m_genericImpl)
{
- m_genericImpl->PopEventHandler(/* deleteHandler = */ true);
+ m_genericImpl->PopEventHandler(/* deleteHandler = */ true);
}
-
+
if (m_ownsImageListNormal)
delete m_imageListNormal;
if (m_ownsImageListSmall)
delete m_imageListSmall;
if (m_ownsImageListState)
delete m_imageListState;
-
+
delete m_renameTimer;
}
wxControl::DoSetSize(x, y, width, height, sizeFlags);
if (m_genericImpl)
- m_genericImpl->SetSize(x, y, width, height, sizeFlags);
+ m_genericImpl->SetSize(0, 0, width, height, sizeFlags);
+
+ // determine if we need a horizontal scrollbar, and add it if so
+ if (m_dbImpl)
+ {
+ int totalWidth = 0;
+ for (int column = 0; column < GetColumnCount(); column++)
+ {
+ totalWidth += m_dbImpl->GetColumnWidth( column );
+ }
+
+ if ( !(m_dbImpl->GetFlags() & wxHSCROLL) )
+ {
+ Boolean vertScrollBar;
+ GetDataBrowserHasScrollBars( m_dbImpl->GetControlRef(), NULL, &vertScrollBar );
+ if (totalWidth > width)
+ SetDataBrowserHasScrollBars( m_dbImpl->GetControlRef(), true, vertScrollBar );
+ else
+ SetDataBrowserHasScrollBars( m_dbImpl->GetControlRef(), false, vertScrollBar );
+ }
+ }
}
wxSize wxListCtrl::DoGetBestSize() const
{
- if (m_genericImpl)
- return m_genericImpl->GetBestSize();
-
return wxWindow::DoGetBestSize();
}
return m_genericImpl->GetBackgroundColour();
if (m_dbImpl)
return m_bgColor;
-
+
return wxNullColour;
}
if (m_dbImpl)
{
-
wxColumnList::compatibility_iterator node = m_colsInfo.Item( col );
wxASSERT_MSG( node, _T("invalid column index in wxMacListCtrlItem") );
wxListItem* column = node->GetData();
-
+
long mask = column->GetMask();
if (mask & wxLIST_MASK_TEXT)
item.SetText(column->GetText());
if (m_dbImpl)
{
+ long mask = item.GetMask();
if ( col >= (int)m_colsInfo.GetCount() )
{
wxListItem* listItem = new wxListItem(item);
{
wxListItem listItem;
GetColumn( col, listItem );
- long mask = item.GetMask();
+
if (mask & wxLIST_MASK_TEXT)
listItem.SetText(item.GetText());
if (mask & wxLIST_MASK_DATA)
if (mask & wxLIST_MASK_WIDTH)
listItem.SetWidth(item.GetWidth());
}
-
+
// change the appearance in the databrowser.
DataBrowserListViewHeaderDesc columnDesc;
columnDesc.version=kDataBrowserListViewLatestHeaderDesc;
verify_noerr( m_dbImpl->GetHeaderDesc( kMinColumnId + col, &columnDesc ) );
-
+
/*
if (item.GetMask() & wxLIST_MASK_TEXT)
{
enc = m_font.GetEncoding();
else
enc = wxLocale::GetSystemEncoding();
- wxMacCFStringHolder cfTitle;
+ wxCFStringRef cfTitle;
cfTitle.Assign( item.GetText() , enc );
- if(columnDesc.titleString)
+ if(columnDesc.titleString)
CFRelease(columnDesc.titleString);
- columnDesc.titleString = cfTitle;
+ columnDesc.titleString = cfTitle;
}
*/
-
+
if (item.GetMask() & wxLIST_MASK_IMAGE && item.GetImage() != -1 )
{
- columnDesc.btnContentInfo.contentType = kControlContentIconRef;
wxImageList* imageList = GetImageList(wxIMAGE_LIST_SMALL);
if (imageList && imageList->GetImageCount() > 0 )
{
wxBitmap bmp = imageList->GetBitmap( item.GetImage() );
- IconRef icon = bmp.GetBitmapData()->GetIconRef();
+ IconRef icon = bmp.GetIconRef();
columnDesc.btnContentInfo.u.iconRef = icon;
+ columnDesc.btnContentInfo.contentType = kControlContentIconRef;
}
}
-
+
verify_noerr( m_dbImpl->SetHeaderDesc( kMinColumnId + col, &columnDesc ) );
}
{
for (int column = 0; column < GetColumnCount(); column++)
{
+ wxListItem colInfo;
+ GetColumn(col, colInfo);
+
+ colInfo.SetWidth(width);
+ SetColumn(col, colInfo);
+
m_dbImpl->SetColumnWidth(col, mywidth);
}
}
- else{
+ else
+ {
+ wxListItem colInfo;
+ GetColumn(col, colInfo);
+
+ colInfo.SetWidth(width);
+ SetColumn(col, colInfo);
m_dbImpl->SetColumnWidth(col, mywidth);
}
return true;
if (m_dbImpl)
{
+ UInt16 height = 1;
+ m_dbImpl->GetDefaultRowHeight( &height );
+ if (height > 0)
+ return GetClientSize().y / height;
}
return 1;
if (m_dbImpl)
{
if (!IsVirtual())
- m_dbImpl->MacGetColumnInfo(info.m_itemId, info.m_col, info);
+ {
+ if (info.m_itemId >= 0 && info.m_itemId < GetItemCount())
+ {
+ m_dbImpl->MacGetColumnInfo(info.m_itemId, info.m_col, info);
+ if (info.GetMask() & wxLIST_MASK_STATE)
+ {
+ DataBrowserItemID id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(info.m_itemId);
+ if (IsDataBrowserItemSelected( m_dbImpl->GetControlRef(), id ))
+ info.SetState(info.GetState() | wxLIST_STATE_SELECTED);
+ }
+ }
+ }
else
{
- info.SetText( OnGetItemText(info.m_itemId, info.m_col) );
- info.SetImage( OnGetItemColumnImage(info.m_itemId, info.m_col) );
- wxListItemAttr* attrs = OnGetItemAttr( info.m_itemId );
- if (attrs)
+ if (info.m_itemId >= 0 && info.m_itemId < GetItemCount())
{
- info.SetFont( attrs->GetFont() );
- info.SetBackgroundColour( attrs->GetBackgroundColour() );
- info.SetTextColour( attrs->GetTextColour() );
+ info.SetText( OnGetItemText(info.m_itemId, info.m_col) );
+ info.SetImage( OnGetItemColumnImage(info.m_itemId, info.m_col) );
+ if (info.GetMask() & wxLIST_MASK_STATE)
+ {
+ if (IsDataBrowserItemSelected( m_dbImpl->GetControlRef(), info.m_itemId+1 ))
+ info.SetState(info.GetState() | wxLIST_STATE_SELECTED);
+ }
+
+ wxListItemAttr* attrs = OnGetItemAttr( info.m_itemId );
+ if (attrs)
+ {
+ info.SetFont( attrs->GetFont() );
+ info.SetBackgroundColour( attrs->GetBackgroundColour() );
+ info.SetTextColour( attrs->GetTextColour() );
+ }
}
}
}
if (m_genericImpl)
return m_genericImpl->GetItemState(item, stateMask);
- wxListItem info;
+ if (m_dbImpl)
+ {
+ if ( HasFlag(wxLC_VIRTUAL) )
+ {
+ if (stateMask == wxLIST_STATE_SELECTED)
+ {
+ if (IsDataBrowserItemSelected( m_dbImpl->GetControlRef(), item+1 ))
+ return wxLIST_STATE_SELECTED;
+ else
+ return 0;
+ }
+ }
+ else
+ {
+ wxListItem info;
- info.m_mask = wxLIST_MASK_STATE;
- info.m_stateMask = stateMask;
- info.m_itemId = item;
+ info.m_mask = wxLIST_MASK_STATE;
+ info.m_stateMask = stateMask;
+ info.m_itemId = item;
- if (!GetItem(info))
- return 0;
+ if (!GetItem(info))
+ return 0;
+
+ return info.m_state;
+ }
+ }
- return info.m_state;
+ return 0;
}
// Sets the item state
if (m_genericImpl)
return m_genericImpl->SetItemState(item, state, stateMask);
- wxListItem info;
- info.m_mask = wxLIST_MASK_STATE;
- info.m_stateMask = stateMask;
- info.m_state = state;
- info.m_itemId = item;
- return SetItem(info);
+ if (m_dbImpl)
+ {
+ DataBrowserSetOption option = kDataBrowserItemsAdd;
+ if ( (stateMask & wxLIST_STATE_SELECTED) && state == 0 )
+ option = kDataBrowserItemsRemove;
+
+ if (item == -1)
+ {
+ if ( HasFlag(wxLC_VIRTUAL) )
+ {
+ wxMacDataItemBrowserSelectionSuppressor suppressor(m_dbImpl);
+ m_dbImpl->SetSelectedAllItems(option);
+ }
+ else
+ {
+ for(int i = 0; i < GetItemCount();i++)
+ {
+ wxListItem info;
+ info.m_itemId = i;
+ info.m_mask = wxLIST_MASK_STATE;
+ info.m_stateMask = stateMask;
+ info.m_state = state;
+ SetItem(info);
+ }
+ }
+ }
+ else
+ {
+ if ( HasFlag(wxLC_VIRTUAL) )
+ {
+ long itemID = item+1;
+ bool isSelected = IsDataBrowserItemSelected(m_dbImpl->GetControlRef(), (DataBrowserItemID)itemID );
+ bool isSelectedState = (state == wxLIST_STATE_SELECTED);
+
+ // toggle the selection state if wxListInfo state and actual state don't match.
+ if ( (stateMask & wxLIST_STATE_SELECTED) && isSelected != isSelectedState )
+ {
+ SetDataBrowserSelectedItems(m_dbImpl->GetControlRef(), 1, (DataBrowserItemID*)&itemID, option);
+ }
+ }
+ else
+ {
+ wxListItem info;
+ info.m_itemId = item;
+ info.m_mask = wxLIST_MASK_STATE;
+ info.m_stateMask = stateMask;
+ info.m_state = state;
+ return SetItem(info);
+ }
+ }
+ }
+ return true;
}
// Sets the item image
}
// Sets the item data
-bool wxListCtrl::SetItemData(long item, long data)
+bool wxListCtrl::SetItemPtrData(long item, wxUIntPtr data)
{
if (m_genericImpl)
return m_genericImpl->SetItemData(item, data);
part = kDataBrowserPropertyTextPart;
else if ( code == wxLIST_RECT_ICON )
part = kDataBrowserPropertyIconPart;
-
+
if ( !(GetWindowStyleFlag() & wxLC_VIRTUAL) )
{
wxMacDataItem* thisItem = m_dbImpl->GetItemFromLine(item);
id = (DataBrowserItemID) thisItem;
}
else
- id = item;
-
+ id = item+1;
+
GetDataBrowserItemPartBounds( m_dbImpl->GetControlRef(), id, col, part, &bounds );
-
+
rect.x = bounds.left;
rect.y = bounds.top;
rect.width = bounds.right - bounds.left; //GetClientSize().x; // we need the width of the whole row, not just the item.
return m_genericImpl->GetItemPosition(item, pos);
bool success = false;
-
+
if (m_dbImpl)
{
wxRect itemRect;
if (m_genericImpl)
return m_genericImpl->GetTopItem();
+ if (m_dbImpl)
+ {
+ int flags = 0;
+ long item = HitTest( wxPoint(1, 1), flags);
+ if (flags == wxLIST_HITTEST_ONITEM)
+ return item;
+ }
+
return 0;
}
if (m_genericImpl)
return m_genericImpl->GetNextItem(item, geom, state);
- if (m_dbImpl && geom == wxLIST_NEXT_ALL && state == wxLIST_STATE_SELECTED )
+ // TODO: implement all geometry and state options?
+ if ( m_dbImpl )
{
- long count = m_dbImpl->MacGetCount() ;
- for ( long line = item + 1 ; line < count; line++ )
+ if ( geom == wxLIST_NEXT_ALL || geom == wxLIST_NEXT_BELOW )
{
- wxMacDataItem* id = m_dbImpl->GetItemFromLine(line);
- if ( m_dbImpl->IsItemSelected(id ) )
- return line;
+ long count = m_dbImpl->MacGetCount() ;
+ for ( long line = item + 1 ; line < count; line++ )
+ {
+ DataBrowserItemID id = line + 1;
+ if ( !IsVirtual() )
+ id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(line);
+
+ if ( (state == wxLIST_STATE_DONTCARE ) )
+ return line;
+
+ if ( (state & wxLIST_STATE_SELECTED) && IsDataBrowserItemSelected(m_dbImpl->GetControlRef(), id ) )
+ return line;
+ }
+ }
+
+ if ( geom == wxLIST_NEXT_ABOVE )
+ {
+ int item2 = item;
+ if ( item2 == -1 )
+ item2 = m_dbImpl->MacGetCount();
+
+ for ( long line = item2 - 1 ; line >= 0; line-- )
+ {
+ DataBrowserItemID id = line + 1;
+ if ( !IsVirtual() )
+ id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(line);
+
+ if ( (state == wxLIST_STATE_DONTCARE ) )
+ return line;
+
+ if ( (state & wxLIST_STATE_SELECTED) && IsDataBrowserItemSelected(m_dbImpl->GetControlRef(), id ) )
+ return line;
+ }
}
- return -1;
}
- return 0;
+ return -1;
}
wxListEvent event( wxEVT_COMMAND_LIST_DELETE_ITEM, GetId() );
event.SetEventObject( this );
event.m_itemIndex = item;
- GetEventHandler()->ProcessEvent( event );
+ HandleWindowEvent( event );
}
return true;
m_dbImpl->MacClear();
wxListEvent event( wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, GetId() );
event.SetEventObject( this );
- GetEventHandler()->ProcessEvent( event );
+ HandleWindowEvent( event );
}
return true;
}
m_dbImpl->GetColumnCount(&cols);
for (UInt32 col = 0; col < cols; col++)
{
- DeleteColumn(col);
+ DeleteColumn(0);
}
}
wxASSERT_MSG( textControlClass->IsKindOf(CLASSINFO(wxTextCtrl)),
wxT("EditLabel() needs a text control") );
- long itemEdit = (long)item;
-
wxListEvent le( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, GetParent()->GetId() );
le.SetEventObject( this );
le.m_itemIndex = item;
le.m_col = 0;
GetItem( le.m_item );
- if ( GetParent()->GetEventHandler()->ProcessEvent( le ) && !le.IsAllowed() )
+ if ( GetParent()->HandleWindowEvent( le ) && !le.IsAllowed() )
{
// vetoed by user code
return NULL;
}
// End label editing, optionally cancelling the edit
-bool wxListCtrl::EndEditLabel(bool cancel)
+bool wxListCtrl::EndEditLabel(bool WXUNUSED(cancel))
{
// TODO: generic impl. doesn't have this method - is it needed for us?
if (m_genericImpl)
if (m_genericImpl)
return m_genericImpl->FindItem(start, str, partial);
- return -1;
+ wxString str_upper = str.Upper();
+
+ long idx = start;
+ if (idx < 0)
+ idx = 0;
+ long count = GetItemCount();
+
+ while (idx < count)
+ {
+ wxString line_upper = GetItemText(idx).Upper();
+ if (!partial)
+ {
+ if (line_upper == str_upper )
+ return idx;
+ }
+ else
+ {
+ if (line_upper.find(str_upper) == 0)
+ return idx;
+ }
+
+ idx++;
+ };
+
+ return wxNOT_FOUND;
}
// Find an item whose data matches this data, starting from the item after 'start'
if (m_genericImpl)
return m_genericImpl->FindItem(start, data);
- long idx = start + 1;
+ long idx = start;
+ if (idx < 0)
+ idx = 0;
long count = GetItemCount();
while (idx < count)
idx++;
};
- return -1;
+ return wxNOT_FOUND;
}
// Find an item nearest this position in the specified direction, starting from
int colHeaderHeight = 22; // TODO: Find a way to get this value from the db control?
UInt16 rowHeight = 0;
m_dbImpl->GetDefaultRowHeight(&rowHeight);
-
+
int y = point.y;
// get the actual row by taking scroll position into account
UInt32 offsetX, offsetY;
m_dbImpl->GetScrollPosition( &offsetY, &offsetX );
y += offsetY;
-
+
if ( !(GetWindowStyleFlag() & wxLC_NO_HEADER) )
y -= colHeaderHeight;
-
+
+ if ( y < 0 )
+ return -1;
+
int row = y / rowHeight;
DataBrowserItemID id;
m_dbImpl->GetItemID( (DataBrowserTableViewRowIndex) row, &id );
-
+
// TODO: Use GetDataBrowserItemPartBounds to return if we are in icon or label
if ( !(GetWindowStyleFlag() & wxLC_VIRTUAL ) )
{
return row;
}
}
-
+
}
return -1;
}
+int wxListCtrl::GetScrollPos(int orient) const
+{
+ if (m_genericImpl)
+ return m_genericImpl->GetScrollPos(orient);
+
+ if (m_dbImpl)
+ {
+ UInt32 offsetX, offsetY;
+ m_dbImpl->GetScrollPosition( &offsetY, &offsetX );
+ if ( orient == wxHORIZONTAL )
+ return offsetX;
+ else
+ return offsetY;
+ }
+
+ return 0;
+}
// Inserts an item, returning the index of the new item if successful,
// -1 otherwise.
if (m_genericImpl)
return m_genericImpl->InsertItem(info);
- if (m_dbImpl)
+ if (m_dbImpl && !IsVirtual())
{
int count = GetItemCount();
info.m_itemId = count;
m_dbImpl->MacInsertItem(info.m_itemId, &info );
+
wxListEvent event( wxEVT_COMMAND_LIST_INSERT_ITEM, GetId() );
event.SetEventObject( this );
event.m_itemIndex = info.m_itemId;
- GetEventHandler()->ProcessEvent( event );
+ HandleWindowEvent( event );
+ return info.m_itemId;
}
-
- return info.m_itemId;
+ return -1;
}
long wxListCtrl::InsertItem(long index, const wxString& label)
{
if (m_genericImpl)
return m_genericImpl->SortItems(fn, data);
-
+
if (m_dbImpl)
{
m_compareFunc = fn;
m_compareFuncData = data;
+ SortDataBrowserContainer( m_dbImpl->GetControlRef(), kDataBrowserNoItem, true);
+
+ // we need to do this after each call, else we get a crash from wxPython when
+ // SortItems is called the second time.
+ m_compareFunc = NULL;
+ m_compareFuncData = 0;
}
return true;
GetItem( le.m_item );
le.m_item.m_text = value;
- return !GetEventHandler()->ProcessEvent( le ) ||
+ return !HandleWindowEvent( le ) ||
le.IsAllowed();
}
le.m_itemIndex = itemEdit;
GetItem( le.m_item );
- GetEventHandler()->ProcessEvent( le );
+ HandleWindowEvent( le );
}
// ----------------------------------------------------------------------------
// we need to temporarily disable the new item creation notification
// procedure to speed things up
// FIXME: Even this doesn't seem to help much...
+
+ // FIXME: Find a more efficient way to do this.
+ m_dbImpl->MacClear();
+
DataBrowserCallbacks callbacks;
DataBrowserItemNotificationUPP itemUPP;
GetDataBrowserCallbacks(m_dbImpl->GetControlRef(), &callbacks);
RefreshRect(rect);
}
+void wxListCtrl::SetDropTarget( wxDropTarget *dropTarget )
+{
+#if wxUSE_DRAG_AND_DROP
+ if (m_genericImpl)
+ m_genericImpl->SetDropTarget( dropTarget );
+
+ if (m_dbImpl)
+ wxWindow::SetDropTarget( dropTarget );
+#endif
+}
+
+wxDropTarget *wxListCtrl::GetDropTarget() const
+{
+#if wxUSE_DRAG_AND_DROP
+ if (m_genericImpl)
+ return m_genericImpl->GetDropTarget();
+
+ if (m_dbImpl)
+ return wxWindow::GetDropTarget();
+#endif
+ return NULL;
+}
+
+#if wxABI_VERSION >= 20801
+void wxListCtrl::SetFocus()
+{
+ if (m_genericImpl)
+ {
+ m_genericImpl->SetFocus();
+ return;
+ }
+
+ wxWindow::SetFocus();
+}
+#endif
// wxMac internal data structures
void wxMacListCtrlItem::Notification(wxMacDataItemBrowserControl *owner ,
DataBrowserItemNotification message,
- DataBrowserItemDataRef itemData ) const
+ DataBrowserItemDataRef WXUNUSED(itemData) ) const
{
- wxMacDataBrowserListCtrlControl *lb = dynamic_cast<wxMacDataBrowserListCtrlControl*>(owner);
+ wxMacDataBrowserListCtrlControl *lb = wxDynamicCast(owner, wxMacDataBrowserListCtrlControl);
// we want to depend on as little as possible to make sure tear-down of controls is safe
if ( message == kDataBrowserItemRemoved)
}
wxListCtrl *list = wxDynamicCast( owner->GetPeer() , wxListCtrl );
- if ( list )
+ if ( list && lb )
{
bool trigger = false;
event.SetEventObject( list );
event.m_itemIndex = owner->GetLineFromItem( this ) ;
- if ( !list->IsVirtual() )
- {
- lb->MacGetColumnInfo(event.m_itemIndex,0,event.m_item);
- }
+ event.m_item.m_itemId = event.m_itemIndex;
+ list->GetItem(event.m_item);
switch (message)
{
}
+IMPLEMENT_DYNAMIC_CLASS(wxMacDataBrowserListCtrlControl, wxMacDataItemBrowserControl )
+
wxMacDataBrowserListCtrlControl::wxMacDataBrowserListCtrlControl( wxWindow *peer, const wxPoint& pos, const wxSize& size, long style)
: wxMacDataItemBrowserControl( peer, pos, size, style )
{
OSStatus err = noErr;
m_clientDataItemsType = wxClientData_None;
m_isVirtual = false;
+ m_flags = 0;
if ( style & wxLC_VIRTUAL )
m_isVirtual = true;
err = SetSelectionFlags( options );
verify_noerr( err );
-
+
DataBrowserCustomCallbacks callbacks;
InitializeDataBrowserCustomCallbacks( &callbacks, kDataBrowserLatestCustomCallbacks );
if ( gDataBrowserDrawItemUPP == NULL )
gDataBrowserDrawItemUPP = NewDataBrowserDrawItemUPP(DataBrowserDrawItemProc);
-// if ( gDataBrowserEditItemUPP == NULL )
-// gDataBrowserEditItemUPP = NewDataBrowserEditItemUPP(DataBrowserEditTextProc);
-
if ( gDataBrowserHitTestUPP == NULL )
gDataBrowserHitTestUPP = NewDataBrowserHitTestUPP(DataBrowserHitTestProc);
-
+
callbacks.u.v1.drawItemCallback = gDataBrowserDrawItemUPP;
-// callbacks.u.v1.editTextCallback = gDataBrowserEditItemUPP;
callbacks.u.v1.hitTestCallback = gDataBrowserHitTestUPP;
-
+
SetDataBrowserCustomCallbacks( GetControlRef(), &callbacks );
if ( style & wxLC_LIST )
SetSortProperty( kMinColumnId - 1 );
else
SetSortProperty( kMinColumnId );
- if ( style & wxLC_SORT_ASCENDING )
- {
- m_sortOrder = SortOrder_Text_Ascending;
- SetSortOrder( kDataBrowserOrderIncreasing );
- }
- else if ( style & wxLC_SORT_DESCENDING )
+
+ m_sortOrder = SortOrder_None;
+
+ if ( style & wxLC_SORT_DESCENDING )
{
- m_sortOrder = SortOrder_Text_Descending;
SetSortOrder( kDataBrowserOrderDecreasing );
}
- else
+ else if ( style & wxLC_SORT_ASCENDING )
{
- m_sortOrder = SortOrder_None;
+ SetSortOrder( kDataBrowserOrderIncreasing );
}
if ( style & wxLC_VRULES )
{
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
verify_noerr( DataBrowserChangeAttributes(m_controlRef, kDataBrowserAttributeListViewDrawColumnDividers, kDataBrowserAttributeNone) );
-#endif
}
verify_noerr( SetHiliteStyle(kDataBrowserTableViewFillHilite ) );
- err = SetHasScrollBars( (style & wxHSCROLL) != 0 , true );
+ verify_noerr( SetHasScrollBars( (style & wxHSCROLL) != 0 , true ) );
}
pascal Boolean wxMacDataBrowserListCtrlControl::DataBrowserEditTextProc(
Boolean *shrinkToFit)
{
Boolean result = false;
- wxMacDataBrowserListCtrlControl* ctl = dynamic_cast<wxMacDataBrowserListCtrlControl*>( wxMacControl::GetReferenceFromNativeControl( browser ) );
+ wxMacDataBrowserListCtrlControl* ctl = wxDynamicCast(wxMacControl::GetReferenceFromNativeControl( browser ), wxMacDataBrowserListCtrlControl);
if ( ctl != 0 )
{
result = ctl->ConfirmEditText(itemID, property, theString, maxEditTextRect, shrinkToFit);
}
bool wxMacDataBrowserListCtrlControl::ConfirmEditText(
- DataBrowserItemID itemID,
- DataBrowserPropertyID property,
- CFStringRef theString,
- Rect *maxEditTextRect,
- Boolean *shrinkToFit)
+ DataBrowserItemID WXUNUSED(itemID),
+ DataBrowserPropertyID WXUNUSED(property),
+ CFStringRef WXUNUSED(theString),
+ Rect *WXUNUSED(maxEditTextRect),
+ Boolean *WXUNUSED(shrinkToFit))
{
- //wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl );
return false;
}
SInt16 gdDepth,
Boolean colorDevice)
{
- wxMacDataBrowserListCtrlControl* ctl = dynamic_cast<wxMacDataBrowserListCtrlControl*>( wxMacControl::GetReferenceFromNativeControl( browser ) );
+ wxMacDataBrowserListCtrlControl* ctl = wxDynamicCast(wxMacControl::GetReferenceFromNativeControl( browser ), wxMacDataBrowserListCtrlControl);
if ( ctl != 0 )
{
ctl->DrawItem(itemID, property, itemState, itemRect, gdDepth, colorDevice);
kIconHeight = 16,
kTextBoxHeight = 14,
kIconTextSpacingV = 2,
- kItemPadding = 4,
+ kItemPadding = 4,
kContentHeight = kIconHeight + kTextBoxHeight + kIconTextSpacingV
};
iconW = kIconWidth;
padding = padding*2;
}
-
+
textBottom = inItemRect.origin.y;
-
- *outIconRect = CGRectMake(inItemRect.origin.x + kItemPadding,
- textBottom + kIconTextSpacingV, kIconWidth,
+
+ *outIconRect = CGRectMake(inItemRect.origin.x + kItemPadding,
+ textBottom + kIconTextSpacingV, kIconWidth,
kIconHeight);
-
- *outTextRect = CGRectMake(inItemRect.origin.x + padding + iconW,
- textBottom + kIconTextSpacingV, inItemRect.size.width - padding - iconW,
+
+ *outTextRect = CGRectMake(inItemRect.origin.x + padding + iconW,
+ textBottom + kIconTextSpacingV, inItemRect.size.width - padding - iconW,
inItemRect.size.height - kIconTextSpacingV);
}
DataBrowserItemID itemID,
DataBrowserPropertyID property,
DataBrowserItemState itemState,
- const Rect *itemRect,
+ const Rect *WXUNUSED(itemRect),
SInt16 gdDepth,
Boolean colorDevice)
{
lcItem = (wxMacListCtrlItem*) itemID;
if (lcItem->HasColumnInfo(listColumn)){
wxListItem* item = lcItem->GetColumnInfo(listColumn);
-
+
// we always use the 0 column to get font and text/background colors.
if (lcItem->HasColumnInfo(0))
{
bgColor = firstItem->GetBackgroundColour();
font = firstItem->GetFont();
}
-
+
if (item->GetMask() & wxLIST_MASK_TEXT)
text = item->GetText();
if (item->GetMask() & wxLIST_MASK_IMAGE)
imgIndex = item->GetImage();
}
-
+
}
else
{
- text = list->OnGetItemText( (long)itemID-1, listColumn );
- imgIndex = list->OnGetItemColumnImage( (long)itemID-1, listColumn );
- wxListItemAttr* attrs = list->OnGetItemAttr( (long)itemID-1 );
- if (attrs)
+ long itemNum = (long)itemID-1;
+ if (itemNum >= 0 && itemNum < list->GetItemCount())
{
- if (attrs->HasBackgroundColour())
- bgColor = attrs->GetBackgroundColour();
- if (attrs->HasTextColour())
- color = attrs->GetTextColour();
- if (attrs->HasFont())
- font = attrs->GetFont();
+ text = list->OnGetItemText( itemNum, listColumn );
+ imgIndex = list->OnGetItemColumnImage( itemNum, listColumn );
+ wxListItemAttr* attrs = list->OnGetItemAttr( itemNum );
+ if (attrs)
+ {
+ if (attrs->HasBackgroundColour())
+ bgColor = attrs->GetBackgroundColour();
+ if (attrs->HasTextColour())
+ color = attrs->GetTextColour();
+ if (attrs->HasFont())
+ font = attrs->GetFont();
+ }
}
}
}
-
+
wxColour listBgColor = list->GetBackgroundColour();
if (bgColor == wxNullColour)
bgColor = listBgColor;
-
+
wxFont listFont = list->GetFont();
if (font == wxNullFont)
font = listFont;
-
- wxMacCFStringHolder cfString;
- cfString.Assign( text, wxLocale::GetSystemEncoding() );
-
+
+ wxCFStringRef cfString( text, wxLocale::GetSystemEncoding() );
+
Rect enclosingRect;
CGRect enclosingCGRect, iconCGRect, textCGRect;
Boolean active;
ThemeDrawingState savedState = NULL;
CGContextRef context = (CGContextRef)list->MacGetDrawingContext();
RGBColor labelColor;
-
- GetDataBrowserItemPartBounds(GetControlRef(), itemID, property, kDataBrowserPropertyEnclosingPart,
+ labelColor.red = 0;
+ labelColor.green = 0;
+ labelColor.blue = 0;
+
+ RGBColor backgroundColor;
+ backgroundColor.red = 255;
+ backgroundColor.green = 255;
+ backgroundColor.blue = 255;
+
+ GetDataBrowserItemPartBounds(GetControlRef(), itemID, property, kDataBrowserPropertyEnclosingPart,
&enclosingRect);
-
- enclosingCGRect = CGRectMake(enclosingRect.left,
- enclosingRect.top,
- enclosingRect.right - enclosingRect.left,
+
+ enclosingCGRect = CGRectMake(enclosingRect.left,
+ enclosingRect.top,
+ enclosingRect.right - enclosingRect.left,
enclosingRect.bottom - enclosingRect.top);
+ bool hasFocus = (wxWindow::FindFocus() == list);
active = IsControlActive(GetControlRef());
+ // don't paint the background over the vertical rule line
+ if ( list->GetWindowStyleFlag() & wxLC_VRULES )
+ {
+ enclosingCGRect.origin.x += 1;
+ enclosingCGRect.size.width -= 1;
+ }
if (itemState == kDataBrowserItemIsSelected)
{
- RGBColor foregroundColor;
-
- GetThemeDrawingState(&savedState);
- GetThemeBrushAsColor(kThemeBrushAlternatePrimaryHighlightColor, 32, true, &foregroundColor);
- GetThemeTextColor(kThemeTextColorWhite, gdDepth, colorDevice, &labelColor);
+ GetThemeDrawingState(&savedState);
+ if (active && hasFocus)
+ {
+ GetThemeBrushAsColor(kThemeBrushAlternatePrimaryHighlightColor, 32, true, &backgroundColor);
+ GetThemeTextColor(kThemeTextColorWhite, gdDepth, colorDevice, &labelColor);
+ }
+ else
+ {
+ GetThemeBrushAsColor(kThemeBrushSecondaryHighlightColor, 32, true, &backgroundColor);
+ GetThemeTextColor(kThemeTextColorBlack, gdDepth, colorDevice, &labelColor);
+ }
CGContextSaveGState(context);
-
- CGContextSetRGBFillColor(context, (float)foregroundColor.red / (float)USHRT_MAX,
- (float)foregroundColor.green / (float)USHRT_MAX,
- (float)foregroundColor.blue / (float)USHRT_MAX, 1.0);
+
+ CGContextSetRGBFillColor(context, (float)backgroundColor.red / (float)USHRT_MAX,
+ (float)backgroundColor.green / (float)USHRT_MAX,
+ (float)backgroundColor.blue / (float)USHRT_MAX, 1.0);
CGContextFillRect(context, enclosingCGRect);
-
+
CGContextRestoreGState(context);
}
else
- {
-
+ {
+
if (color.Ok())
- labelColor = MAC_WXCOLORREF( color.GetPixel() );
+ color.GetRGBColor(&labelColor);
else if (list->GetTextColour().Ok())
- labelColor = MAC_WXCOLORREF( list->GetTextColour().GetPixel() );
- else
- {
- labelColor.red = 0;
- labelColor.green = 0;
- labelColor.blue = 0;
- }
-
+ list->GetTextColour().GetRGBColor(&labelColor);
+
if (bgColor.Ok())
{
- RGBColor foregroundColor = MAC_WXCOLORREF( bgColor.GetPixel() );
+ bgColor.GetRGBColor(&backgroundColor);
CGContextSaveGState(context);
-
- CGContextSetRGBFillColor(context, (float)foregroundColor.red / (float)USHRT_MAX,
- (float)foregroundColor.green / (float)USHRT_MAX,
- (float)foregroundColor.blue / (float)USHRT_MAX, 1.0);
+
+ CGContextSetRGBFillColor(context, (float)backgroundColor.red / (float)USHRT_MAX,
+ (float)backgroundColor.green / (float)USHRT_MAX,
+ (float)backgroundColor.blue / (float)USHRT_MAX, 1.0);
CGContextFillRect(context, enclosingCGRect);
-
+
CGContextRestoreGState(context);
}
}
-
+
calculateCGDrawingBounds(enclosingCGRect, &iconCGRect, &textCGRect, (imgIndex != -1) );
-
+
if (imgIndex != -1)
{
wxImageList* imageList = list->GetImageList(wxIMAGE_LIST_SMALL);
if (imageList && imageList->GetImageCount() > 0){
wxBitmap bmp = imageList->GetBitmap(imgIndex);
- IconRef icon = bmp.GetBitmapData()->GetIconRef();
-
- RGBColor iconLabel;
- iconLabel.red = 0;
- iconLabel.green = 0;
- iconLabel.blue = 0;
-
+ IconRef icon = bmp.GetIconRef();
+
CGContextSaveGState(context);
CGContextTranslateCTM(context, 0,iconCGRect.origin.y + CGRectGetMaxY(iconCGRect));
CGContextScaleCTM(context,1.0f,-1.0f);
- PlotIconRefInContext(context, &iconCGRect, kAlignNone,
- active ? kTransformNone : kTransformDisabled, &iconLabel,
+ PlotIconRefInContext(context, &iconCGRect, kAlignNone,
+ active ? kTransformNone : kTransformDisabled, NULL,
kPlotIconRefNormalFlags, icon);
-
+
CGContextRestoreGState(context);
}
}
-
+
HIThemeTextHorizontalFlush hFlush = kHIThemeTextHorizontalFlushLeft;
- UInt16 fontID = kThemeViewsFont;
-
- if (font.Ok())
+ HIThemeTextInfo info;
+ bool setup = false;
+#if wxMAC_USE_CORE_TEXT
+ if ( UMAGetSystemVersion() >= 0x1050 )
{
- if (font.GetFamily() != wxFONTFAMILY_DEFAULT)
- fontID = font.MacGetThemeFontID();
-
-// FIXME: replace these with CG or ATSUI calls so we can remove this #ifndef.
-#ifndef __LP64__
- ::TextSize( (short)(font.MacGetFontSize()) ) ;
- ::TextFace( font.MacGetFontStyle() ) ;
+ info.version = kHIThemeTextInfoVersionOne;
+ info.fontID = kThemeViewsFont;
+ if (font.Ok())
+ {
+ info.fontID = kThemeSpecifiedFont;
+ info.font = (CTFontRef) font.MacGetCTFont();
+ setup = true;
+ }
+ }
#endif
+#if wxMAC_USE_ATSU_TEXT
+ if ( !setup )
+ {
+ info.version = kHIThemeTextInfoVersionZero;
+ info.fontID = kThemeViewsFont;
+
+ if (font.Ok())
+ {
+ if (font.GetFamily() != wxFONTFAMILY_DEFAULT)
+ info.fontID = font.MacGetThemeFontID();
+
+ ::TextSize( (short)(font.MacGetFontSize()) ) ;
+ ::TextFace( font.MacGetFontStyle() ) ;
+ }
}
-
+#endif
+
wxListItem item;
list->GetColumn(listColumn, item);
if (item.GetMask() & wxLIST_MASK_FORMAT)
{
if (item.GetAlign() == wxLIST_FORMAT_LEFT)
- hFlush = kHIThemeTextHorizontalFlushLeft;
+ hFlush = kHIThemeTextHorizontalFlushLeft;
else if (item.GetAlign() == wxLIST_FORMAT_CENTER)
- hFlush = kHIThemeTextHorizontalFlushCenter;
+ hFlush = kHIThemeTextHorizontalFlushCenter;
else if (item.GetAlign() == wxLIST_FORMAT_RIGHT)
{
hFlush = kHIThemeTextHorizontalFlushRight;
textCGRect.origin.x -= kItemPadding; // give a little extra paddding
}
}
-
- HIThemeTextInfo info;
- info.version = kHIThemeTextInfoVersionZero;
+
info.state = active ? kThemeStateActive : kThemeStateInactive;
- info.fontID = fontID;
info.horizontalFlushness = hFlush;
info.verticalFlushness = kHIThemeTextVerticalFlushCenter;
info.options = kHIThemeTextBoxOptionNone;
info.truncationMaxLines = 1;
CGContextSaveGState(context);
- CGContextSetRGBFillColor (context, (float)labelColor.red / (float)USHRT_MAX,
- (float)labelColor.green / (float)USHRT_MAX,
+ CGContextSetRGBFillColor (context, (float)labelColor.red / (float)USHRT_MAX,
+ (float)labelColor.green / (float)USHRT_MAX,
(float)labelColor.blue / (float)USHRT_MAX, 1.0);
-
- HIThemeDrawTextBox(cfString, &textCGRect, &info, context, kHIThemeOrientationNormal);
-
+
+ HIThemeDrawTextBox(cfString, &textCGRect, &info, context, kHIThemeOrientationNormal);
+
CGContextRestoreGState(context);
-
+
+#ifndef __LP64__
if (savedState != NULL)
SetThemeDrawingState(savedState, true);
+#endif
}
OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemID,
if (!m_isVirtual)
{
lcItem = (wxMacListCtrlItem*) itemID;
- if (lcItem->HasColumnInfo(listColumn)){
+ if (lcItem && lcItem->HasColumnInfo(listColumn)){
wxListItem* item = lcItem->GetColumnInfo(listColumn);
if (item->GetMask() & wxLIST_MASK_TEXT)
text = item->GetText();
}
else
{
- text = list->OnGetItemText( (long)itemID-1, listColumn );
- imgIndex = list->OnGetItemColumnImage( (long)itemID-1, listColumn );
+ long itemNum = (long)itemID-1;
+ if (itemNum >= 0 && itemNum < list->GetItemCount())
+ {
+ text = list->OnGetItemText( itemNum, listColumn );
+ imgIndex = list->OnGetItemColumnImage( itemNum, listColumn );
+ }
}
}
default :
if ( property >= kMinColumnId )
{
- wxMacCFStringHolder cfStr;
-
- if (text){
- cfStr.Assign( text, wxLocale::GetSystemEncoding() );
+ if (!text.IsEmpty()){
+ wxCFStringRef cfStr( text, wxLocale::GetSystemEncoding() );
err = ::SetDataBrowserItemDataText( itemData, cfStr );
err = noErr;
}
wxImageList* imageList = list->GetImageList(wxIMAGE_LIST_SMALL);
if (imageList && imageList->GetImageCount() > 0){
wxBitmap bmp = imageList->GetBitmap(imgIndex);
- IconRef icon = bmp.GetBitmapData()->GetIconRef();
+ IconRef icon = bmp.GetIconRef();
::SetDataBrowserItemDataIcon(itemData, icon);
}
}
// can then deal with the veto
CFStringRef sr ;
verify_noerr( GetDataBrowserItemDataText( itemData , &sr ) ) ;
- wxMacCFStringHolder cfStr(sr) ;;
+ wxCFStringRef cfStr(sr) ;;
if (m_isVirtual)
list->SetItem( (long)itemData-1 , listColumn, cfStr.AsString() ) ;
else
void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID,
DataBrowserItemNotification message,
- DataBrowserItemDataRef itemData )
+ DataBrowserItemDataRef WXUNUSED(itemData) )
{
// 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() );
- bool isSingle = (list->GetWindowStyle() & wxLC_SINGLE_SEL) != 0;
event.SetEventObject( list );
if ( !list->IsVirtual() )
DataBrowserTableViewRowIndex result = 0;
verify_noerr( GetItemRow( itemID, &result ) ) ;
event.m_itemIndex = result;
-
- if (event.m_itemIndex >= 0)
- MacGetColumnInfo(event.m_itemIndex,0,event.m_item);
}
else
{
- event.m_itemIndex = (long)itemID;
+ event.m_itemIndex = (long)itemID-1;
}
+ event.m_item.m_itemId = event.m_itemIndex;
+ list->GetItem(event.m_item);
switch (message)
{
case kDataBrowserItemDeselected:
event.SetEventType(wxEVT_COMMAND_LIST_ITEM_DESELECTED);
- if ( !isSingle )
- trigger = !IsSelectionSuppressed();
+ // as the generic implementation is also triggering this
+ // event for single selection, we do the same (different than listbox)
+ trigger = !IsSelectionSuppressed();
break;
case kDataBrowserItemSelected:
trigger = !IsSelectionSuppressed();
-
+
break;
case kDataBrowserItemDoubleClicked:
bool retval = false;
wxString itemText;
wxString otherItemText;
+ long itemOrder;
+ long otherItemOrder;
+
int colId = sortProperty - kMinColumnId;
- long itemNum = 0;
- long otherItemNum = 0;
wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl );
- // means we need to
+ DataBrowserSortOrder sort;
+ verify_noerr(GetSortOrder(&sort));
+
if (colId >= 0)
{
if (!m_isVirtual)
{
wxMacListCtrlItem* item = (wxMacListCtrlItem*)itemOneID;
wxMacListCtrlItem* otherItem = (wxMacListCtrlItem*)itemTwoID;
+
+ itemOrder = item->GetOrder();
+ otherItemOrder = item->GetOrder();
+
wxListCtrlCompare func = list->GetCompareFunc();
- if (func != NULL && item->HasColumnInfo(colId) && otherItem->HasColumnInfo(colId))
- return func(item->GetColumnInfo(colId)->GetData(), otherItem->GetColumnInfo(colId)->GetData(), list->GetCompareFuncData()) >= 0;
-
- itemNum = item->GetOrder();
- otherItemNum = otherItem->GetOrder();
- if (item->HasColumnInfo(colId))
- itemText = item->GetColumnInfo(colId)->GetText();
- if (otherItem->HasColumnInfo(colId))
- otherItemText = otherItem->GetColumnInfo(colId)->GetText();
+ if (func != NULL)
+ {
+ long item1 = -1;
+ long item2 = -1;
+ if (item && item->HasColumnInfo(0))
+ item1 = item->GetColumnInfo(0)->GetData();
+ if (otherItem && otherItem->HasColumnInfo(0))
+ item2 = otherItem->GetColumnInfo(0)->GetData();
+
+ if (item1 > -1 && item2 > -1)
+ {
+ int result = func(item1, item2, list->GetCompareFuncData());
+ if (sort == kDataBrowserOrderIncreasing)
+ return result >= 0;
+ else
+ return result < 0;
+ }
+ }
+
+ // we can't use the native control's sorting abilities, so just
+ // sort by item id.
+ return itemOrder < otherItemOrder;
}
else
{
- itemNum = (long)itemOneID;
- otherItemNum = (long)itemTwoID;
- itemText = list->OnGetItemText( itemNum-1, colId );
- otherItemText = list->OnGetItemText( otherItemNum-1, colId );
- }
+ long itemNum = (long)itemOneID;
+ long otherItemNum = (long)itemTwoID;
- DataBrowserSortOrder sort;
- verify_noerr(GetSortOrder(&sort));
-
- if ( sort == kDataBrowserOrderIncreasing )
- {
- retval = itemText.CmpNoCase( otherItemText ) > 0;
- }
- else if ( sort == kDataBrowserOrderDecreasing )
- {
- retval = itemText.CmpNoCase( otherItemText ) < 0;
+ // virtual listctrls don't support sorting
+ return itemNum < otherItemNum;
}
}
else{
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?") );
if (item)
{
- wxMacListCtrlItem* listItem = dynamic_cast<wxMacListCtrlItem*>(dataItem);
+ wxMacListCtrlItem* listItem = wx_static_cast(wxMacListCtrlItem*,dataItem);
+ bool hasInfo = listItem->HasColumnInfo( column );
listItem->SetColumnInfo( column, item );
+ listItem->SetOrder(row);
UpdateState(dataItem, item);
+
+ wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl );
+
+ // NB: When this call was made before a control was completely shown, it would
+ // update the item prematurely (i.e. no text would be listed) and, on show,
+ // only the sorted column would be refreshed, meaning only first column text labels
+ // 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 );
}
}
bool isSelectedState = (listItem->GetState() == wxLIST_STATE_SELECTED);
// toggle the selection state if wxListInfo state and actual state don't match.
- if ( isSelected != isSelectedState )
+ if ( listItem->GetMask() & wxLIST_MASK_STATE && isSelected != isSelectedState )
{
DataBrowserSetOption options = kDataBrowserItemsAdd;
if (!isSelectedState)
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?") );
// CS should this guard against dataItem = 0 ? , as item is not a pointer if (item) is not appropriate
//if (item)
{
- wxMacListCtrlItem* listItem = dynamic_cast<wxMacListCtrlItem*>(dataItem);
- wxListItem* oldItem = listItem->GetColumnInfo( column );
+ wxMacListCtrlItem* listItem =wx_static_cast(wxMacListCtrlItem*,dataItem);
- long mask = item.GetMask();
- if ( !mask )
- // by default, get everything for backwards compatibility
- mask = -1;
+ if (!listItem->HasColumnInfo( column ))
+ return;
- if ( mask & wxLIST_MASK_TEXT )
- item.SetText(oldItem->GetText());
- if ( mask & wxLIST_MASK_IMAGE )
- item.SetImage(oldItem->GetImage());
- if ( mask & wxLIST_MASK_DATA )
- item.SetData(oldItem->GetData());
- if ( mask & wxLIST_MASK_STATE )
- item.SetState(oldItem->GetState());
- if ( mask & wxLIST_MASK_WIDTH )
- item.SetWidth(oldItem->GetWidth());
- if ( mask & wxLIST_MASK_FORMAT )
- item.SetAlign(oldItem->GetAlign());
+ wxListItem* oldItem = listItem->GetColumnInfo( column );
- item.SetTextColour(oldItem->GetTextColour());
- item.SetBackgroundColour(oldItem->GetBackgroundColour());
- item.SetFont(oldItem->GetFont());
+ if (oldItem)
+ {
+ long mask = item.GetMask();
+ if ( !mask )
+ // by default, get everything for backwards compatibility
+ mask = -1;
+
+ if ( mask & wxLIST_MASK_TEXT )
+ item.SetText(oldItem->GetText());
+ if ( mask & wxLIST_MASK_IMAGE )
+ item.SetImage(oldItem->GetImage());
+ if ( mask & wxLIST_MASK_DATA )
+ item.SetData(oldItem->GetData());
+ if ( mask & wxLIST_MASK_STATE )
+ item.SetState(oldItem->GetState());
+ if ( mask & wxLIST_MASK_WIDTH )
+ item.SetWidth(oldItem->GetWidth());
+ if ( mask & wxLIST_MASK_FORMAT )
+ item.SetAlign(oldItem->GetAlign());
+
+ item.SetTextColour(oldItem->GetTextColour());
+ item.SetBackgroundColour(oldItem->GetBackgroundColour());
+ item.SetFont(oldItem->GetFont());
+ }
}
}
int wxMacListCtrlItem::GetColumnImageValue( unsigned int column )
{
- return GetColumnInfo(column)->GetImage();
+ if ( HasColumnInfo(column) )
+ return GetColumnInfo(column)->GetImage();
+
+ return -1;
}
void wxMacListCtrlItem::SetColumnImageValue( unsigned int column, int imageIndex )
{
- GetColumnInfo(column)->SetImage(imageIndex);
+ if ( HasColumnInfo(column) )
+ GetColumnInfo(column)->SetImage(imageIndex);
}
-const wxString& wxMacListCtrlItem::GetColumnTextValue( unsigned int column )
+wxString wxMacListCtrlItem::GetColumnTextValue( unsigned int column )
{
if ( column == 0 )
return GetLabel();
- return GetColumnInfo(column)->GetText();
+ if ( HasColumnInfo(column) )
+ return GetColumnInfo(column)->GetText();
+
+ return wxEmptyString;
}
void wxMacListCtrlItem::SetColumnTextValue( unsigned int column, const wxString& text )
{
- GetColumnInfo(column)->SetText(text);
+ if ( HasColumnInfo(column) )
+ GetColumnInfo(column)->SetText(text);
// for compatibility with superclass APIs
if ( column == 0 )
wxListItem* wxMacListCtrlItem::GetColumnInfo( unsigned int column )
{
- wxListItemList::compatibility_iterator node = m_rowItems.Item( column );
- wxASSERT_MSG( node, _T("invalid column index in wxMacListCtrlItem") );
-
- return node->GetData();
+ wxASSERT_MSG( HasColumnInfo(column), _T("invalid column index in wxMacListCtrlItem") );
+ return m_rowItems[column];
}
bool wxMacListCtrlItem::HasColumnInfo( unsigned int column )
{
- return m_rowItems.GetCount() > column;
+ return !(m_rowItems.find( column ) == m_rowItems.end());
}
void wxMacListCtrlItem::SetColumnInfo( unsigned int column, wxListItem* item )
{
- if ( column >= m_rowItems.GetCount() )
+ if ( !HasColumnInfo(column) )
{
wxListItem* listItem = new wxListItem(*item);
- m_rowItems.Append( listItem );
+ m_rowItems[column] = listItem;
}
else
{
listItem->SetAlign(item->GetAlign());
if (mask & wxLIST_MASK_WIDTH)
listItem->SetWidth(item->GetWidth());
-
- listItem->SetTextColour(item->GetTextColour());
- listItem->SetBackgroundColour(item->GetBackgroundColour());
- listItem->SetFont(item->GetFont());
+
+ if ( item->HasAttributes() )
+ {
+ if ( listItem->HasAttributes() )
+ listItem->GetAttributes()->AssignFrom(*item->GetAttributes());
+ else
+ {
+ listItem->SetTextColour(item->GetTextColour());
+ listItem->SetBackgroundColour(item->GetBackgroundColour());
+ listItem->SetFont(item->GetFont());
+ }
+ }
}
}
#endif // wxUSE_LISTCTRL
+
projects / wxWidgets.git / blobdiff