Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation fix: don't try to convert wxString to bool (apparently unnecessarily)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-04-06 21:35:21 +00:00
parent c3b8bf3fb5
commit 07977ff28e
1 changed files with 30 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/mac/carbon/listctrl_mac.cpp
View File

@@ -220,7 +220,7 @@ public:
virtual void MacGetColumnInfo( 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); virtual void UpdateState(wxMacDataItem* dataItem, wxListItem* item);
int GetFlags() { return m_flags; } int GetFlags() { return m_flags; }
protected: protected:
// we need to override to provide specialized handling for virtual wxListCtrls // we need to override to provide specialized handling for virtual wxListCtrls
virtual OSStatus GetSetItemData(DataBrowserItemID itemID, virtual OSStatus GetSetItemData(DataBrowserItemID itemID,
@@ -640,7 +640,7 @@ void wxListCtrl::FireMouseEvent(wxEventType eventType, wxPoint position)
le.SetEventObject(this); le.SetEventObject(this);
le.m_pointDrag = position; le.m_pointDrag = position;
le.m_itemIndex = -1; le.m_itemIndex = -1;
int flags; int flags;
long item = HitTest(position, flags); long item = HitTest(position, flags);
if (flags & wxLIST_HITTEST_ONITEM) if (flags & wxLIST_HITTEST_ONITEM)
@@ -660,7 +660,7 @@ void wxListCtrl::OnChar(wxKeyEvent& event)
le.SetEventObject(this); le.SetEventObject(this);
le.m_code = event.GetKeyCode(); le.m_code = event.GetKeyCode();
le.m_itemIndex = -1; le.m_itemIndex = -1;
if (m_current != -1) if (m_current != -1)
{ {
le.m_itemIndex = m_current; le.m_itemIndex = m_current;
@@ -1023,7 +1023,7 @@ bool wxListCtrl::SetColumnWidth(int col, int width)
{ {
wxListItem colInfo; wxListItem colInfo;
GetColumn(col, colInfo); GetColumn(col, colInfo);
colInfo.SetWidth(width); colInfo.SetWidth(width);
SetColumn(col, colInfo); SetColumn(col, colInfo);
m_dbImpl->SetColumnWidth(col, mywidth); m_dbImpl->SetColumnWidth(col, mywidth);
@@ -1570,30 +1570,30 @@ long wxListCtrl::GetNextItem(long item, int geom, int state) const
DataBrowserItemID id = line + 1; DataBrowserItemID id = line + 1;
if ( !IsVirtual() ) if ( !IsVirtual() )
id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(line); id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(line);
if ( (state == wxLIST_STATE_DONTCARE ) ) if ( (state == wxLIST_STATE_DONTCARE ) )
return line; return line;
if ( (state & wxLIST_STATE_SELECTED) && IsDataBrowserItemSelected(m_dbImpl->GetControlRef(), id ) ) if ( (state & wxLIST_STATE_SELECTED) && IsDataBrowserItemSelected(m_dbImpl->GetControlRef(), id ) )
return line; return line;
} }
} }
if ( geom == wxLIST_NEXT_ALL || geom == wxLIST_NEXT_ABOVE ) if ( geom == wxLIST_NEXT_ALL || geom == wxLIST_NEXT_ABOVE )
{ {
int item2 = item; int item2 = item;
if ( item2 == -1 ) if ( item2 == -1 )
item2 = m_dbImpl->MacGetCount(); item2 = m_dbImpl->MacGetCount();
for ( long line = item2 - 1 ; line >= 0; line-- ) for ( long line = item2 - 1 ; line >= 0; line-- )
{ {
DataBrowserItemID id = line + 1; DataBrowserItemID id = line + 1;
if ( !IsVirtual() ) if ( !IsVirtual() )
id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(line); id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(line);
if ( (state == wxLIST_STATE_DONTCARE ) ) if ( (state == wxLIST_STATE_DONTCARE ) )
return line; return line;
if ( (state & wxLIST_STATE_SELECTED) && IsDataBrowserItemSelected(m_dbImpl->GetControlRef(), id ) ) if ( (state & wxLIST_STATE_SELECTED) && IsDataBrowserItemSelected(m_dbImpl->GetControlRef(), id ) )
return line; return line;
} }
@@ -1979,7 +1979,7 @@ long wxListCtrl::InsertItem(wxListItem& info)
info.m_itemId = count; info.m_itemId = count;
m_dbImpl->MacInsertItem(info.m_itemId, &info ); m_dbImpl->MacInsertItem(info.m_itemId, &info );
wxListEvent event( wxEVT_COMMAND_LIST_INSERT_ITEM, GetId() ); wxListEvent event( wxEVT_COMMAND_LIST_INSERT_ITEM, GetId() );
event.SetEventObject( this ); event.SetEventObject( this );
event.m_itemIndex = info.m_itemId; event.m_itemIndex = info.m_itemId;
@@ -2125,7 +2125,7 @@ bool wxListCtrl::SortItems(wxListCtrlCompare fn, long data)
m_compareFunc = fn; m_compareFunc = fn;
m_compareFuncData = data; m_compareFuncData = data;
SortDataBrowserContainer( m_dbImpl->GetControlRef(), kDataBrowserNoItem, true); SortDataBrowserContainer( m_dbImpl->GetControlRef(), kDataBrowserNoItem, true);
// we need to do this after each call, else we get a crash from wxPython when // we need to do this after each call, else we get a crash from wxPython when
// SortItems is called the second time. // SortItems is called the second time.
m_compareFunc = NULL; m_compareFunc = NULL;
@@ -2301,7 +2301,7 @@ void wxListCtrl::SetFocus()
m_genericImpl->SetFocus(); m_genericImpl->SetFocus();
return; return;
} }
wxWindow::SetFocus(); wxWindow::SetFocus();
} }
#endif #endif
@@ -2446,9 +2446,9 @@ wxMacDataBrowserListCtrlControl::wxMacDataBrowserListCtrlControl( wxWindow *peer
SetSortProperty( kMinColumnId - 1 ); SetSortProperty( kMinColumnId - 1 );
else else
SetSortProperty( kMinColumnId ); SetSortProperty( kMinColumnId );
m_sortOrder = SortOrder_None; m_sortOrder = SortOrder_None;
if ( style & wxLC_SORT_DESCENDING ) if ( style & wxLC_SORT_DESCENDING )
{ {
SetSortOrder( kDataBrowserOrderDecreasing ); SetSortOrder( kDataBrowserOrderDecreasing );
@@ -2657,7 +2657,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
{ {
GetThemeDrawingState(&savedState); GetThemeDrawingState(&savedState);
if (active && hasFocus) if (active && hasFocus)
{ {
GetThemeBrushAsColor(kThemeBrushAlternatePrimaryHighlightColor, 32, true, &backgroundColor); GetThemeBrushAsColor(kThemeBrushAlternatePrimaryHighlightColor, 32, true, &backgroundColor);
@@ -2684,7 +2684,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
labelColor = MAC_WXCOLORREF( color.GetPixel() ); labelColor = MAC_WXCOLORREF( color.GetPixel() );
else if (list->GetTextColour().Ok()) else if (list->GetTextColour().Ok())
labelColor = MAC_WXCOLORREF( list->GetTextColour().GetPixel() ); labelColor = MAC_WXCOLORREF( list->GetTextColour().GetPixel() );
if (bgColor.Ok()) if (bgColor.Ok())
{ {
backgroundColor = MAC_WXCOLORREF( bgColor.GetPixel() ); backgroundColor = MAC_WXCOLORREF( bgColor.GetPixel() );
@@ -2817,19 +2817,13 @@ OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemI
if ( list && list->HasFlag( wxLC_EDIT_LABELS ) ) if ( list && list->HasFlag( wxLC_EDIT_LABELS ) )
{ {
verify_noerr(SetDataBrowserItemDataBooleanValue( itemData, true )); verify_noerr(SetDataBrowserItemDataBooleanValue( itemData, true ));
err = noErr ;
} }
break ; break ;
default : default :
if ( property >= kMinColumnId ) if ( property >= kMinColumnId )
{ {
wxMacCFStringHolder cfStr; wxMacCFStringHolder cfStr(text);
verify_noerr( ::SetDataBrowserItemDataText( itemData, cfStr) );
if (text){
cfStr.Assign( text, wxLocale::GetSystemEncoding() );
err = ::SetDataBrowserItemDataText( itemData, cfStr );
err = noErr;
}
@@ -2893,7 +2887,7 @@ void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID,
// avoid asserts by getting out now // avoid asserts by getting out now
return ; return ;
} }
wxListCtrl *list = wxDynamicCast( GetPeer() , wxListCtrl ); wxListCtrl *list = wxDynamicCast( GetPeer() , wxListCtrl );
if ( list ) if ( list )
{ {
@@ -2969,7 +2963,7 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI
wxString otherItemText; wxString otherItemText;
long itemOrder; long itemOrder;
long otherItemOrder; long otherItemOrder;
int colId = sortProperty - kMinColumnId; int colId = sortProperty - kMinColumnId;
wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl ); wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl );
@@ -2986,7 +2980,7 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI
itemOrder = item->GetOrder(); itemOrder = item->GetOrder();
otherItemOrder = item->GetOrder(); otherItemOrder = item->GetOrder();
wxListCtrlCompare func = list->GetCompareFunc(); wxListCtrlCompare func = list->GetCompareFunc();
if (func != NULL) if (func != NULL)
{ {
@@ -2995,8 +2989,8 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI
if (item && item->HasColumnInfo(0)) if (item && item->HasColumnInfo(0))
item1 = item->GetColumnInfo(0)->GetData(); item1 = item->GetColumnInfo(0)->GetData();
if (otherItem && otherItem->HasColumnInfo(0)) if (otherItem && otherItem->HasColumnInfo(0))
item2 = otherItem->GetColumnInfo(0)->GetData(); item2 = otherItem->GetColumnInfo(0)->GetData();
if (item1 > -1 && item2 > -1) if (item1 > -1 && item2 > -1)
{ {
int result = func(item1, item2, list->GetCompareFuncData()); int result = func(item1, item2, list->GetCompareFuncData());
@@ -3006,7 +3000,7 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI
return result < 0; return result < 0;
} }
} }
// we can't use the native control's sorting abilities, so just // we can't use the native control's sorting abilities, so just
// sort by item id. // sort by item id.
return itemOrder < otherItemOrder; return itemOrder < otherItemOrder;
@@ -3044,11 +3038,11 @@ void wxMacDataBrowserListCtrlControl::MacSetColumnInfo( unsigned int row, unsign
listItem->SetColumnInfo( column, item ); listItem->SetColumnInfo( column, item );
listItem->SetOrder(row); listItem->SetOrder(row);
UpdateState(dataItem, item); UpdateState(dataItem, item);
wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl ); wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl );
// NB: When this call was made before a control was completely shown, it would // NB: When this call was made before a control was completely shown, it would
// update the item prematurely (i.e. no text would be listed) and, on show, // update the item prematurely (i.e. no text would be listed) and, on show,
// only the sorted column would be refreshed, meaning only first column text labels // only the sorted column would be refreshed, meaning only first column text labels
// would be shown. Making sure not to update items until the control is visible // would be shown. Making sure not to update items until the control is visible
// seems to fix this issue. // seems to fix this issue.
@@ -3170,7 +3164,7 @@ void wxMacListCtrlItem::SetColumnTextValue( unsigned int column, const wxString&
wxListItem* wxMacListCtrlItem::GetColumnInfo( unsigned int column ) wxListItem* wxMacListCtrlItem::GetColumnInfo( unsigned int column )
{ {
wxASSERT_MSG( HasColumnInfo(column), _T("invalid column index in wxMacListCtrlItem") ); wxASSERT_MSG( HasColumnInfo(column), _T("invalid column index in wxMacListCtrlItem") );
return m_rowItems[column]; return m_rowItems[column];
} }
bool wxMacListCtrlItem::HasColumnInfo( unsigned int column ) bool wxMacListCtrlItem::HasColumnInfo( unsigned int column )