#ifndef WX_PRECOMP
#include "wx/intl.h"
+ #include "wx/settings.h"
#endif
#include "wx/mac/uma.h"
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)
// 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->GetEventHandler()->ProcessEvent( le );
+ window->HandleWindowEvent( le );
}
result = CallNextEventHandler(handler, event);
break;
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,
if ( !event.IsKindOf( CLASSINFO( wxCommandEvent ) ) )
{
- if (m_list->GetEventHandler()->ProcessEvent( event ))
+ if (m_list->HandleWindowEvent( event ))
return true;
}
return wxEvtHandler::ProcessEvent(event);
le.m_itemIndex = item;
le.m_item.m_itemId = item;
GetItem(le.m_item);
- GetEventHandler()->ProcessEvent(le);
+ HandleWindowEvent(le);
}
}
le.m_itemIndex = m_current;
le.m_item.m_itemId = m_current;
GetItem(le.m_item);
- GetEventHandler()->ProcessEvent(le);
+ HandleWindowEvent(le);
}
}
event.Skip();
delete m_renameTimer;
}
+/*static*/
+wxVisualAttributes wxListCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
+{
+ wxVisualAttributes attr;
+
+ attr.colFg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
+ attr.colBg = wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX );
+ attr.font.MacCreateFromThemeFont(kThemeViewsFont);
+
+ return attr;
+}
+
// ----------------------------------------------------------------------------
// set/get/change style
// ----------------------------------------------------------------------------
{
wxFontEncoding enc;
if ( m_font.Ok() )
- enc = m_font.GetEncoding();
+ enc = GetFont().GetEncoding();
else
enc = wxLocale::GetSystemEncoding();
- wxMacCFStringHolder cfTitle;
+ wxCFStringRef cfTitle;
cfTitle.Assign( item.GetText() , enc );
if(columnDesc.titleString)
CFRelease(columnDesc.titleString);
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;
}
}
if (m_dbImpl)
{
+ UInt16 height = 1;
+ m_dbImpl->GetDefaultRowHeight( &height );
+ if (height > 0)
+ return GetClientSize().y / height;
}
return 1;
if (!IsVirtual())
{
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
{
}
// 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);
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;
}
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)
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 -1;
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 );
}
// ----------------------------------------------------------------------------
return;
}
- wxRect rect;
- GetItemRect(item, rect);
- RefreshRect(rect);
+ if (m_dbImpl)
+ {
+ DataBrowserItemID id;
+
+ if ( !IsVirtual() )
+ {
+ wxMacDataItem* thisItem = m_dbImpl->GetItemFromLine(item);
+ id = (DataBrowserItemID) thisItem;
+ }
+ else
+ id = item+1;
+
+ m_dbImpl->wxMacDataBrowserControl::UpdateItems
+ (
+ kDataBrowserNoItem,
+ 1, &id,
+ kDataBrowserItemNoProperty, // preSortProperty
+ kDataBrowserNoItem // update all columns
+ );
+ }
}
void wxListCtrl::RefreshItems(long itemFrom, long itemTo)
return;
}
- wxRect rect1, rect2;
- GetItemRect(itemFrom, rect1);
- GetItemRect(itemTo, rect2);
+ if (m_dbImpl)
+ {
+ const long count = itemTo - itemFrom + 1;
+ DataBrowserItemID *ids = new DataBrowserItemID[count];
- wxRect rect = rect1;
- rect.height = rect2.GetBottom() - rect1.GetTop();
+ if ( !IsVirtual() )
+ {
+ for ( long i = 0; i < count; i++ )
+ {
+ wxMacDataItem* thisItem = m_dbImpl->GetItemFromLine(itemFrom+i);
+ ids[i] = (DataBrowserItemID) thisItem;
+ }
+ }
+ else
+ {
+ for ( long i = 0; i < count; i++ )
+ ids[i] = itemFrom+i+1;
+ }
+
+ m_dbImpl->wxMacDataBrowserControl::UpdateItems
+ (
+ kDataBrowserNoItem,
+ count, ids,
+ kDataBrowserItemNoProperty, // preSortProperty
+ kDataBrowserNoItem // update all columns
+ );
- RefreshRect(rect);
+ delete[] ids;
+ }
}
void wxListCtrl::SetDropTarget( wxDropTarget *dropTarget )
void wxMacListCtrlItem::Notification(wxMacDataItemBrowserControl *owner ,
DataBrowserItemNotification message,
- DataBrowserItemDataRef itemData ) const
+ DataBrowserItemDataRef WXUNUSED(itemData) ) const
{
wxMacDataBrowserListCtrlControl *lb = wxDynamicCast(owner, wxMacDataBrowserListCtrlControl);
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 ) );
}
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))
{
return false;
}
DataBrowserItemID itemID,
DataBrowserPropertyID property,
DataBrowserItemState itemState,
- const Rect *itemRect,
+ const Rect *WXUNUSED(itemRect),
SInt16 gdDepth,
Boolean colorDevice)
{
if (bgColor == wxNullColour)
bgColor = listBgColor;
- wxFont listFont = list->GetFont();
- if (font == wxNullFont)
- font = listFont;
+ if (!font.Ok())
+ font = list->GetFont();
- wxMacCFStringHolder cfString;
- cfString.Assign( text, wxLocale::GetSystemEncoding() );
+ wxCFStringRef cfString( text, wxLocale::GetSystemEncoding() );
Rect enclosingRect;
CGRect enclosingCGRect, iconCGRect, textCGRect;
}
CGContextSaveGState(context);
- CGContextSetRGBFillColor(context, (float)backgroundColor.red / (float)USHRT_MAX,
- (float)backgroundColor.green / (float)USHRT_MAX,
- (float)backgroundColor.blue / (float)USHRT_MAX, 1.0);
+ CGContextSetRGBFillColor(context, (CGFloat)backgroundColor.red / (CGFloat)USHRT_MAX,
+ (CGFloat)backgroundColor.green / (CGFloat)USHRT_MAX,
+ (CGFloat)backgroundColor.blue / (CGFloat)USHRT_MAX, (CGFloat) 1.0);
CGContextFillRect(context, enclosingCGRect);
CGContextRestoreGState(context);
{
if (color.Ok())
- labelColor = MAC_WXCOLORREF( color.GetPixel() );
+ color.GetRGBColor(&labelColor);
else if (list->GetTextColour().Ok())
- labelColor = MAC_WXCOLORREF( list->GetTextColour().GetPixel() );
+ list->GetTextColour().GetRGBColor(&labelColor);
if (bgColor.Ok())
{
- backgroundColor = MAC_WXCOLORREF( bgColor.GetPixel() );
+ bgColor.GetRGBColor(&backgroundColor);
CGContextSaveGState(context);
- CGContextSetRGBFillColor(context, (float)backgroundColor.red / (float)USHRT_MAX,
- (float)backgroundColor.green / (float)USHRT_MAX,
- (float)backgroundColor.blue / (float)USHRT_MAX, 1.0);
+ CGContextSetRGBFillColor(context, (CGFloat)backgroundColor.red / (CGFloat)USHRT_MAX,
+ (CGFloat)backgroundColor.green / (CGFloat)USHRT_MAX,
+ (CGFloat)backgroundColor.blue / (CGFloat)USHRT_MAX, (CGFloat) 1.0);
CGContextFillRect(context, enclosingCGRect);
CGContextRestoreGState(context);
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();
CGContextSaveGState(context);
CGContextTranslateCTM(context, 0,iconCGRect.origin.y + CGRectGetMaxY(iconCGRect));
}
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())
+ {
+ info.fontID = font.MacGetThemeFontID();
+
+ ::TextSize( (short)(font.MacGetFontSize()) ) ;
+ ::TextFace( font.MacGetFontStyle() ) ;
+ }
}
+#endif
wxListItem item;
list->GetColumn(listColumn, item);
}
}
- 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,
- (float)labelColor.blue / (float)USHRT_MAX, 1.0);
+ CGContextSetRGBFillColor (context, (CGFloat)labelColor.red / (CGFloat)USHRT_MAX,
+ (CGFloat)labelColor.green / (CGFloat)USHRT_MAX,
+ (CGFloat)labelColor.blue / (CGFloat)USHRT_MAX, (CGFloat) 1.0);
HIThemeDrawTextBox(cfString, &textCGRect, &info, context, kHIThemeOrientationNormal);
CGContextRestoreGState(context);
+#ifndef __LP64__
if (savedState != NULL)
SetThemeDrawingState(savedState, true);
+#endif
}
OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemID,
OSStatus err = errDataBrowserPropertyNotSupported;
wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl );
- wxMacListCtrlItem* lcItem;
+ wxMacListCtrlItem* lcItem = NULL;
if (listColumn >= 0)
{
if ( list && list->HasFlag( wxLC_EDIT_LABELS ) )
{
verify_noerr(SetDataBrowserItemDataBooleanValue( itemData, true ));
+ err = noErr ;
}
break ;
default :
if ( property >= kMinColumnId )
{
- wxMacCFStringHolder cfStr(text);
- verify_noerr( ::SetDataBrowserItemDataText( itemData, cfStr) );
+ 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() )
{
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:
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)
projects / wxWidgets.git / blobdiff