diff --git a/gui/builtinMarketBrowser/pfSearchBox.py b/gui/builtinMarketBrowser/pfSearchBox.py index b696026f8..57c91cc0e 100644 --- a/gui/builtinMarketBrowser/pfSearchBox.py +++ b/gui/builtinMarketBrowser/pfSearchBox.py @@ -45,7 +45,6 @@ class PFSearchBox(wx.Window): wx.TE_PROCESS_ENTER | (wx.BORDER_NONE if 'wxGTK' in wx.PlatformInfo else 0)) self.Bind(wx.EVT_PAINT, self.OnPaint) - self.Bind(wx.EVT_ERASE_BACKGROUND, self.OnEraseBk) self.Bind(wx.EVT_SIZE, self.OnSize) self.Bind(wx.EVT_LEFT_DOWN, self.OnLeftDown) @@ -187,9 +186,6 @@ class PFSearchBox(wx.Window): self.resized = True self.Refresh() - def OnEraseBk(self, event): - pass - def UpdateElementsPos(self, dc): rect = self.GetRect() diff --git a/gui/builtinPreferenceViews/pyfaGaugePreferences.py b/gui/builtinPreferenceViews/pyfaGaugePreferences.py index c17002590..e5996c666 100644 --- a/gui/builtinPreferenceViews/pyfaGaugePreferences.py +++ b/gui/builtinPreferenceViews/pyfaGaugePreferences.py @@ -48,10 +48,6 @@ class PFGaugePreview(wx.Window): self.Bind(wx.EVT_ENTER_WINDOW, self.OnWindowEnter) self.Bind(wx.EVT_LEAVE_WINDOW, self.OnWindowLeave) self.Bind(wx.EVT_TIMER, self.OnTimer) - self.Bind(wx.EVT_ERASE_BACKGROUND, self.OnEraseBk) - - def OnEraseBk(self, event): - pass def OnTimer(self, event): if event.GetId() == self.timerID: diff --git a/gui/builtinShipBrowser/pfBitmapFrame.py b/gui/builtinShipBrowser/pfBitmapFrame.py index ad09bf337..2bfd3e28c 100644 --- a/gui/builtinShipBrowser/pfBitmapFrame.py +++ b/gui/builtinShipBrowser/pfBitmapFrame.py @@ -11,7 +11,6 @@ class PFBitmapFrame(wx.Frame): self.bitmap = bitmap self.SetSize((bitmap.GetWidth(), bitmap.GetHeight())) self.Bind(wx.EVT_PAINT, self.OnWindowPaint) - self.Bind(wx.EVT_ERASE_BACKGROUND, self.OnWindowEraseBk) self.Bind(wx.EVT_TIMER, self.OnTimer) self.timer = wx.Timer(self, wx.ID_ANY) @@ -45,9 +44,6 @@ class PFBitmapFrame(wx.Frame): self.direction = -1 self.timer.Start(5) - def OnWindowEraseBk(self, event): - pass - def OnWindowPaint(self, event): rect = self.GetRect() canvas = wx.EmptyBitmap(rect.width, rect.height) diff --git a/gui/builtinShipBrowser/raceSelector.py b/gui/builtinShipBrowser/raceSelector.py index b1231fe6c..6d7270d3e 100644 --- a/gui/builtinShipBrowser/raceSelector.py +++ b/gui/builtinShipBrowser/raceSelector.py @@ -77,7 +77,6 @@ class RaceSelector(wx.Window): self.Bind(wx.EVT_ENTER_WINDOW, self.OnWindowEnter) self.Bind(wx.EVT_LEAVE_WINDOW, self.OnWindowLeave) self.Bind(wx.EVT_TIMER, self.OnTimer) - self.Bind(wx.EVT_ERASE_BACKGROUND, self.OnBackgroundErase) self.Bind(wx.EVT_PAINT, self.OnPaint) self.Bind(wx.EVT_LEFT_UP, self.OnLeftUp) self.Bind(wx.EVT_MOTION, self.OnMouseMove) @@ -160,9 +159,6 @@ class RaceSelector(wx.Window): self.CalcButtonsBarPos() self.Refresh() - def OnBackgroundErase(self, event): - pass - def OnPaint(self, event): rect = self.GetRect() diff --git a/gui/builtinShipBrowser/sfBrowserItem.py b/gui/builtinShipBrowser/sfBrowserItem.py index 449364ce6..f97ac3de4 100644 --- a/gui/builtinShipBrowser/sfBrowserItem.py +++ b/gui/builtinShipBrowser/sfBrowserItem.py @@ -251,7 +251,6 @@ class SFBrowserItem(wx.Window): self.toolbar = PFToolbar(self) self.Bind(wx.EVT_PAINT, self.OnPaint) - self.Bind(wx.EVT_ERASE_BACKGROUND, self.OnEraseBackground) self.Bind(wx.EVT_LEFT_UP, self.OnLeftUp) self.Bind(wx.EVT_KEY_UP, self.OnKeyUp) @@ -293,9 +292,6 @@ class SFBrowserItem(wx.Window): def DrawItem(self, mdc): pass - def OnEraseBackground(self, event): - pass - def OnKeyUp(self, event): pass diff --git a/gui/chrome_tabs.py b/gui/chrome_tabs.py index e65719867..dad6ac182 100644 --- a/gui/chrome_tabs.py +++ b/gui/chrome_tabs.py @@ -719,7 +719,6 @@ class _TabsContainer(wx.Panel): self.Bind(wx.EVT_LEAVE_WINDOW, self.OnLeaveWindow) self.Bind(wx.EVT_PAINT, self.OnPaint) - self.Bind(wx.EVT_ERASE_BACKGROUND, self.OnErase) self.Bind(wx.EVT_LEFT_DOWN, self.OnLeftDown) self.Bind(wx.EVT_LEFT_UP, self.OnLeftUp) self.Bind(wx.EVT_MOTION, self.OnMotion) @@ -1151,9 +1150,6 @@ class _TabsContainer(wx.Panel): mdc.DrawBitmap(bmp, posx, posy, True) - def OnErase(self, event): - pass - def UpdateTabFX(self): """ Updates tab drop shadow bitmap """ self.tab_shadow.SetSize((self.tab_min_width, self.height + 1)) @@ -1303,7 +1299,6 @@ class PFNotebookPagePreview(wx.Frame): self.bitmap = bitmap self.SetSize((bitmap.GetWidth(), bitmap.GetHeight())) self.Bind(wx.EVT_PAINT, self.OnWindowPaint) - self.Bind(wx.EVT_ERASE_BACKGROUND, self.OnWindowEraseBk) self.Bind(wx.EVT_TIMER, self.OnTimer) self.timer = wx.Timer(self, wx.ID_ANY) @@ -1363,10 +1358,6 @@ class PFNotebookPagePreview(wx.Frame): self.direction = -1 self.timer.Start(10) - - def OnWindowEraseBk(self,event): - pass - def OnWindowPaint(self, event): rect = self.GetRect() canvas = wx.Bitmap(rect.width, rect.height) diff --git a/gui/display.py b/gui/display.py index 50befc0f6..b088a89c8 100644 --- a/gui/display.py +++ b/gui/display.py @@ -37,10 +37,6 @@ class Display(wx.ListCtrl): self.columnsMinWidth = [] self.Bind(wx.EVT_LIST_COL_END_DRAG, self.resizeChecker) self.Bind(wx.EVT_LIST_COL_BEGIN_DRAG, self.resizeSkip) - - if "wxMSW" in wx.PlatformInfo: - self.Bind(wx.EVT_ERASE_BACKGROUND, self.OnEraseBk) - self.mainFrame = gui.mainFrame.MainFrame.getInstance() i = 0 @@ -113,40 +109,6 @@ class Display(wx.ListCtrl): return rowIndex, 0, -1 - def OnEraseBk(self, event): - if self.GetItemCount() > 0: - width, height = self.GetClientSize() - dc = event.GetDC() - - dc.DestroyClippingRegion() - dc.SetClippingRegion(0, 0, width, height) - x, y, w, h = dc.GetClippingBox() - - topItem = self.GetTopItem() - bottomItem = topItem + self.GetCountPerPage() - - if bottomItem >= self.GetItemCount(): - bottomItem = self.GetItemCount() - 1 - - topRect = self.GetItemRect(topItem, wx.LIST_RECT_LABEL) - bottomRect = self.GetItemRect(bottomItem, wx.LIST_RECT_BOUNDS) - - items_rect = wx.Rect(topRect.left, 0, bottomRect.right - topRect.left, bottomRect.bottom) - - updateRegion = wx.Region(x, y, w, h) - updateRegion.Subtract(items_rect) - - dc.DestroyClippingRegion() - dc.SetClippingRegionAsRegion(updateRegion) - - dc.SetBackground(wx.Brush(self.GetBackgroundColour(), wx.SOLID)) - dc.Clear() - - dc.DestroyClippingRegion() - - else: - event.Skip() - # noinspection PyPropertyAccess def addColumn(self, i, col): self.activeColumns.append(col) diff --git a/gui/mainFrame.py b/gui/mainFrame.py index ab74d0dd7..c54bf2969 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -102,14 +102,10 @@ class PFPanel(wx.Panel): def __init__(self, parent): wx.Panel.__init__(self, parent) self.Bind(wx.EVT_PAINT, self.OnPaint) - self.Bind(wx.EVT_ERASE_BACKGROUND, self.OnBkErase) def OnPaint(self, event): event.Skip() - def OnBkErase(self, event): - pass - class OpenFitsThread(threading.Thread): def __init__(self, fits, callback): diff --git a/gui/pyfa_gauge.py b/gui/pyfa_gauge.py index ef436d74f..3aa74dc14 100644 --- a/gui/pyfa_gauge.py +++ b/gui/pyfa_gauge.py @@ -72,7 +72,6 @@ class PyGauge(wx.Window): self.SetToolTip(self._tooltip) self.Bind(wx.EVT_PAINT, self.OnPaint) - self.Bind(wx.EVT_ERASE_BACKGROUND, self.OnEraseBackground) self.Bind(wx.EVT_TIMER, self.OnTimer) self.Bind(wx.EVT_ENTER_WINDOW, self.OnWindowEnter) self.Bind(wx.EVT_LEAVE_WINDOW, self.OnWindowLeave) @@ -183,9 +182,6 @@ class PyGauge(wx.Window): (self._value, self._max_range if self._max_range > 0.01 else 0)) - def OnEraseBackground(self, event): - pass - def OnPaint(self, event): dc = wx.BufferedPaintDC(self) rect = self.GetClientRect() diff --git a/gui/utils/anim.py b/gui/utils/anim.py index 8791b273d..643a91fc7 100644 --- a/gui/utils/anim.py +++ b/gui/utils/anim.py @@ -18,7 +18,6 @@ class LoadAnimation(wx.Window): self.bars = 10 self.padding = 2 - self.Bind(wx.EVT_ERASE_BACKGROUND, self.OnEraseBackground) self.Bind(wx.EVT_TIMER, self.OnTimer) self.Bind(wx.EVT_PAINT, self.OnPaint) @@ -47,9 +46,6 @@ class LoadAnimation(wx.Window): self.Refresh() - def OnEraseBackground(self, event): - pass - def OnPaint(self, event): rect = self.GetClientRect() dc = wx.BufferedPaintDC(self)