Rename GetItemHeight to CalculateMaxHeight, for consistency Fix usage of nItemWidth vs. iconSpacing.cx Misc cleanups.