diff --git a/include/wx/listbase.h b/include/wx/listbase.h index 7d8e8f68b4..677e16a29c 100644 --- a/include/wx/listbase.h +++ b/include/wx/listbase.h @@ -135,11 +135,12 @@ enum wxListColumnFormat wxLIST_FORMAT_CENTER = wxLIST_FORMAT_CENTRE }; -// Autosize values for SetColumnWidth +// Values for SetColumnWidth() enum { wxLIST_AUTOSIZE = -1, - wxLIST_AUTOSIZE_USEHEADER = -2 // partly supported by generic version + wxLIST_AUTOSIZE_USEHEADER = -2, // partly supported by generic version + wxLIST_DEFAULT_COL_WIDTH = 80 }; // Flag values for GetItemRect diff --git a/interface/wx/listctrl.h b/interface/wx/listctrl.h index 1ebea5d1bf..b3caa95761 100644 --- a/interface/wx/listctrl.h +++ b/interface/wx/listctrl.h @@ -89,7 +89,7 @@ enum wxListColumnFormat wxLIST_FORMAT_CENTER = wxLIST_FORMAT_CENTRE }; -/// Autosize values for SetColumnWidth +/// Values for SetColumnWidth() enum { wxLIST_AUTOSIZE = -1, diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp index f0d513a102..cb28fba2a4 100644 --- a/src/generic/listctrl.cpp +++ b/src/generic/listctrl.cpp @@ -96,9 +96,6 @@ static const int MARGIN_BETWEEN_ROWS = 6; // when autosizing the columns, add some slack static const int AUTOSIZE_COL_MARGIN = 10; -// default width for the header columns -static const int WIDTH_COL_DEFAULT = 80; - // the space between the image and the text in the report mode static const int IMAGE_MARGIN_IN_REPORT_MODE = 5; @@ -336,7 +333,7 @@ void wxListHeaderData::SetHeight( int h ) void wxListHeaderData::SetWidth( int w ) { - m_width = w < 0 ? WIDTH_COL_DEFAULT : w; + m_width = w < 0 ? wxLIST_DEFAULT_COL_WIDTH : w; } void wxListHeaderData::SetState( int flag ) diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp index 922a9809d8..593dcf840e 100644 --- a/src/msw/listctrl.cpp +++ b/src/msw/listctrl.cpp @@ -2057,7 +2057,7 @@ long wxListCtrl::DoInsertColumn(long col, const wxListItem& item) // always give some width to the new column: this one is compatible // with the generic version lvCol.mask |= LVCF_WIDTH; - lvCol.cx = 80; + lvCol.cx = wxLIST_DEFAULT_COL_WIDTH; } long n = ListView_InsertColumn(GetHwnd(), col, &lvCol);