/////////////////////////////////////////////////////////////////////////////
-// Name: src/msw/listctrl.cpp
+// Name: src/mac/listctrl_mac.cpp
// Purpose: wxListCtrl
// Author: Julian Smart
// Modified by: Agron Selimaj
#if wxUSE_LISTCTRL
+#include "wx/listctrl.h"
+
#ifndef WX_PRECOMP
- #include "wx/app.h"
#include "wx/intl.h"
- #include "wx/log.h"
- #include "wx/settings.h"
- #include "wx/dcclient.h"
- #include "wx/textctrl.h"
#endif
#include "wx/mac/uma.h"
#include "wx/imaglist.h"
-#include "wx/listctrl.h"
#include "wx/sysopt.h"
#define wxMAC_ALWAYS_USE_GENERIC_LISTCTRL wxT("mac.listctrl.always_use_generic")
WX_DECLARE_EXPORTED_LIST(wxListItem, wxListItemList);
#include "wx/listimpl.cpp"
WX_DEFINE_LIST(wxListItemList)
+WX_DEFINE_LIST(wxColumnList)
+
+// so we can check for column clicks
+static const EventTypeSpec eventList[] =
+{
+ { kEventClassControl, kEventControlHit },
+ { kEventClassControl, kEventControlDraw }
+};
+
+static pascal OSStatus wxMacListCtrlEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+ OSStatus result = eventNotHandledErr ;
+
+ wxMacCarbonEvent cEvent( event ) ;
+
+ ControlRef controlRef ;
+ cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ;
+
+ 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
+ case kEventControlHit :
+ {
+ ControlPartCode result = cEvent.GetParameter<ControlPartCode>(kEventParamControlPart, typeControlPartCode) ;
+ if (result == kControlButtonPart){
+ DataBrowserPropertyID col;
+ GetDataBrowserSortProperty(controlRef, &col);
+ int column = col - kMinColumnId;
+ le.m_col = column;
+ window->GetEventHandler()->ProcessEvent( le );
+ }
+ result = CallNextEventHandler(handler, event);
+ break;
+ }
+ case kEventControlDraw:
+ {
+ CGContextRef context = cEvent.GetParameter<CGContextRef>(kEventParamCGContextRef, typeCGContextRef) ;
+ window->MacSetDrawingContext(context);
+ result = CallNextEventHandler(handler, event);
+ window->MacSetDrawingContext(NULL);
+ break;
+ }
+ default :
+ break ;
+ }
+
+
+ return result ;
+}
+
+DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacListCtrlEventHandler )
class wxMacListCtrlItem : public wxMacListBoxItem
{
virtual int GetColumnImageValue( unsigned int column );
virtual void SetColumnImageValue( unsigned int column, int imageIndex );
-
+
virtual ~wxMacListCtrlItem();
protected:
wxListItemList m_rowItems;
};
+DataBrowserDrawItemUPP gDataBrowserDrawItemUPP = NULL;
+//DataBrowserEditItemUPP gDataBrowserEditItemUPP = NULL;
+DataBrowserHitTestUPP gDataBrowserHitTestUPP = NULL;
+
// TODO: Make a better name!!
class wxMacDataBrowserListCtrlControl : public wxMacDataItemBrowserControl
{
// create a list item (can be a subclass of wxMacListBoxItem)
- virtual wxMacListCtrlItem* CreateItem();
+ virtual wxMacDataItem* CreateItem();
virtual void MacInsertItem( unsigned int n, wxListItem* item );
virtual void MacSetColumnInfo( unsigned int row, unsigned int column, wxListItem* item );
DataBrowserItemID itemID,
DataBrowserItemNotification message,
DataBrowserItemDataRef itemData);
-
+
virtual Boolean CompareItems(DataBrowserItemID itemOneID,
DataBrowserItemID itemTwoID,
DataBrowserPropertyID sortProperty);
+ static pascal void DataBrowserDrawItemProc(ControlRef browser,
+ DataBrowserItemID item,
+ DataBrowserPropertyID property,
+ DataBrowserItemState itemState,
+ const Rect *theRect,
+ SInt16 gdDepth,
+ Boolean colorDevice);
+
+ virtual void DrawItem(DataBrowserItemID itemID,
+ DataBrowserPropertyID property,
+ DataBrowserItemState itemState,
+ const Rect *itemRect,
+ SInt16 gdDepth,
+ Boolean colorDevice);
+
+ static pascal Boolean DataBrowserEditTextProc(ControlRef browser,
+ DataBrowserItemID item,
+ DataBrowserPropertyID property,
+ CFStringRef theString,
+ Rect *maxEditTextRect,
+ Boolean *shrinkToFit);
+
+ static pascal Boolean DataBrowserHitTestProc(ControlRef browser,
+ DataBrowserItemID itemID,
+ DataBrowserPropertyID property,
+ const Rect *theRect,
+ const Rect *mouseRect) { return true; }
+
+ virtual bool ConfirmEditText(DataBrowserItemID item,
+ DataBrowserPropertyID property,
+ CFStringRef theString,
+ Rect *maxEditTextRect,
+ Boolean *shrinkToFit);
+
+
+
wxClientDataType m_clientDataItemsType;
bool m_isVirtual;
};
-// TODO: This gives errors, find out why.
-//BEGIN_EVENT_TABLE(wxListCtrl, wxControl)
-// EVT_PAINT(wxListCtrl::OnPaint)
-//END_EVENT_TABLE()
+class wxMacListCtrlEventDelegate : public wxEvtHandler
+{
+public:
+ wxMacListCtrlEventDelegate( wxListCtrl* list, int id );
+ virtual bool ProcessEvent( wxEvent& event );
+
+private:
+ wxListCtrl* m_list;
+ int m_id;
+};
+
+wxMacListCtrlEventDelegate::wxMacListCtrlEventDelegate( wxListCtrl* list, int id )
+{
+ m_list = list;
+ m_id = id;
+}
+
+bool wxMacListCtrlEventDelegate::ProcessEvent( wxEvent& event )
+{
+ // even though we use a generic list ctrl underneath, make sure
+ // we present ourselves as wxListCtrl.
+ event.SetEventObject( m_list );
+ event.SetId( m_id );
+
+ return wxEvtHandler::ProcessEvent(event);
+}
// ============================================================================
// implementation
m_imageListNormal = NULL;
m_imageListSmall = NULL;
m_imageListState = NULL;
-
+
// keep track of if we created our own image lists, or if they were assigned
// to us.
m_ownsImageListNormal = m_ownsImageListSmall = m_ownsImageListState = false;
m_textCtrl = NULL;
m_genericImpl = NULL;
m_dbImpl = NULL;
+ m_compareFunc = NULL;
+ m_compareFuncData = 0;
+ m_colsInfo = wxColumnList();
+ m_textColor = wxNullColour;
+ m_bgColor = wxNullColour;
}
class wxGenericListCtrlHook : public wxGenericListCtrl
{
}
+protected:
virtual wxListItemAttr * OnGetItemAttr(long item) const
{
return m_nativeListCtrl->OnGetItemAttr(item);
return m_nativeListCtrl->OnGetItemText(item, column);
}
-protected:
wxListCtrl* m_nativeListCtrl;
};
// 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) || (style & wxLC_VIRTUAL) )
+ (style & wxLC_ICON) || (style & wxLC_SMALL_ICON) || (style & wxLC_LIST) || (style & wxLC_EDIT_LABELS) )
{
m_macIsUserPane = true;
if ( !wxWindow::Create(parent, id, pos, size, style, name) )
return false;
m_genericImpl = new wxGenericListCtrlHook(this, id, pos, size, style, validator, name);
+ m_genericImpl->PushEventHandler( new wxMacListCtrlEventDelegate( this, GetId() ) );
return true;
}
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);
}
return true;
wxListCtrl::~wxListCtrl()
{
+ if (m_genericImpl)
+ {
+ m_genericImpl->PopEventHandler(/* deleteHandler = */ true);
+ }
+
if (m_ownsImageListNormal)
delete m_imageListNormal;
if (m_ownsImageListSmall)
m_genericImpl->SetSize(x, y, width, height, sizeFlags);
}
+bool wxListCtrl::SetFont(const wxFont& font)
+{
+ bool rv = true;
+ rv = wxControl::SetFont(font);
+ if (m_genericImpl)
+ rv = m_genericImpl->SetFont(font);
+ return rv;
+}
+
+bool wxListCtrl::SetForegroundColour(const wxColour& colour)
+{
+ bool rv = true;
+ if (m_genericImpl)
+ rv = m_genericImpl->SetForegroundColour(colour);
+ if (m_dbImpl)
+ SetTextColour(colour);
+ return rv;
+}
+
+bool wxListCtrl::SetBackgroundColour(const wxColour& colour)
+{
+ bool rv = true;
+ if (m_genericImpl)
+ rv = m_genericImpl->SetBackgroundColour(colour);
+ if (m_dbImpl)
+ m_bgColor = colour;
+ return rv;
+}
+
+wxColour wxListCtrl::GetBackgroundColour()
+{
+ if (m_genericImpl)
+ return m_genericImpl->GetBackgroundColour();
+ if (m_dbImpl)
+ return m_bgColor;
+
+ return wxNullColour;
+}
+
// ----------------------------------------------------------------------------
// accessors
// ----------------------------------------------------------------------------
bool success = true;
- if ( item.m_mask & wxLIST_MASK_TEXT )
- {
- }
-
- if ( item.m_mask & wxLIST_MASK_FORMAT )
- {
- }
-
- if ( item.m_mask & wxLIST_MASK_IMAGE )
- {
- }
-
- if ( (item.m_mask & wxLIST_MASK_TEXT) )
+ 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 (mask & wxLIST_MASK_DATA)
+ item.SetData(column->GetData());
+ if (mask & wxLIST_MASK_IMAGE)
+ item.SetImage(column->GetImage());
+ if (mask & wxLIST_MASK_STATE)
+ item.SetState(column->GetState());
+ if (mask & wxLIST_MASK_FORMAT)
+ item.SetAlign(column->GetAlign());
+ if (mask & wxLIST_MASK_WIDTH)
+ item.SetWidth(column->GetWidth());
}
-
return success;
}
if (m_genericImpl)
return m_genericImpl->SetColumn(col, item);
- return false;
+ if (m_dbImpl)
+ {
+ if ( col >= (int)m_colsInfo.GetCount() )
+ {
+ wxListItem* listItem = new wxListItem(item);
+ m_colsInfo.Append( listItem );
+ }
+ else
+ {
+ wxListItem listItem;
+ GetColumn( col, listItem );
+ long mask = item.GetMask();
+ if (mask & wxLIST_MASK_TEXT)
+ listItem.SetText(item.GetText());
+ if (mask & wxLIST_MASK_DATA)
+ listItem.SetData(item.GetData());
+ if (mask & wxLIST_MASK_IMAGE)
+ listItem.SetImage(item.GetImage());
+ if (mask & wxLIST_MASK_STATE)
+ listItem.SetState(item.GetState());
+ if (mask & wxLIST_MASK_FORMAT)
+ listItem.SetAlign(item.GetAlign());
+ 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)
+ {
+ wxFontEncoding enc;
+ if ( m_font.Ok() )
+ enc = m_font.GetEncoding();
+ else
+ enc = wxLocale::GetSystemEncoding();
+ wxMacCFStringHolder cfTitle;
+ cfTitle.Assign( item.GetText() , enc );
+ if(columnDesc.titleString)
+ CFRelease(columnDesc.titleString);
+ 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();
+ columnDesc.btnContentInfo.u.iconRef = icon;
+ }
+ }
+
+ verify_noerr( m_dbImpl->SetHeaderDesc( kMinColumnId + col, &columnDesc ) );
+
+ }
+ return true;
}
int wxListCtrl::GetColumnCount() const
if (m_genericImpl)
return m_genericImpl->SetColumnWidth(col, width);
- // TODO: This is setting the width of the first column
- // to the entire window width; investigate why
- // this is.
-
if (m_dbImpl)
{
int mywidth = width;
return m_genericImpl->GetItem(info);
if (m_dbImpl)
- m_dbImpl->MacGetColumnInfo(info.m_itemId, info.m_col, info);
+ {
+ if (!IsVirtual())
+ m_dbImpl->MacGetColumnInfo(info.m_itemId, info.m_col, info);
+ 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)
+ {
+ info.SetFont( attrs->GetFont() );
+ info.SetBackgroundColour( attrs->GetBackgroundColour() );
+ info.SetTextColour( attrs->GetTextColour() );
+ }
+ }
+ }
bool success = true;
return success;
}
// TODO: we need owner drawn list items to customize text color.
if (m_dbImpl)
- return *wxBLACK;
-
+ return m_textColor;
+
return wxNullColour;
}
return;
}
- // TODO: if we add owner-drawn item support for DataBrowser,
- // consider supporting this property
+ if (m_dbImpl)
+ m_textColor = col;
}
// Gets the index of the topmost visible item when in
if (m_genericImpl)
return m_genericImpl->GetNextItem(item, geom, state);
+ if (m_dbImpl && geom == wxLIST_NEXT_ALL && state == wxLIST_STATE_SELECTED )
+ {
+ long count = m_dbImpl->MacGetCount() ;
+ for ( long line = item + 1 ; line < count; line++ )
+ {
+ wxMacDataItem* id = m_dbImpl->GetItemFromLine(line);
+ if ( m_dbImpl->IsItemSelected(id ) )
+ return line;
+ }
+ return -1;
+ }
+
return 0;
}
wxListEvent event( wxEVT_COMMAND_LIST_DELETE_ITEM, GetId() );
event.SetEventObject( this );
event.m_itemIndex = item;
- GetEventHandler()->ProcessEvent( event );
+ GetEventHandler()->ProcessEvent( event );
}
return true;
if (m_dbImpl)
{
+ int width = item.GetWidth();
if ( !(item.GetMask() & wxLIST_MASK_WIDTH) )
- item.SetWidth(150);
+ width = 150;
- DataBrowserPropertyType type = kDataBrowserTextType;
+ DataBrowserPropertyType type = kDataBrowserCustomType; //kDataBrowserTextType;
wxImageList* imageList = GetImageList(wxIMAGE_LIST_SMALL);
if (imageList && imageList->GetImageCount() > 0)
{
wxBitmap bmp = imageList->GetBitmap(0);
- if (bmp.Ok())
- type = kDataBrowserIconAndTextType;
+ //if (bmp.Ok())
+ // type = kDataBrowserIconAndTextType;
}
SInt16 just = teFlushDefault;
else if (item.GetAlign() == wxLIST_FORMAT_RIGHT)
just = teFlushRight;
}
- m_dbImpl->InsertColumn(col, type, item.GetText(), just, item.GetWidth());
-
+ m_dbImpl->InsertColumn(col, type, item.GetText(), just, width);
+ SetColumn(col, item);
+
+ // set/remove options based on the wxListCtrl type.
+ DataBrowserTableViewColumnID id;
+ m_dbImpl->GetColumnIDFromIndex(col, &id);
+ DataBrowserPropertyFlags flags;
+ verify_noerr(m_dbImpl->GetPropertyFlags(id, &flags));
if (GetWindowStyleFlag() & wxLC_EDIT_LABELS)
- {
- DataBrowserTableViewColumnID id;
- m_dbImpl->GetColumnIDFromIndex(col, &id);
- DataBrowserPropertyFlags flags;
- verify_noerr(m_dbImpl->GetPropertyFlags(id, &flags));
flags |= kDataBrowserPropertyIsEditable;
- verify_noerr(m_dbImpl->SetPropertyFlags(id, flags));
+
+ if (GetWindowStyleFlag() & wxLC_VIRTUAL){
+ flags &= ~kDataBrowserListViewSortableColumn;
}
+ verify_noerr(m_dbImpl->SetPropertyFlags(id, flags));
}
return col;
{
if (m_genericImpl)
return m_genericImpl->SortItems(fn, data);
+
+ if (m_dbImpl)
+ {
+ m_compareFunc = fn;
+ m_compareFuncData = data;
+ }
return true;
}
bool trigger = false;
wxListEvent event( wxEVT_COMMAND_LIST_ITEM_SELECTED, list->GetId() );
- bool isSingle = list->GetWindowStyle() | wxLC_SINGLE_SEL;
+ bool isSingle = (list->GetWindowStyle() & wxLC_SINGLE_SEL) != 0;
event.SetEventObject( list );
event.m_itemIndex = owner->GetLineFromItem( this ) ;
break;
case kDataBrowserItemDoubleClicked:
- event.SetEventType( wxEVT_LEFT_DCLICK );
+ event.SetEventType( wxEVT_COMMAND_LIST_ITEM_ACTIVATED );
trigger = true;
break;
OSStatus err = noErr;
m_clientDataItemsType = wxClientData_None;
m_isVirtual = false;
-
+
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 )
{
if ( style & wxLC_LIST || style & wxLC_NO_HEADER )
verify_noerr( SetHeaderButtonHeight( 0 ) );
- SetSortProperty( kMinColumnId );
+ if ( m_isVirtual )
+ SetSortProperty( kMinColumnId - 1 );
+ else
+ SetSortProperty( kMinColumnId );
if ( style & wxLC_SORT_ASCENDING )
{
m_sortOrder = SortOrder_Text_Ascending;
err = SetHasScrollBars( (style & wxHSCROLL) != 0 , true );
}
+pascal Boolean wxMacDataBrowserListCtrlControl::DataBrowserEditTextProc(
+ ControlRef browser,
+ DataBrowserItemID itemID,
+ DataBrowserPropertyID property,
+ CFStringRef theString,
+ Rect *maxEditTextRect,
+ Boolean *shrinkToFit)
+{
+ Boolean result = false;
+ wxMacDataBrowserListCtrlControl* ctl = dynamic_cast<wxMacDataBrowserListCtrlControl*>( wxMacControl::GetReferenceFromNativeControl( browser ) );
+ if ( ctl != 0 )
+ {
+ result = ctl->ConfirmEditText(itemID, property, theString, maxEditTextRect, shrinkToFit);
+ theString = CFSTR("Hello!");
+ }
+ return result;
+}
+
+bool wxMacDataBrowserListCtrlControl::ConfirmEditText(
+ DataBrowserItemID itemID,
+ DataBrowserPropertyID property,
+ CFStringRef theString,
+ Rect *maxEditTextRect,
+ Boolean *shrinkToFit)
+{
+ //wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl );
+ return false;
+}
+
+pascal void wxMacDataBrowserListCtrlControl::DataBrowserDrawItemProc(
+ ControlRef browser,
+ DataBrowserItemID itemID,
+ DataBrowserPropertyID property,
+ DataBrowserItemState itemState,
+ const Rect *itemRect,
+ SInt16 gdDepth,
+ Boolean colorDevice)
+{
+ wxMacDataBrowserListCtrlControl* ctl = dynamic_cast<wxMacDataBrowserListCtrlControl*>( wxMacControl::GetReferenceFromNativeControl( browser ) );
+ if ( ctl != 0 )
+ {
+ ctl->DrawItem(itemID, property, itemState, itemRect, gdDepth, colorDevice);
+ }
+}
+
+// routines needed for DrawItem
+enum
+{
+ kIconWidth = 16,
+ kIconHeight = 16,
+ kTextBoxHeight = 14,
+ kIconTextSpacingV = 2,
+ kItemPadding = 4,
+ kContentHeight = kIconHeight + kTextBoxHeight + kIconTextSpacingV
+};
+
+static void calculateCGDrawingBounds(CGRect inItemRect, CGRect *outIconRect, CGRect *outTextRect, bool hasIcon = false)
+{
+ float textBottom;
+ float iconH, iconW = 0;
+ float padding = kItemPadding;
+ if (hasIcon)
+ {
+ iconH = kIconHeight;
+ iconW = kIconWidth;
+ padding = padding*2;
+ }
+
+ textBottom = inItemRect.origin.y;
+
+ *outIconRect = CGRectMake(inItemRect.origin.x + kItemPadding,
+ textBottom + kIconTextSpacingV, kIconWidth,
+ kIconHeight);
+
+ *outTextRect = CGRectMake(inItemRect.origin.x + padding + iconW,
+ textBottom + kIconTextSpacingV, inItemRect.size.width - padding - iconW,
+ inItemRect.size.height - kIconTextSpacingV);
+}
+
+void wxMacDataBrowserListCtrlControl::DrawItem(
+ DataBrowserItemID itemID,
+ DataBrowserPropertyID property,
+ DataBrowserItemState itemState,
+ const Rect *itemRect,
+ SInt16 gdDepth,
+ Boolean colorDevice)
+{
+ wxString text;
+ wxFont font = wxNullFont;
+ int imgIndex = -1;
+ short listColumn = property - kMinColumnId;
+
+ wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl );
+ wxMacListCtrlItem* lcItem;
+ wxColour color = *wxBLACK;
+ wxColour bgColor = wxNullColour;
+
+ if (listColumn >= 0)
+ {
+ if (!m_isVirtual)
+ {
+ 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))
+ {
+ wxListItem* firstItem = lcItem->GetColumnInfo(0);
+ color = firstItem->GetTextColour();
+ 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)
+ {
+ 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() );
+
+ Rect enclosingRect;
+ CGRect enclosingCGRect, iconCGRect, textCGRect;
+ Boolean active;
+ ThemeDrawingState savedState = NULL;
+ CGContextRef context = (CGContextRef)list->MacGetDrawingContext();
+ RGBColor labelColor;
+
+ GetDataBrowserItemPartBounds(GetControlRef(), itemID, property, kDataBrowserPropertyEnclosingPart,
+ &enclosingRect);
+
+ enclosingCGRect = CGRectMake(enclosingRect.left,
+ enclosingRect.top,
+ enclosingRect.right - enclosingRect.left,
+ enclosingRect.bottom - enclosingRect.top);
+
+ active = IsControlActive(GetControlRef());
+
+ if (itemState == kDataBrowserItemIsSelected)
+ {
+ RGBColor foregroundColor;
+
+ GetThemeDrawingState(&savedState);
+
+ GetThemeBrushAsColor(kThemeBrushAlternatePrimaryHighlightColor, 32, true, &foregroundColor);
+ GetThemeTextColor(kThemeTextColorWhite, 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);
+ CGContextFillRect(context, enclosingCGRect);
+
+ CGContextRestoreGState(context);
+ }
+ else
+ {
+
+ if (color.Ok())
+ labelColor = MAC_WXCOLORREF( color.GetPixel() );
+ else if (list->GetTextColour().Ok())
+ labelColor = MAC_WXCOLORREF( list->GetTextColour().GetPixel() );
+ else
+ {
+ labelColor.red = 0;
+ labelColor.green = 0;
+ labelColor.blue = 0;
+ }
+
+ if (bgColor.Ok())
+ {
+ RGBColor foregroundColor = MAC_WXCOLORREF( bgColor.GetPixel() );
+ CGContextSaveGState(context);
+
+ CGContextSetRGBFillColor(context, (float)foregroundColor.red / (float)USHRT_MAX,
+ (float)foregroundColor.green / (float)USHRT_MAX,
+ (float)foregroundColor.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;
+
+ PlotIconRefInContext(context, &iconCGRect, kAlignNone,
+ active ? kTransformNone : kTransformDisabled, &iconLabel,
+ kPlotIconRefNormalFlags, icon);
+ }
+ }
+
+ HIThemeTextHorizontalFlush hFlush = kHIThemeTextHorizontalFlushLeft;
+ UInt16 fontID = kThemeViewsFont;
+
+ if (font.Ok())
+ {
+ 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() ) ;
+#endif
+ }
+
+ wxListItem item;
+ list->GetColumn(listColumn, item);
+ if (item.GetMask() & wxLIST_MASK_FORMAT)
+ {
+ if (item.GetAlign() == wxLIST_FORMAT_LEFT)
+ hFlush = kHIThemeTextHorizontalFlushLeft;
+ else if (item.GetAlign() == wxLIST_FORMAT_CENTER)
+ 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.truncationPosition = kHIThemeTextTruncationEnd;
+ info.truncationMaxLines = 1;
+
+ CGContextSaveGState(context);
+ 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);
+
+ CGContextRestoreGState(context);
+
+ if (savedState != NULL)
+ SetThemeDrawingState(savedState, true);
+}
+
OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemID,
DataBrowserPropertyID property,
DataBrowserItemDataRef itemData,
if ( property >= kMinColumnId )
{
wxMacCFStringHolder cfStr;
-
+
if (text){
cfStr.Assign( text, wxLocale::GetSystemEncoding() );
err = ::SetDataBrowserItemDataText( itemData, cfStr );
err = noErr;
}
-
-
+
+
if ( imgIndex != -1 )
{
wxImageList* imageList = list->GetImageList(wxIMAGE_LIST_SMALL);
::SetDataBrowserItemDataIcon(itemData, icon);
}
}
-
+
}
break ;
}
-
+
}
else
{
if (lcItem)
lcItem->SetColumnTextValue( listColumn, cfStr.AsString() );
}
- err = noErr ;
+ err = noErr ;
}
break;
}
else if ( message == kDataBrowserItemAdded )
{
// we don't issue events on adding, the item is not really stored in the list yet, so we
- // avoid asserts by gettting out now
+ // avoid asserts by getting out now
return ;
}
if ( list )
{
bool trigger = false;
-
+
wxListEvent event( wxEVT_COMMAND_LIST_ITEM_SELECTED, list->GetId() );
- bool isSingle = list->GetWindowStyle() | wxLC_SINGLE_SEL;
-
+ bool isSingle = (list->GetWindowStyle() & wxLC_SINGLE_SEL) != 0;
+
event.SetEventObject( list );
if ( !list->IsVirtual() )
{
- wxMacDataItem* item = (wxMacDataItem*)itemID;
DataBrowserTableViewRowIndex result = 0;
verify_noerr( GetItemRow( itemID, &result ) ) ;
event.m_itemIndex = result;
{
event.m_itemIndex = (long)itemID;
}
-
+
switch (message)
{
case kDataBrowserItemDeselected:
event.SetEventType(wxEVT_COMMAND_LIST_ITEM_DESELECTED);
if ( !isSingle )
- trigger = IsSelectionSuppressed();
+ trigger = !IsSelectionSuppressed();
break;
case kDataBrowserItemSelected:
- trigger = IsSelectionSuppressed();
+ trigger = !IsSelectionSuppressed();
+
break;
case kDataBrowserItemDoubleClicked:
- event.SetEventType( wxEVT_LEFT_DCLICK );
+ event.SetEventType( wxEVT_COMMAND_LIST_ITEM_ACTIVATED );
trigger = true;
break;
event.SetEventType( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT ) ;
trigger = true ;
break ;
-
+
case kDataBrowserEditStopped :
// TODO probably trigger only upon the value store callback, because
// here IIRC we cannot veto
int colId = sortProperty - kMinColumnId;
long itemNum = 0;
long otherItemNum = 0;
-
+
wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl );
-
- // means we need to
+
+ // means we need to
if (colId >= 0)
{
if (!m_isVirtual)
{
wxMacListCtrlItem* item = (wxMacListCtrlItem*)itemOneID;
wxMacListCtrlItem* otherItem = (wxMacListCtrlItem*)itemTwoID;
+ 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))
otherItemNum = (long)itemTwoID;
itemText = list->OnGetItemText( itemNum-1, colId );
otherItemText = list->OnGetItemText( otherItemNum-1, colId );
-
+
}
-
+
DataBrowserSortOrder sort;
- verify_noerr(GetSortOrder(&sort));
-
+ verify_noerr(GetSortOrder(&sort));
+
if ( sort == kDataBrowserOrderIncreasing )
{
retval = itemText.CmpNoCase( otherItemText ) > 0;
}
void wxMacDataBrowserListCtrlControl::MacSetColumnInfo( unsigned int row, unsigned int column, wxListItem* item )
-{
+{
wxMacDataItem* dataItem = GetItemFromLine(row);
if (item)
{
}
}
-// apply changes that need to happen immediately, rather than when the
+// apply changes that need to happen immediately, rather than when the
// databrowser control fires a callback.
void wxMacDataBrowserListCtrlControl::UpdateState(wxMacDataItem* dataItem, wxListItem* listItem)
{
bool isSelected = IsItemSelected( dataItem );
bool isSelectedState = (listItem->GetState() == wxLIST_STATE_SELECTED);
- // toggle the selection state if wxListInfo state and actual state don't match.
+ // toggle the selection state if wxListInfo state and actual state don't match.
if ( isSelected != isSelectedState )
{
DataBrowserSetOption options = kDataBrowserItemsAdd;
}
void wxMacDataBrowserListCtrlControl::MacGetColumnInfo( unsigned int row, unsigned int column, wxListItem& item )
-{
+{
wxMacDataItem* dataItem = GetItemFromLine(row);
// CS should this guard against dataItem = 0 ? , as item is not a pointer if (item) is not appropriate
- //if (item)
+ //if (item)
{
wxMacListCtrlItem* listItem = dynamic_cast<wxMacListCtrlItem*>(dataItem);
wxListItem* oldItem = listItem->GetColumnInfo( column );
-
+
long mask = item.GetMask();
if ( !mask )
// by default, get everything for backwards compatibility
MacSetColumnInfo(n, 0, item);
}
-wxMacListCtrlItem* wxMacDataBrowserListCtrlControl::CreateItem()
+wxMacDataItem* wxMacDataBrowserListCtrlControl::CreateItem()
{
return new wxMacListCtrlItem();
}
if ( column >= m_rowItems.GetCount() )
{
- wxListItem* listItem = new wxListItem(*item);
+ wxListItem* listItem = new wxListItem(*item);
m_rowItems.Append( 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());
}
}
projects / wxWidgets.git / blobdiff