/////////////////////////////////////////////////////////////////////////////
-// 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
{
public:
wxMacListCtrlItem();
-
+
virtual void Notification(wxMacDataItemBrowserControl *owner ,
DataBrowserItemNotification message,
DataBrowserItemDataRef itemData ) const;
-
+
virtual void SetColumnInfo( unsigned int column, wxListItem* item );
virtual wxListItem* GetColumnInfo( unsigned int column );
virtual bool HasColumnInfo( unsigned int column );
-
+
virtual void SetColumnTextValue( unsigned int column, const wxString& text );
- virtual const wxString& GetColumnTextValue( unsigned int column );
-
+ virtual const wxString& GetColumnTextValue( unsigned int column );
+
virtual int GetColumnImageValue( unsigned int column );
virtual void SetColumnImageValue( unsigned int column, int imageIndex );
-
- virtual OSStatus GetSetData( wxMacDataItemBrowserControl *owner ,
- DataBrowserPropertyID property,
- DataBrowserItemDataRef itemData,
- bool changeValue );
-
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 );
virtual void MacGetColumnInfo( unsigned int row, unsigned int column, wxListItem& item );
virtual void UpdateState(wxMacDataItem* dataItem, wxListItem* item);
-
+
protected:
+ // we need to override to provide specialized handling for virtual wxListCtrls
+ virtual OSStatus GetSetItemData(DataBrowserItemID itemID,
+ DataBrowserPropertyID property,
+ DataBrowserItemDataRef itemData,
+ Boolean changeValue );
+
+ virtual void ItemNotification(
+ 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;
+
+};
+class wxMacListCtrlEventDelegate : public wxEvtHandler
+{
+public:
+ wxMacListCtrlEventDelegate( wxListCtrl* list, int id );
+ virtual bool ProcessEvent( wxEvent& event );
+
+private:
+ wxListCtrl* m_list;
+ int m_id;
};
-// TODO: This gives errors, find out why.
-//BEGIN_EVENT_TABLE(wxListCtrl, wxControl)
-// EVT_PAINT(wxListCtrl::OnPaint)
-//END_EVENT_TABLE()
+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
+{
+public:
+ wxGenericListCtrlHook(wxListCtrl* parent,
+ wxWindowID id,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxValidator& validator,
+ const wxString& name)
+ : wxGenericListCtrl(parent, id, pos, size, style, validator, name),
+ m_nativeListCtrl(parent)
+ {
+ }
+
+protected:
+ virtual wxListItemAttr * OnGetItemAttr(long item) const
+ {
+ return m_nativeListCtrl->OnGetItemAttr(item);
+ }
+
+ virtual int OnGetItemImage(long item) const
+ {
+ return m_nativeListCtrl->OnGetItemImage(item);
+ }
+
+ virtual int OnGetItemColumnImage(long item, long column) const
+ {
+ return m_nativeListCtrl->OnGetItemColumnImage(item, column);
+ }
+
+ virtual wxString OnGetItemText(long item, long column) const
+ {
+ return m_nativeListCtrl->OnGetItemText(item, column);
+ }
+
+ wxListCtrl* m_nativeListCtrl;
+
+};
+
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.
- if ( (wxSystemOptions::HasOption( wxMAC_ALWAYS_USE_GENERIC_LISTCTRL )
+ // 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_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 wxGenericListCtrl(this, id, pos, size, style, validator, name);
+ m_genericImpl = new wxGenericListCtrlHook(this, id, pos, 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) )
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_windowStyle = flag;
- if (m_genericImpl){
+ if (m_genericImpl)
+ {
m_genericImpl->SetWindowStyleFlag(flag);
}
}
}
-void wxListCtrl::DoSetSize( int x, int y, int width, int height, int sizeFlags ){
+void wxListCtrl::DoSetSize( int x, int y, int width, int height, int sizeFlags )
+{
wxControl::DoSetSize(x, y, width, height, sizeFlags);
-
+
if (m_genericImpl)
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
// ----------------------------------------------------------------------------
return m_genericImpl->GetColumn(col, item);
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);
+
+ 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());
+ }
- return false;
+ // 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->GetColumnCount();
-
- if (m_dbImpl){
+
+ if (m_dbImpl)
+ {
UInt32 count;
m_dbImpl->GetColumnCount(&count);
return count;
{
if (m_genericImpl)
return m_genericImpl->GetColumnWidth(col);
-
- if (m_dbImpl){
+
+ if (m_dbImpl)
+ {
return m_dbImpl->GetColumnWidth(col);
}
{
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){
- // m_dbImpl->SetColumnWidth(col+1, width);
- // return true;
- //}
-
+
+ if (m_dbImpl)
+ {
+ int mywidth = width;
+ if (width == wxLIST_AUTOSIZE || width == wxLIST_AUTOSIZE_USEHEADER)
+ mywidth = 150;
+
+ if (col == -1)
+ {
+ for (int column = 0; column < GetColumnCount(); column++)
+ {
+ m_dbImpl->SetColumnWidth(col, mywidth);
+ }
+ }
+ else{
+ m_dbImpl->SetColumnWidth(col, mywidth);
+ }
+ return true;
+ }
+
return false;
}
{
if (m_genericImpl)
return m_genericImpl->GetCountPerPage();
-
- if (m_dbImpl){
+
+ if (m_dbImpl)
+ {
}
-
+
return 1;
}
{
if (m_genericImpl)
return m_genericImpl->GetEditControl();
-
+
return NULL;
}
{
if (m_genericImpl)
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;
}
{
if (m_genericImpl)
return m_genericImpl->GetItemState(item, stateMask);
-
+
wxListItem info;
info.m_mask = wxLIST_MASK_STATE;
{
if (m_genericImpl)
return m_genericImpl->GetItemText(item);
-
+
wxListItem info;
info.m_mask = wxLIST_MASK_TEXT;
{
if (m_genericImpl)
return m_genericImpl->SetItemText(item, str);
-
+
wxListItem info;
info.m_mask = wxLIST_MASK_TEXT;
{
if (m_genericImpl)
return m_genericImpl->SetItemData(item, data);
-
+
wxListItem info;
info.m_mask = wxLIST_MASK_DATA;
{
wxASSERT_MSG( !HasFlag(wxLC_REPORT | wxLC_LIST),
_T("wxListCtrl::GetViewRect() only works in icon mode") );
-
+
if (m_genericImpl)
return m_genericImpl->GetViewRect();
-
+
wxRect rect;
return rect;
}
if (m_genericImpl)
return m_genericImpl->GetItemRect(item, rect, code);
- return true;
+ return true;
}
// Gets the item position
if (m_dbImpl)
return m_dbImpl->MacGetCount();
-
+
return m_count;
}
void wxListCtrl::SetItemTextColour( long item, const wxColour &col )
{
- if (m_genericImpl){
+ if (m_genericImpl)
+ {
m_genericImpl->SetItemTextColour(item, col);
+ return;
}
-
+
wxListItem info;
info.m_itemId = item;
info.SetTextColour( col );
{
if (m_genericImpl)
return m_genericImpl->GetItemTextColour(item);
-
- if (m_dbImpl){
+
+ if (m_dbImpl)
+ {
wxListItem info;
if (GetItem(info))
return info.GetTextColour();
void wxListCtrl::SetItemBackgroundColour( long item, const wxColour &col )
{
- if (m_genericImpl){
+ if (m_genericImpl)
+ {
m_genericImpl->SetItemBackgroundColour(item, col);
return;
}
-
+
wxListItem info;
info.m_itemId = item;
info.SetBackgroundColour( col );
{
if (m_genericImpl)
return m_genericImpl->GetItemBackgroundColour(item);
-
- if (m_dbImpl){
+
+ if (m_dbImpl)
+ {
wxListItem info;
if (GetItem(info))
return info.GetBackgroundColour();
void wxListCtrl::SetItemFont( long item, const wxFont &f )
{
- if (m_genericImpl){
+ if (m_genericImpl)
+ {
m_genericImpl->SetItemFont(item, f);
return;
}
{
if (m_genericImpl)
return m_genericImpl->GetItemFont(item);
-
- if (m_dbImpl){
+
+ if (m_dbImpl)
+ {
wxListItem info;
if (GetItem(info))
return info.GetFont();
// TODO: we need owner drawn list items to customize text color.
if (m_dbImpl)
- return *wxBLACK;
+ return m_textColor;
+
+ return wxNullColour;
}
// Sets the text colour of the listview
void wxListCtrl::SetTextColour(const wxColour& col)
{
- if (m_genericImpl){
+ if (m_genericImpl)
+ {
m_genericImpl->SetTextColour(col);
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->GetTopItem();
-
+
return 0;
}
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;
}
void wxListCtrl::SetImageList(wxImageList *imageList, int which)
{
- if (m_genericImpl){
+ if (m_genericImpl)
+ {
m_genericImpl->SetImageList(imageList, which);
return;
}
- int flags = 0;
if ( which == wxIMAGE_LIST_NORMAL )
{
if (m_ownsImageListNormal) delete m_imageListNormal;
void wxListCtrl::AssignImageList(wxImageList *imageList, int which)
{
- if (m_genericImpl){
+ if (m_genericImpl)
+ {
m_genericImpl->AssignImageList(imageList, which);
return;
}
{
if (m_genericImpl)
return m_genericImpl->DeleteItem(item);
-
- if (m_dbImpl){
+
+ if (m_dbImpl)
+ {
m_dbImpl->MacDelete(item);
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_genericImpl)
return m_genericImpl->DeleteAllItems();
-
- if (m_dbImpl){
+
+ if (m_dbImpl)
+ {
m_dbImpl->MacClear();
wxListEvent event( wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, GetId() );
event.SetEventObject( this );
- GetEventHandler()->ProcessEvent( event );
+ GetEventHandler()->ProcessEvent( event );
}
return true;
}
{
if (m_genericImpl)
return m_genericImpl->DeleteAllColumns();
-
- if (m_dbImpl){
+
+ if (m_dbImpl)
+ {
UInt32 cols;
m_dbImpl->GetColumnCount(&cols);
- for (UInt32 col = 0; col < cols; col++){
+ for (UInt32 col = 0; col < cols; col++)
+ {
DeleteColumn(col);
- }
+ }
}
-
+
return true;
}
{
if (m_genericImpl)
return m_genericImpl->DeleteColumn(col);
-
- if (m_dbImpl){
+
+ if (m_dbImpl)
+ {
OSStatus err = m_dbImpl->RemoveColumn(col);
return err == noErr;
}
-
+
return true;
}
// Clears items, and columns if there are any.
void wxListCtrl::ClearAll()
{
- if (m_genericImpl){
+ if (m_genericImpl)
+ {
m_genericImpl->ClearAll();
return;
}
-
- DeleteAllItems();
- if ( m_colCount > 0 )
+
+ if (m_dbImpl)
+ {
+ DeleteAllItems();
DeleteAllColumns();
+ }
}
wxTextCtrl* wxListCtrl::EditLabel(long item, wxClassInfo* textControlClass)
{
if (m_genericImpl)
return m_genericImpl->EditLabel(item, textControlClass);
-
+
+ if (m_dbImpl)
+ {
+ wxMacDataItem* id = m_dbImpl->GetItemFromLine(item);
+ verify_noerr( SetDataBrowserEditItem(m_dbImpl->GetControlRef(), (DataBrowserItemID)id, kMinColumnId) );
+ }
return NULL;
}
{
// TODO: generic impl. doesn't have this method - is it needed for us?
if (m_genericImpl)
- return false; // m_genericImpl->EndEditLabel(cancel);
-
- bool b = true;
- return b;
+ return true; // m_genericImpl->EndEditLabel(cancel);
+
+ if (m_dbImpl)
+ verify_noerr( SetDataBrowserEditItem(m_dbImpl->GetControlRef(), kDataBrowserNoItem, kMinColumnId) );
+ return true;
}
// Ensures this item is visible
{
if (m_genericImpl)
return m_genericImpl->EnsureVisible(item);
-
- if (m_dbImpl){
+
+ if (m_dbImpl)
+ {
wxMacDataItem* dataItem = m_dbImpl->GetItemFromLine(item);
m_dbImpl->RevealItem(dataItem, kDataBrowserRevealWithoutSelecting);
}
+
+ return true;
}
// Find an item whose label matches this string, starting from the item after 'start'
{
if (m_genericImpl)
return m_genericImpl->FindItem(start, data);
-
+
long idx = start + 1;
long count = GetItemCount();
if (m_genericImpl)
return m_genericImpl->InsertItem(info);
-
- if (m_dbImpl){
+
+ if (m_dbImpl)
+ {
int count = GetItemCount();
if (info.m_itemId > count)
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 );
+ GetEventHandler()->ProcessEvent( event );
}
return info.m_itemId;
{
if (m_genericImpl)
return m_genericImpl->InsertItem(index, imageIndex);
-
+
wxListItem info;
info.m_image = imageIndex;
info.m_mask = wxLIST_MASK_IMAGE;
{
if (m_genericImpl)
return m_genericImpl->InsertItem(index, label, imageIndex);
-
+
wxListItem info;
info.m_image = imageIndex;
info.m_text = label;
{
if (m_genericImpl)
return m_genericImpl->InsertColumn(col, item);
-
- if (m_dbImpl){
- if ( !(item.GetMask() & wxLIST_MASK_WIDTH) )
- item.SetWidth(150);
-
- DataBrowserPropertyType type = kDataBrowserTextType;
+
+ if (m_dbImpl)
+ {
+ int width = item.GetWidth();
+ if ( !(item.GetMask() & wxLIST_MASK_WIDTH) )
+ width = 150;
+
+ DataBrowserPropertyType type = kDataBrowserCustomType; //kDataBrowserTextType;
wxImageList* imageList = GetImageList(wxIMAGE_LIST_SMALL);
- if (imageList && imageList->GetImageCount() > 0){
+ if (imageList && imageList->GetImageCount() > 0)
+ {
wxBitmap bmp = imageList->GetBitmap(0);
- if (bmp.Ok())
- type = kDataBrowserIconAndTextType;
+ //if (bmp.Ok())
+ // type = kDataBrowserIconAndTextType;
}
-
- fprintf(stderr, "Flush is %d\n", item.GetAlign());
+
SInt16 just = teFlushDefault;
- if (item.GetMask() & wxLIST_MASK_FORMAT){
+ if (item.GetMask() & wxLIST_MASK_FORMAT)
+ {
if (item.GetAlign() == wxLIST_FORMAT_LEFT)
just = teFlushLeft;
else if (item.GetAlign() == wxLIST_FORMAT_CENTER)
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->ScrollList(dx, dy);
-
- if (m_dbImpl){
+
+ if (m_dbImpl)
+ {
m_dbImpl->SetScrollPosition(dx, dy);
}
return true;
if (m_genericImpl)
return m_genericImpl->SortItems(fn, data);
+ if (m_dbImpl)
+ {
+ m_compareFunc = fn;
+ m_compareFuncData = data;
+ }
+
return true;
}
{
wxASSERT_MSG( IsVirtual(), _T("this is for virtual controls only") );
- if (m_genericImpl){
+ if (m_genericImpl)
+ {
m_genericImpl->SetItemCount(count);
return;
}
-
+
+ if (m_dbImpl)
+ {
+ // we need to temporarily disable the new item creation notification
+ // procedure to speed things up
+ // FIXME: Even this doesn't seem to help much...
+ DataBrowserCallbacks callbacks;
+ DataBrowserItemNotificationUPP itemUPP;
+ GetDataBrowserCallbacks(m_dbImpl->GetControlRef(), &callbacks);
+ itemUPP = callbacks.u.v1.itemNotificationCallback;
+ callbacks.u.v1.itemNotificationCallback = 0;
+ m_dbImpl->SetCallbacks(&callbacks);
+ ::AddDataBrowserItems(m_dbImpl->GetControlRef(), kDataBrowserNoItem,
+ count, NULL, kDataBrowserItemNoProperty);
+ callbacks.u.v1.itemNotificationCallback = itemUPP;
+ m_dbImpl->SetCallbacks(&callbacks);
+ }
m_count = count;
}
void wxListCtrl::RefreshItem(long item)
{
- if (m_genericImpl){
+ if (m_genericImpl)
+ {
m_genericImpl->RefreshItem(item);
return;
}
-
+
wxRect rect;
GetItemRect(item, rect);
RefreshRect(rect);
void wxListCtrl::RefreshItems(long itemFrom, long itemTo)
{
- if (m_genericImpl){
+ if (m_genericImpl)
+ {
m_genericImpl->RefreshItems(itemFrom, itemTo);
return;
}
}
-// wxMac internal data structures
+// wxMac internal data structures
wxMacListCtrlItem::~wxMacListCtrlItem()
{
delete this;
return;
}
+ 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
+ return ;
+ }
wxListCtrl *list = wxDynamicCast( owner->GetPeer() , wxListCtrl );
- if ( list ){
+ 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 );
event.m_itemIndex = owner->GetLineFromItem( this ) ;
if ( !list->IsVirtual() )
{
lb->MacGetColumnInfo(event.m_itemIndex,0,event.m_item);
}
-
+
switch (message)
{
case kDataBrowserItemDeselected:
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
{
OSStatus err = noErr;
m_clientDataItemsType = wxClientData_None;
+ m_isVirtual = false;
+
+ if ( style & wxLC_VIRTUAL )
+ m_isVirtual = true;
DataBrowserSelectionFlags options = kDataBrowserDragSelect;
if ( style & wxLC_SINGLE_SEL )
}
else
{
- options |= kDataBrowserAlwaysExtendSelection | kDataBrowserCmdTogglesSelection;
+ options |= kDataBrowserCmdTogglesSelection;
}
err = SetSelectionFlags( options );
verify_noerr( err );
+
+ DataBrowserCustomCallbacks callbacks;
+ InitializeDataBrowserCustomCallbacks( &callbacks, kDataBrowserLatestCustomCallbacks );
+
+ if ( gDataBrowserDrawItemUPP == NULL )
+ gDataBrowserDrawItemUPP = NewDataBrowserDrawItemUPP(DataBrowserDrawItemProc);
- if ( style & wxLC_LIST ){
+// 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 )
+ {
InsertColumn(0, kDataBrowserIconAndTextType, wxEmptyString, -1, -1);
verify_noerr( AutoSizeColumns() );
- verify_noerr( SetHeaderButtonHeight( 0 ) );
}
- SetDataBrowserSortProperty( m_controlRef , kMinColumnId );
+ if ( style & wxLC_LIST || style & wxLC_NO_HEADER )
+ verify_noerr( SetHeaderButtonHeight( 0 ) );
+
+ if ( m_isVirtual )
+ SetSortProperty( kMinColumnId - 1 );
+ else
+ SetSortProperty( kMinColumnId );
if ( style & wxLC_SORT_ASCENDING )
{
m_sortOrder = SortOrder_Text_Ascending;
- SetDataBrowserSortProperty( m_controlRef , kMinColumnId );
- SetDataBrowserSortOrder( m_controlRef , kDataBrowserOrderIncreasing);
+ SetSortOrder( kDataBrowserOrderIncreasing );
}
else if ( style & wxLC_SORT_DESCENDING )
{
m_sortOrder = SortOrder_Text_Descending;
- SetDataBrowserSortProperty( m_controlRef , kMinColumnId );
- SetDataBrowserSortOrder( m_controlRef , kDataBrowserOrderDecreasing);
+ SetSortOrder( kDataBrowserOrderDecreasing );
}
else
{
m_sortOrder = SortOrder_None;
- SetDataBrowserSortProperty( m_controlRef , kMinColumnId);
- SetDataBrowserSortOrder( m_controlRef , kDataBrowserOrderIncreasing);
}
- verify_noerr( AutoSizeColumns() );
+ 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 );
}
+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,
+ Boolean changeValue )
+{
+ wxString text;
+ int imgIndex = -1;
+ short listColumn = property - kMinColumnId;
+
+ OSStatus err = errDataBrowserPropertyNotSupported;
+ wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl );
+ wxMacListCtrlItem* lcItem;
+
+ if (listColumn >= 0)
+ {
+ if (!m_isVirtual)
+ {
+ lcItem = (wxMacListCtrlItem*) itemID;
+ if (lcItem->HasColumnInfo(listColumn)){
+ wxListItem* item = lcItem->GetColumnInfo(listColumn);
+ 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 );
+ }
+ }
+
+ if ( !changeValue )
+ {
+ switch (property)
+ {
+ case kDataBrowserItemIsEditableProperty :
+ if ( list && list->HasFlag( wxLC_EDIT_LABELS ) )
+ {
+ verify_noerr(SetDataBrowserItemDataBooleanValue( itemData, true ));
+ err = noErr ;
+ }
+ break ;
+ default :
+ 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);
+ if (imageList && imageList->GetImageCount() > 0){
+ wxBitmap bmp = imageList->GetBitmap(imgIndex);
+ IconRef icon = bmp.GetBitmapData()->GetIconRef();
+ ::SetDataBrowserItemDataIcon(itemData, icon);
+ }
+ }
+
+ }
+ break ;
+ }
+
+ }
+ else
+ {
+ switch (property)
+ {
+ default:
+ if ( property >= kMinColumnId )
+ {
+ short listColumn = property - kMinColumnId;
+
+ // TODO probably send the 'end edit' from here, as we
+ // can then deal with the veto
+ CFStringRef sr ;
+ verify_noerr( GetDataBrowserItemDataText( itemData , &sr ) ) ;
+ wxMacCFStringHolder cfStr(sr) ;;
+ if (m_isVirtual)
+ list->SetItem( (long)itemData-1 , listColumn, cfStr.AsString() ) ;
+ else
+ {
+ if (lcItem)
+ lcItem->SetColumnTextValue( listColumn, cfStr.AsString() );
+ }
+ err = noErr ;
+ }
+ break;
+ }
+ }
+ return err;
+}
+
+void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID,
+ DataBrowserItemNotification message,
+ DataBrowserItemDataRef itemData )
+{
+ // we want to depend on as little as possible to make sure tear-down of controls is safe
+ if ( message == kDataBrowserItemRemoved)
+ {
+ // make sure MacDelete does the proper teardown.
+ return;
+ }
+ 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 getting out now
+ return ;
+ }
+
+ wxListCtrl *list = wxDynamicCast( GetPeer() , wxListCtrl );
+ if ( list )
+ {
+ 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;
+ }
+
+ switch (message)
+ {
+ case kDataBrowserItemDeselected:
+ event.SetEventType(wxEVT_COMMAND_LIST_ITEM_DESELECTED);
+ if ( !isSingle )
+ trigger = !IsSelectionSuppressed();
+ break;
+
+ case kDataBrowserItemSelected:
+ trigger = !IsSelectionSuppressed();
+
+ break;
+
+ case kDataBrowserItemDoubleClicked:
+ event.SetEventType( wxEVT_COMMAND_LIST_ITEM_ACTIVATED );
+ trigger = true;
+ break;
+
+ case kDataBrowserEditStarted :
+ // TODO : how to veto ?
+ 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
+ event.SetEventType( wxEVT_COMMAND_LIST_END_LABEL_EDIT ) ;
+ trigger = true ;
+ break ;
+
+ default:
+ break;
+ }
+
+ if ( trigger )
+ {
+ // direct notification is not always having the listbox GetSelection() having in synch with event
+ wxPostEvent( list->GetEventHandler(), event );
+ }
+ }
+}
+
+Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneID,
+ DataBrowserItemID itemTwoID,
+ DataBrowserPropertyID sortProperty)
+{
+
+ bool retval = false;
+ wxString itemText;
+ wxString otherItemText;
+ int colId = sortProperty - kMinColumnId;
+ long itemNum = 0;
+ long otherItemNum = 0;
+
+ wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl );
+
+ // 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))
+ itemText = item->GetColumnInfo(colId)->GetText();
+ if (otherItem->HasColumnInfo(colId))
+ otherItemText = otherItem->GetColumnInfo(colId)->GetText();
+ }
+ else
+ {
+ itemNum = (long)itemOneID;
+ otherItemNum = (long)itemTwoID;
+ itemText = list->OnGetItemText( itemNum-1, colId );
+ otherItemText = list->OnGetItemText( otherItemNum-1, colId );
+
+ }
+
+ DataBrowserSortOrder sort;
+ verify_noerr(GetSortOrder(&sort));
+
+ if ( sort == kDataBrowserOrderIncreasing )
+ {
+ retval = itemText.CmpNoCase( otherItemText ) > 0;
+ }
+ else if ( sort == kDataBrowserOrderDecreasing )
+ {
+ retval = itemText.CmpNoCase( otherItemText ) < 0;
+ }
+ }
+ else{
+ // fallback for undefined cases
+ retval = itemOneID < itemTwoID;
+ }
+
+ return retval;
+}
+
wxMacDataBrowserListCtrlControl::~wxMacDataBrowserListCtrlControl()
{
}
void wxMacDataBrowserListCtrlControl::MacSetColumnInfo( unsigned int row, unsigned int column, wxListItem* item )
-{
+{
wxMacDataItem* dataItem = GetItemFromLine(row);
- if (item){
+ if (item)
+ {
wxMacListCtrlItem* listItem = dynamic_cast<wxMacListCtrlItem*>(dataItem);
listItem->SetColumnInfo( column, item );
UpdateState(dataItem, 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.
- if ( isSelected != isSelectedState ){
+ // toggle the selection state if wxListInfo state and actual state don't match.
+ if ( isSelected != isSelectedState )
+ {
DataBrowserSetOption options = kDataBrowserItemsAdd;
if (!isSelectedState)
options = kDataBrowserItemsRemove;
- fprintf(stderr, "state = %d, db options = %d\n", isSelectedState, options);
SetSelectedItem(dataItem, options);
}
// TODO: Set column width if item width > than current column width
}
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
item.SetTextColour(oldItem->GetTextColour());
item.SetBackgroundColour(oldItem->GetBackgroundColour());
- item.SetFont(oldItem->GetFont());
+ item.SetFont(oldItem->GetFont());
}
}
MacSetColumnInfo(n, 0, item);
}
-wxMacListCtrlItem* wxMacDataBrowserListCtrlControl::CreateItem()
+wxMacDataItem* wxMacDataBrowserListCtrlControl::CreateItem()
{
return new wxMacListCtrlItem();
}
void wxMacListCtrlItem::SetColumnTextValue( unsigned int column, const wxString& text )
{
GetColumnInfo(column)->SetText(text);
-
+
// for compatibility with superclass APIs
if ( column == 0 )
SetLabel(text);
void wxMacListCtrlItem::SetColumnInfo( unsigned int column, wxListItem* item )
{
- if ( column >= m_rowItems.GetCount() ){
+ if ( column >= m_rowItems.GetCount() )
+ {
wxListItem* listItem = new wxListItem(*item);
- //listItem->SetAlign(item->GetAlign());
- //listItem->SetBackgroundColour(item->GetBackgroundColour());
- //listItem->SetColumn(item->GetColumn());
- //listItem->SetData(item->GetData());
- //listItem->SetFont(item->GetFont());
- //listItem->SetId(GetOrder());
- //listItem->SetImage(item->GetImage());
- //listItem->SetMask(item->GetMask());
-
- //listItem->SetText(item->GetText());
m_rowItems.Append( listItem );
}
- else{
+ else
+ {
wxListItem* listItem = GetColumnInfo( column );
long mask = item->GetMask();
if (mask & wxLIST_MASK_TEXT)
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());
}
}
-OSStatus wxMacListCtrlItem::GetSetData( wxMacDataItemBrowserControl *owner ,
- DataBrowserPropertyID property,
- DataBrowserItemDataRef itemData,
- bool changeValue )
-{
-
- OSStatus err = errDataBrowserPropertyNotSupported;
- wxListCtrl* list = wxDynamicCast( owner->GetPeer() , wxListCtrl );
- if ( !changeValue )
- {
- switch (property)
- {
- case kDataBrowserItemIsEditableProperty :
- if ( list && list->HasFlag( wxLC_EDIT_LABELS ) )
- {
- verify_noerr(SetDataBrowserItemDataBooleanValue( itemData, true ));
- err = noErr ;
- }
- break ;
- default :
- if ( property >= kMinColumnId ){
- short listColumn = property - kMinColumnId;
-
- if (HasColumnInfo(listColumn)){
- wxListItem* item = GetColumnInfo(listColumn);
- wxMacCFStringHolder cfStr;
-
- if (item->GetText()){
- cfStr.Assign( item->GetText(), wxLocale::GetSystemEncoding() );
- err = ::SetDataBrowserItemDataText( itemData, cfStr );
- err = noErr;
- }
-
- int imgIndex = item->GetImage();
- if ( (item->GetMask() & wxLIST_MASK_IMAGE) ){
- wxImageList* imageList = list->GetImageList(wxIMAGE_LIST_SMALL);
- if (imageList && imageList->GetImageCount() > 0){
- wxBitmap bmp = imageList->GetBitmap(imgIndex);
- IconRef icon = bmp.GetBitmapData()->GetIconRef();
- ::SetDataBrowserItemDataIcon(itemData, icon);
- }
- }
-
- }
- }
- break ;
- }
- }
- else
- {
- switch (property)
- {
- default:
- if ( property >= kMinColumnId ){
- short listColumn = property - kMinColumnId;
-
- if (HasColumnInfo(listColumn)){
- // TODO probably send the 'end edit' from here, as we
- // can then deal with the veto
- CFStringRef sr ;
- verify_noerr( GetDataBrowserItemDataText( itemData , &sr ) ) ;
- wxMacCFStringHolder cfStr(sr) ;;
- list->SetItem( owner->GetLineFromItem(this) , listColumn, cfStr.AsString() ) ;
- err = noErr ;
- }
- }
- break;
- }
- }
-
- // don't duplicate the numeric order column handling
- if (err == errDataBrowserPropertyNotSupported)
- err = wxMacDataItem::GetSetData(owner, property, itemData, changeValue);
-
- return err;
-}
-
#endif // wxUSE_LISTCTRL
projects / wxWidgets.git / blobdiff