Revert "Revert "Merge branch 'master' into wx3"". So many reverts.

This reverts commit cca7f1112a.
This commit is contained in:
blitzmann
2015-06-27 19:46:49 -04:00
parent 6d01877d78
commit 5372f31be8
9 changed files with 39 additions and 37 deletions

View File

@@ -27,7 +27,7 @@ class AmmoIcon(ViewColumn):
name = "Ammo Icon"
def __init__(self, fittingView, params):
ViewColumn.__init__(self, fittingView)
self.size = 16
self.size = 24
self.maxsize = self.size
self.mask = wx.LIST_MASK_IMAGE
self.columnText = ""

View File

@@ -8,7 +8,7 @@ class BaseIcon(ViewColumn):
name = "Base Icon"
def __init__(self, fittingView, params):
ViewColumn.__init__(self, fittingView)
self.size = 16
self.size = 24
self.maxsize = self.size
self.mask = wx.LIST_MASK_IMAGE
self.columnText = ""