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

@@ -21,6 +21,7 @@ import wx
import wx.lib.newevent
import gui.utils.colorUtils as colorUtils
import gui.utils.drawUtils as drawUtils
import gui.utils.fonts as fonts
from gui import bitmapLoader
import gui.utils.fonts as fonts
@@ -671,6 +672,8 @@ class PFTabsContainer(wx.Panel):
"""
wx.Panel.__init__(self, parent, id, pos, size)
if wx.VERSION >= (3,0):
self.SetBackgroundStyle(wx.BG_STYLE_PAINT)
self.tabs = []
width, height = size