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

implement wxLIST_AUTOSIZE support in wxMac's wxListCtrl

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2008-04-20 22:10:23 +00:00
parent ffbf7f6634
commit 916989dfb9
2 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/mac/carbon/listctrl.h
View File

@@ -414,6 +414,8 @@ protected:
int m_count; // for virtual lists, store item count
private:
int CalcColumnAutoWidth(int col) const;
DECLARE_EVENT_TABLE()
};

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

@@ -1047,9 +1047,10 @@ bool wxListCtrl::SetColumnWidth(int col, int width)
if (m_dbImpl)
{
int mywidth = width;
if (width == wxLIST_AUTOSIZE || width == wxLIST_AUTOSIZE_USEHEADER)
mywidth = 150;
if ( width == wxLIST_AUTOSIZE_USEHEADER )
{
width = 150; // FIXME
}
if (col == -1)
{
@@ -1061,17 +1062,22 @@ bool wxListCtrl::SetColumnWidth(int col, int width)
colInfo.SetWidth(width);
SetColumn(column, colInfo);
const int mywidth = (width == wxLIST_AUTOSIZE)
? CalcColumnAutoWidth(column) : width;
m_dbImpl->SetColumnWidth(column, mywidth);
}
}
else
{
if ( width == wxLIST_AUTOSIZE )
width = CalcColumnAutoWidth(col);
wxListItem colInfo;
GetColumn(col, colInfo);
colInfo.SetWidth(width);
SetColumn(col, colInfo);
m_dbImpl->SetColumnWidth(col, mywidth);
m_dbImpl->SetColumnWidth(col, width);
}
return true;
}
@@ -3329,5 +3335,36 @@ void wxMacListCtrlItem::SetColumnInfo( unsigned int column, wxListItem* item )
}
}
int wxListCtrl::CalcColumnAutoWidth(int col) const
{
int width = 0;
for ( int i = 0; i < GetItemCount(); i++ )
{
wxListItem info;
info.SetMask(wxLIST_MASK_TEXT | wxLIST_MASK_IMAGE);
info.SetId(i);
info.SetColumn(col);
GetItem(info);
const wxFont font = info.GetFont();
int w = 0;
if ( font.IsOk() )
GetTextExtent(info.GetText(), &w, NULL, NULL, NULL, &font);
else
GetTextExtent(info.GetText(), &w, NULL);
w += 2 * kItemPadding;
if ( info.GetImage() != -1 )
w += kIconWidth;
width = wxMax(width, w);
}
return width;
}
#endif // wxUSE_LISTCTRL