// Author: Julian Smart
// Modified by: Agron Selimaj
// Created: 04/01/98
-// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/hashmap.h"
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxListCtrlStyle )
-
-wxBEGIN_FLAGS( wxListCtrlStyle )
- // new style border flags, we put them first to
- // use them for streaming out
- wxFLAGS_MEMBER(wxBORDER_SIMPLE)
- wxFLAGS_MEMBER(wxBORDER_SUNKEN)
- wxFLAGS_MEMBER(wxBORDER_DOUBLE)
- wxFLAGS_MEMBER(wxBORDER_RAISED)
- wxFLAGS_MEMBER(wxBORDER_STATIC)
- wxFLAGS_MEMBER(wxBORDER_NONE)
-
- // old style border flags
- wxFLAGS_MEMBER(wxSIMPLE_BORDER)
- wxFLAGS_MEMBER(wxSUNKEN_BORDER)
- wxFLAGS_MEMBER(wxDOUBLE_BORDER)
- wxFLAGS_MEMBER(wxRAISED_BORDER)
- wxFLAGS_MEMBER(wxSTATIC_BORDER)
- wxFLAGS_MEMBER(wxBORDER)
-
- // standard window styles
- wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
- wxFLAGS_MEMBER(wxCLIP_CHILDREN)
- wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
- wxFLAGS_MEMBER(wxWANTS_CHARS)
- wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
- wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
- wxFLAGS_MEMBER(wxVSCROLL)
- wxFLAGS_MEMBER(wxHSCROLL)
-
- wxFLAGS_MEMBER(wxLC_LIST)
- wxFLAGS_MEMBER(wxLC_REPORT)
- wxFLAGS_MEMBER(wxLC_ICON)
- wxFLAGS_MEMBER(wxLC_SMALL_ICON)
- wxFLAGS_MEMBER(wxLC_ALIGN_TOP)
- wxFLAGS_MEMBER(wxLC_ALIGN_LEFT)
- wxFLAGS_MEMBER(wxLC_AUTOARRANGE)
- wxFLAGS_MEMBER(wxLC_USER_TEXT)
- wxFLAGS_MEMBER(wxLC_EDIT_LABELS)
- wxFLAGS_MEMBER(wxLC_NO_HEADER)
- wxFLAGS_MEMBER(wxLC_SINGLE_SEL)
- wxFLAGS_MEMBER(wxLC_SORT_ASCENDING)
- wxFLAGS_MEMBER(wxLC_SORT_DESCENDING)
- wxFLAGS_MEMBER(wxLC_VIRTUAL)
-
-wxEND_FLAGS( wxListCtrlStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxListCtrl, wxControl,"wx/listctrl.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxListCtrl)
- wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent )
-
- wxPROPERTY_FLAGS( WindowStyle , wxListCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxListCtrl)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_5( wxListCtrl , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
-
-/*
- TODO : Expose more information of a list's layout etc. via appropriate objects (￠ la NotebookPageInfo)
-*/
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl)
-#endif
-
-IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)
-IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
-
-IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
-
WX_DECLARE_HASH_MAP( int, wxListItem*, wxIntegerHash, wxIntegerEqual, wxListItemList );
#include "wx/listimpl.cpp"
cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ;
wxListCtrl *window = (wxListCtrl*) data ;
- wxListEvent le( wxEVT_COMMAND_LIST_COL_CLICK, window->GetId() );
+ wxListEvent le( wxEVT_LIST_COL_CLICK, window->GetId() );
le.SetEventObject( window );
switch ( GetEventKind( event ) )
event.Skip();
}
-BEGIN_EVENT_TABLE(wxListCtrl, wxControl)
- EVT_LEFT_DOWN(wxListCtrl::OnLeftDown)
- EVT_LEFT_DCLICK(wxListCtrl::OnDblClick)
- EVT_MIDDLE_DOWN(wxListCtrl::OnMiddleDown)
- EVT_RIGHT_DOWN(wxListCtrl::OnRightDown)
- EVT_CHAR(wxListCtrl::OnChar)
-END_EVENT_TABLE()
-
// ============================================================================
// implementation
// ============================================================================
m_bgColor = wxNullColour;
m_textctrlWrapper = NULL;
m_current = -1;
- m_renameTimer = new wxListCtrlRenameTimer( this );
+ m_renameTimer = NULL;
}
class wxGenericListCtrlHook : public wxGenericListCtrl
int hitResult;
long current = HitTest(event.GetPosition(), hitResult);
if ((current == m_current) &&
- (hitResult == wxLIST_HITTEST_ONITEM) &&
+ (hitResult & wxLIST_HITTEST_ONITEMLABEL) &&
HasFlag(wxLC_EDIT_LABELS) )
{
- m_renameTimer->Start( 100, true );
+ if ( m_renameTimer )
+ m_renameTimer->Start( 250, true );
}
else
{
void wxListCtrl::OnDblClick(wxMouseEvent& event)
{
- if ( m_renameTimer->IsRunning() )
+ if ( m_renameTimer && m_renameTimer->IsRunning() )
m_renameTimer->Stop();
event.Skip();
}
void wxListCtrl::OnRightDown(wxMouseEvent& event)
{
if (m_dbImpl)
- FireMouseEvent(wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, event.GetPosition());
+ FireMouseEvent(wxEVT_LIST_ITEM_RIGHT_CLICK, event.GetPosition());
event.Skip();
}
void wxListCtrl::OnMiddleDown(wxMouseEvent& event)
{
if (m_dbImpl)
- FireMouseEvent(wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK, event.GetPosition());
+ FireMouseEvent(wxEVT_LIST_ITEM_MIDDLE_CLICK, event.GetPosition());
event.Skip();
}
if (m_dbImpl)
{
- wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetId() );
+ wxListEvent le( wxEVT_LIST_KEY_DOWN, GetId() );
le.SetEventObject(this);
le.m_code = event.GetKeyCode();
le.m_itemIndex = -1;
&& (wxSystemOptions::GetOptionInt( wxMAC_ALWAYS_USE_GENERIC_LISTCTRL ) == 1)) ||
(style & wxLC_ICON) || (style & wxLC_SMALL_ICON) || (style & wxLC_LIST) )
{
- m_macIsUserPane = true;
-
long paneStyle = style;
paneStyle &= ~wxSIMPLE_BORDER;
paneStyle &= ~wxDOUBLE_BORDER;
else
{
- m_macIsUserPane = false;
+ DontCreatePeer();
if ( !wxWindow::Create(parent, id, pos, size, style & ~(wxHSCROLL | wxVSCROLL), name) )
return false;
m_dbImpl = new wxMacDataBrowserListCtrlControl( this, pos, size, style );
- m_peer = m_dbImpl;
+ SetPeer(m_dbImpl);
MacPostControlCreate( pos, size );
- InstallControlEventHandler( m_peer->GetControlRef() , GetwxMacListCtrlEventHandlerUPP(),
+ InstallControlEventHandler( GetPeer()->GetControlRef() , GetwxMacListCtrlEventHandlerUPP(),
GetEventTypeCount(eventList), eventList, this,
(EventHandlerRef *)&m_macListCtrlEventHandler);
+
+ m_renameTimer = new wxListCtrlRenameTimer( this );
+
+ Connect( wxID_ANY, wxEVT_CHAR, wxCharEventHandler(wxListCtrl::OnChar), NULL, this );
+ Connect( wxID_ANY, wxEVT_LEFT_DOWN, wxMouseEventHandler(wxListCtrl::OnLeftDown), NULL, this );
+ Connect( wxID_ANY, wxEVT_LEFT_DCLICK, wxMouseEventHandler(wxListCtrl::OnDblClick), NULL, this );
+ Connect( wxID_ANY, wxEVT_MIDDLE_DOWN, wxMouseEventHandler(wxListCtrl::OnMiddleDown), NULL, this );
+ Connect( wxID_ANY, wxEVT_RIGHT_DOWN, wxMouseEventHandler(wxListCtrl::OnRightDown), NULL, this );
}
return true;
attr.colFg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
attr.colBg = wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX );
- attr.font.CreateSystemFont(wxOSX_SYSTEM_FONT_VIEWS);
+ static wxFont font = wxFont(wxOSX_SYSTEM_FONT_VIEWS);
+ attr.font = font;
return attr;
}
void wxListCtrl::DoSetSize( int x, int y, int width, int height, int sizeFlags )
{
- wxControl::DoSetSize(x, y, width, height, sizeFlags);
+ wxListCtrlBase::DoSetSize(x, y, width, height, sizeFlags);
if (m_genericImpl)
m_genericImpl->SetSize(0, 0, width, height, sizeFlags);
}
}
-wxSize wxListCtrl::DoGetBestSize() const
-{
- return wxWindow::DoGetBestSize();
-}
-
bool wxListCtrl::SetFont(const wxFont& font)
{
- bool rv = true;
- rv = wxControl::SetFont(font);
+ bool rv = wxListCtrlBase::SetFont(font);
if (m_genericImpl)
rv = m_genericImpl->SetFont(font);
return rv;
return wxNullColour;
}
+void wxListCtrl::Freeze ()
+{
+ if (m_genericImpl)
+ m_genericImpl->Freeze();
+ wxListCtrlBase::Freeze();
+}
+
+void wxListCtrl::Thaw ()
+{
+ if (m_genericImpl)
+ m_genericImpl->Thaw();
+ wxListCtrlBase::Thaw();
+}
+
+void wxListCtrl::Update ()
+{
+ if (m_genericImpl)
+ m_genericImpl->Update();
+ wxListCtrlBase::Update();
+}
+
// ----------------------------------------------------------------------------
// accessors
// ----------------------------------------------------------------------------
}
// Sets information about this column
-bool wxListCtrl::SetColumn(int col, wxListItem& item)
+bool wxListCtrl::SetColumn(int col, const wxListItem& item)
{
if (m_genericImpl)
return m_genericImpl->SetColumn(col, item);
if (item.GetMask() & wxLIST_MASK_TEXT)
{
wxFontEncoding enc;
- if ( m_font.Ok() )
+ if ( m_font.IsOk() )
enc = GetFont().GetEncoding();
else
enc = wxLocale::GetSystemEncoding();
}
// Gets the item text
-wxString wxListCtrl::GetItemText(long item) const
+wxString wxListCtrl::GetItemText(long item, int column) const
{
if (m_genericImpl)
- return m_genericImpl->GetItemText(item);
+ return m_genericImpl->GetItemText(item, column);
wxListItem info;
info.m_mask = wxLIST_MASK_TEXT;
info.m_itemId = item;
+ info.m_col = column;
if (!GetItem(info))
return wxEmptyString;
if (m_dbImpl)
{
m_dbImpl->MacDelete(item);
- wxListEvent event( wxEVT_COMMAND_LIST_DELETE_ITEM, GetId() );
+ wxListEvent event( wxEVT_LIST_DELETE_ITEM, GetId() );
event.SetEventObject( this );
event.m_itemIndex = item;
HandleWindowEvent( event );
if (m_dbImpl)
{
m_dbImpl->MacClear();
- wxListEvent event( wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, GetId() );
+ wxListEvent event( wxEVT_LIST_DELETE_ALL_ITEMS, GetId() );
event.SetEventObject( this );
HandleWindowEvent( event );
}
wxASSERT_MSG( textControlClass->IsKindOf(CLASSINFO(wxTextCtrl)),
wxT("EditLabel() needs a text control") );
- wxListEvent le( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, GetParent()->GetId() );
+ wxListEvent le( wxEVT_LIST_BEGIN_LABEL_EDIT, GetParent()->GetId() );
le.SetEventObject( this );
le.m_itemIndex = item;
le.m_col = 0;
return -1;
}
+static void calculateCGDrawingBounds(CGRect inItemRect, CGRect *outIconRect, CGRect *outTextRect, bool hasIcon);
+
// Determines which item (if any) is at the specified point,
// giving details in 'flags' (see wxLIST_HITTEST_... flags above)
long
wxListCtrl::HitTest(const wxPoint& point, int& flags, long *ptrSubItem) const
{
+ if (ptrSubItem)
+ *ptrSubItem = -1;
+
if (m_genericImpl)
return m_genericImpl->HitTest(point, flags, ptrSubItem);
DataBrowserItemID id;
m_dbImpl->GetItemID( (DataBrowserTableViewRowIndex) row, &id );
- // TODO: Use GetDataBrowserItemPartBounds to return if we are in icon or label
- if ( !(GetWindowStyleFlag() & wxLC_VIRTUAL ) )
+ CGPoint click_point = CGPointMake( point.x, point.y );
+ if (row < GetItemCount() )
{
- wxMacListCtrlItem* lcItem;
- lcItem = (wxMacListCtrlItem*) id;
- if (lcItem)
+ short column;
+ for( column = 0; column < GetColumnCount(); column++ )
{
- flags = wxLIST_HITTEST_ONITEM;
- return row;
- }
- }
- else
- {
- if (row < GetItemCount() )
- {
- flags = wxLIST_HITTEST_ONITEM;
- return row;
- }
- }
-
+ Rect enclosingRect;
+ CGRect enclosingCGRect, iconCGRect, textCGRect;
+ int imgIndex = -1;
+ wxMacListCtrlItem* lcItem;
+
+ WXUNUSED_UNLESS_DEBUG( OSStatus status = ) m_dbImpl->GetItemPartBounds( id, kMinColumnId + column, kDataBrowserPropertyEnclosingPart, &enclosingRect );
+ wxASSERT( status == noErr );
+
+ enclosingCGRect = CGRectMake(enclosingRect.left,
+ enclosingRect.top,
+ enclosingRect.right - enclosingRect.left,
+ enclosingRect.bottom - enclosingRect.top);
+
+ if (column >= 0)
+ {
+ if ( !(GetWindowStyleFlag() & wxLC_VIRTUAL ) )
+ {
+ lcItem = (wxMacListCtrlItem*) id;
+ if (lcItem->HasColumnInfo(column))
+ {
+ wxListItem* item = lcItem->GetColumnInfo(column);
+
+ if (item->GetMask() & wxLIST_MASK_IMAGE)
+ {
+ imgIndex = item->GetImage();
+ }
+ }
+ }
+ else
+ {
+ long itemNum = (long)id-1;
+ if (itemNum >= 0 && itemNum < GetItemCount())
+ {
+ imgIndex = OnGetItemColumnImage( itemNum, column );
+ }
+ }
+ }
+
+ calculateCGDrawingBounds(enclosingCGRect, &iconCGRect, &textCGRect, (imgIndex != -1) );
+
+ if ( CGRectContainsPoint( iconCGRect, click_point ) )
+ {
+ flags = wxLIST_HITTEST_ONITEMICON;
+ if (ptrSubItem)
+ *ptrSubItem = column;
+ return row;
+ }
+ else if ( CGRectContainsPoint( textCGRect, click_point ) )
+ {
+ flags = wxLIST_HITTEST_ONITEMLABEL;
+ if (ptrSubItem)
+ *ptrSubItem = column;
+ return row;
+ }
+ }
+
+ if ( !(GetWindowStyleFlag() & wxLC_VIRTUAL ) )
+ {
+ wxMacListCtrlItem* lcItem;
+ lcItem = (wxMacListCtrlItem*) id;
+ if (lcItem)
+ {
+ flags = wxLIST_HITTEST_ONITEM;
+ if (ptrSubItem)
+ *ptrSubItem = column;
+ return row;
+ }
+ }
+ else
+ {
+ flags = wxLIST_HITTEST_ONITEM;
+ if (ptrSubItem)
+ *ptrSubItem = column;
+ return row;
+ }
+ }
+ else
+ {
+ if ( wxControl::HitTest( point ) )
+ flags = wxLIST_HITTEST_NOWHERE;
+ }
}
+
return -1;
}
m_dbImpl->MacInsertItem(info.m_itemId, &info );
- wxListEvent event( wxEVT_COMMAND_LIST_INSERT_ITEM, GetId() );
+ wxListEvent event( wxEVT_LIST_INSERT_ITEM, GetId() );
event.SetEventObject( this );
event.m_itemIndex = info.m_itemId;
HandleWindowEvent( event );
}
// For list view mode (only), inserts a column.
-long wxListCtrl::InsertColumn(long col, wxListItem& item)
+long wxListCtrl::DoInsertColumn(long col, const wxListItem& item)
{
if (m_genericImpl)
return m_genericImpl->InsertColumn(col, item);
if (imageList && imageList->GetImageCount() > 0)
{
wxBitmap bmp = imageList->GetBitmap(0);
- //if (bmp.Ok())
+ //if (bmp.IsOk())
// type = kDataBrowserIconAndTextType;
}
return col;
}
-long wxListCtrl::InsertColumn(long col,
- const wxString& heading,
- int format,
- int width)
-{
- if (m_genericImpl)
- return m_genericImpl->InsertColumn(col, heading, format, width);
-
- wxListItem item;
- item.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_FORMAT;
- item.m_text = heading;
- if ( width > -1 )
- {
- item.m_mask |= wxLIST_MASK_WIDTH;
- item.m_width = width;
- }
- item.m_format = format;
-
- return InsertColumn(col, item);
-}
-
// scroll the control by the given number of pixels (exception: in list view,
// dx is interpreted as number of columns)
bool wxListCtrl::ScrollList(int dx, int dy)
if (m_dbImpl)
{
- m_dbImpl->SetScrollPosition(dx, dy);
+ // Notice that the parameter order is correct here: first argument is
+ // the "top" displacement, second one is the "left" one.
+ m_dbImpl->SetScrollPosition(dy, dx);
}
return true;
}
bool wxListCtrl::OnRenameAccept(long itemEdit, const wxString& value)
{
- wxListEvent le( wxEVT_COMMAND_LIST_END_LABEL_EDIT, GetId() );
+ wxListEvent le( wxEVT_LIST_END_LABEL_EDIT, GetId() );
le.SetEventObject( this );
le.m_itemIndex = itemEdit;
void wxListCtrl::OnRenameCancelled(long itemEdit)
{
// let owner know that the edit was cancelled
- wxListEvent le( wxEVT_COMMAND_LIST_END_LABEL_EDIT, GetParent()->GetId() );
+ wxListEvent le( wxEVT_LIST_END_LABEL_EDIT, GetParent()->GetId() );
le.SetEditCanceled(true);
return -1;
}
-wxListItemAttr *wxListCtrl::OnGetItemAttr(long WXUNUSED_UNLESS_DEBUG(item)) const
-{
- wxASSERT_MSG( item >= 0 && item < GetItemCount(),
- wxT("invalid item index in OnGetItemAttr()") );
-
- // no attributes by default
- return NULL;
-}
-
void wxListCtrl::SetItemCount(long count)
{
wxASSERT_MSG( IsVirtual(), wxT("this is for virtual controls only") );
{
bool trigger = false;
- wxListEvent event( wxEVT_COMMAND_LIST_ITEM_SELECTED, list->GetId() );
+ wxListEvent event( wxEVT_LIST_ITEM_SELECTED, list->GetId() );
bool isSingle = (list->GetWindowStyle() & wxLC_SINGLE_SEL) != 0;
event.SetEventObject( list );
switch (message)
{
case kDataBrowserItemDeselected:
- event.SetEventType(wxEVT_COMMAND_LIST_ITEM_DESELECTED);
+ event.SetEventType(wxEVT_LIST_ITEM_DESELECTED);
if ( !isSingle )
trigger = !lb->IsSelectionSuppressed();
break;
break;
case kDataBrowserItemDoubleClicked:
- event.SetEventType( wxEVT_COMMAND_LIST_ITEM_ACTIVATED );
+ event.SetEventType( wxEVT_LIST_ITEM_ACTIVATED );
trigger = true;
break;
case kDataBrowserEditStarted :
// TODO : how to veto ?
- event.SetEventType( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT ) ;
+ event.SetEventType( wxEVT_LIST_BEGIN_LABEL_EDIT ) ;
trigger = true ;
break ;
case kDataBrowserEditStopped :
// TODO probably trigger only upon the value store callback, because
// here IIRC we cannot veto
- event.SetEventType( wxEVT_COMMAND_LIST_END_LABEL_EDIT ) ;
+ event.SetEventType( wxEVT_LIST_END_LABEL_EDIT ) ;
trigger = true ;
break ;
static void calculateCGDrawingBounds(CGRect inItemRect, CGRect *outIconRect, CGRect *outTextRect, bool hasIcon = false)
{
float textBottom;
- float iconH, iconW = 0;
+ float iconW = 0;
float padding = kItemPadding;
if (hasIcon)
{
- iconH = kIconHeight;
iconW = kIconWidth;
padding = padding*2;
}
if (bgColor == wxNullColour)
bgColor = listBgColor;
- if (!font.Ok())
+ if (!font.IsOk())
font = list->GetFont();
wxCFStringRef cfString( text, wxLocale::GetSystemEncoding() );
Boolean active;
ThemeDrawingState savedState = NULL;
CGContextRef context = (CGContextRef)list->MacGetDrawingContext();
+ wxMacCGContextStateSaver top_saver_cg( context );
+
RGBColor labelColor;
labelColor.red = 0;
labelColor.green = 0;
GetThemeBrushAsColor(kThemeBrushSecondaryHighlightColor, 32, true, &backgroundColor);
GetThemeTextColor(kThemeTextColorBlack, gdDepth, colorDevice, &labelColor);
}
- CGContextSaveGState(context);
+ wxMacCGContextStateSaver cg( context );
CGContextSetRGBFillColor(context, (CGFloat)backgroundColor.red / (CGFloat)USHRT_MAX,
(CGFloat)backgroundColor.green / (CGFloat)USHRT_MAX,
(CGFloat)backgroundColor.blue / (CGFloat)USHRT_MAX, (CGFloat) 1.0);
CGContextFillRect(context, enclosingCGRect);
-
- CGContextRestoreGState(context);
}
else
{
- if (color.Ok())
+ if (color.IsOk())
color.GetRGBColor(&labelColor);
- else if (list->GetTextColour().Ok())
+ else if (list->GetTextColour().IsOk())
list->GetTextColour().GetRGBColor(&labelColor);
- if (bgColor.Ok())
+ if (bgColor.IsOk())
{
bgColor.GetRGBColor(&backgroundColor);
CGContextSaveGState(context);
if (imgIndex != -1)
{
wxImageList* imageList = list->GetImageList(wxIMAGE_LIST_SMALL);
- if (imageList && imageList->GetImageCount() > 0){
+ if (imageList && imageList->GetImageCount() > 0)
+ {
wxBitmap bmp = imageList->GetBitmap(imgIndex);
IconRef icon = bmp.GetIconRef();
- CGContextSaveGState(context);
+ wxMacCGContextStateSaver cg( context );
+
CGContextTranslateCTM(context, 0,iconCGRect.origin.y + CGRectGetMaxY(iconCGRect));
CGContextScaleCTM(context,1.0f,-1.0f);
PlotIconRefInContext(context, &iconCGRect, kAlignNone,
active ? kTransformNone : kTransformDisabled, NULL,
kPlotIconRefNormalFlags, icon);
-
- CGContextRestoreGState(context);
}
}
{
info.version = kHIThemeTextInfoVersionOne;
info.fontID = kThemeViewsFont;
- if (font.Ok())
+ if (font.IsOk())
{
info.fontID = kThemeSpecifiedFont;
info.font = (CTFontRef) font.OSXGetCTFont();
info.version = kHIThemeTextInfoVersionZero;
info.fontID = kThemeViewsFont;
- if (font.Ok())
+ if (font.IsOk())
{
info.fontID = font.MacGetThemeFontID();
info.truncationPosition = kHIThemeTextTruncationEnd;
info.truncationMaxLines = 1;
- CGContextSaveGState(context);
- CGContextSetRGBFillColor (context, (CGFloat)labelColor.red / (CGFloat)USHRT_MAX,
+ {
+ wxMacCGContextStateSaver cg( context );
+ CGContextSetRGBFillColor (context, (CGFloat)labelColor.red / (CGFloat)USHRT_MAX,
(CGFloat)labelColor.green / (CGFloat)USHRT_MAX,
(CGFloat)labelColor.blue / (CGFloat)USHRT_MAX, (CGFloat) 1.0);
- HIThemeDrawTextBox(cfString, &textCGRect, &info, context, kHIThemeOrientationNormal);
-
- CGContextRestoreGState(context);
+ HIThemeDrawTextBox(cfString, &textCGRect, &info, context, kHIThemeOrientationNormal);
+ }
#ifndef __LP64__
if (savedState != NULL)
{
bool trigger = false;
- wxListEvent event( wxEVT_COMMAND_LIST_ITEM_SELECTED, list->GetId() );
+ wxListEvent event( wxEVT_LIST_ITEM_SELECTED, list->GetId() );
event.SetEventObject( list );
if ( !list->IsVirtual() )
switch (message)
{
case kDataBrowserItemDeselected:
- event.SetEventType(wxEVT_COMMAND_LIST_ITEM_DESELECTED);
+ event.SetEventType(wxEVT_LIST_ITEM_DESELECTED);
// as the generic implementation is also triggering this
// event for single selection, we do the same (different than listbox)
trigger = !IsSelectionSuppressed();
break;
case kDataBrowserItemDoubleClicked:
- event.SetEventType( wxEVT_COMMAND_LIST_ITEM_ACTIVATED );
+ event.SetEventType( wxEVT_LIST_ITEM_ACTIVATED );
trigger = true;
break;
case kDataBrowserEditStarted :
// TODO : how to veto ?
- event.SetEventType( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT ) ;
+ event.SetEventType( wxEVT_LIST_BEGIN_LABEL_EDIT ) ;
trigger = true ;
break ;
case kDataBrowserEditStopped :
// TODO probably trigger only upon the value store callback, because
// here IIRC we cannot veto
- event.SetEventType( wxEVT_COMMAND_LIST_END_LABEL_EDIT ) ;
+ event.SetEventType( wxEVT_LIST_END_LABEL_EDIT ) ;
trigger = true ;
break ;
projects / wxWidgets.git / blobdiff