"Fix" more spacers

gui/builtinPreferenceViews/dummyView.py

@@ -80,8 +80,7 @@ class DummyView(PreferenceView):
     def initFooter(self, panel):
         footerSizer = wx.BoxSizer(wx.HORIZONTAL)
 
-        footerSizer.AddSpacer((0, 0), 1, wx.EXPAND, 5)
-
+        footerSizer.AddSpacer(0)
         self.btnRestore = wx.Button(panel, wx.ID_ANY, "Restore", wx.DefaultPosition, wx.DefaultSize, 0)
         self.btnRestore.Enable(False)
 

gui/builtinPreferenceViews/pyfaDatabasePreferences.py

@@ -76,7 +76,7 @@ class PFGeneralPref(PreferenceView):
         mainSizer.Add(self.m_staticline3, 0, wx.EXPAND | wx.TOP | wx.BOTTOM, 5)
 
         btnSizer = wx.BoxSizer(wx.VERTICAL)
-        btnSizer.AddSpacer((0, 0), 1, wx.EXPAND, 5)
+        btnSizer.AddSpacer(0)
 
         self.btnDeleteDamagePatterns = wx.Button(panel, wx.ID_ANY, "Delete All Damage Pattern Profiles", wx.DefaultPosition, wx.DefaultSize, 0)
         btnSizer.Add(self.btnDeleteDamagePatterns, 0, wx.ALL, 5)

gui/builtinPreferenceViews/pyfaNetworkPreferences.py

@@ -139,7 +139,7 @@ class PFNetworkPref(PreferenceView):
         mainSizer.Add(self.stPSAutoDetected, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5)
 
         btnSizer = wx.BoxSizer(wx.HORIZONTAL)
-        btnSizer.AddSpacer((0, 0), 1, wx.EXPAND, 5)
+        btnSizer.AddSpacer(0)
 
         self.btnApply = wx.Button(panel, wx.ID_ANY, "Apply Proxy Settings", wx.DefaultPosition, wx.DefaultSize, 0)
 

gui/builtinPreferenceViews/pyfaUpdatePreferences.py

@@ -52,11 +52,11 @@ class PFUpdatePref(PreferenceView):
                                 "You can choose to reset notification suppression for this release, "
                                 "or download the new release from GitHub.")
 
-            self.versionSizer.AddSpacer((5, 5), 0, wx.EXPAND, 5)
+            self.versionSizer.AddSpacer(0)
 
             self.versionSizer.Add(wx.StaticLine(panel, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL),
                                   0, wx.EXPAND, 5)
-            self.versionSizer.AddSpacer((5, 5), 0, wx.EXPAND, 5)
+            self.versionSizer.AddSpacer(0)
 
             self.versionSizer.Add(self.versionTitle, 0, wx.EXPAND, 5)
             self.versionDesc = wx.StaticText(panel, wx.ID_ANY, self.versionInfo, wx.DefaultPosition, wx.DefaultSize, 0)

gui/builtinShipBrowser/pfListPane.py

@@ -23,8 +23,7 @@ import wx
 
 class PFListPane(wx.ScrolledWindow):
     def __init__(self, parent):
-        wx.ScrolledWindow.__init__(self, parent, id=wx.ID_ANY, pos=wx.DefaultPosition, size=wx.Size(1, 1),
-                                   style=wx.TAB_TRAVERSAL)
+        wx.ScrolledWindow.__init__(self, parent, pos=wx.DefaultPosition, style=wx.TAB_TRAVERSAL)
 
         self._wList = []
         self._wCount = 0

gui/builtinStatsViews/resourcesViewFull.py

@@ -101,7 +101,7 @@ class ResourcesViewFull(StatsView):
         panel = "full"
 
         base = sizerResources
-        sizer.AddSpacer((0, 0), 1, wx.EXPAND, 5)
+        sizer.AddSpacer(0)
         # Turrets & launcher hardslots display
         tooltipText = {"turret": "Turret hardpoints", "launcher": "Launcher hardpoints", "drones": "Drones active",
                        "fighter": "Fighter squadrons active", "calibration": "Calibration"}
@@ -133,7 +133,7 @@ class ResourcesViewFull(StatsView):
             # Hack - We add a spacer after each thing, but we are always hiding something. The spacer is stil there.
             # This way, we only have one space after the drones/fighters
             if type_ != "drones":
-                sizer.AddSpacer((0, 0), 1, wx.EXPAND, 5)
+                sizer.AddSpacer(0)
 
         # PG, Cpu & drone stuff
         tooltipText = {"cpu": "CPU", "pg": "PowerGrid", "droneBay": "Drone bay", "fighterBay": "Fighter bay",

gui/builtinViews/implantEditor.py

@@ -54,7 +54,7 @@ class BaseImplantEditorView(wx.Panel):
         pmainSizer.Add(availableSizer, 1, wx.ALL | wx.EXPAND, 5)
 
         buttonSizer = wx.BoxSizer(wx.VERTICAL)
-        buttonSizer.AddSpacer((0, 0), 1)
+        buttonSizer.AddSpacer(0)
 
         self.btnAdd = GenBitmapButton(self, wx.ID_ADD, BitmapLoader.getBitmap("fit_add_small", "gui"),
                                       style=wx.BORDER_NONE)
@@ -64,7 +64,7 @@ class BaseImplantEditorView(wx.Panel):
                                          style=wx.BORDER_NONE)
         buttonSizer.Add(self.btnRemove, 0)
 
-        buttonSizer.AddSpacer((0, 0), 1)
+        buttonSizer.AddSpacer(0)
         pmainSizer.Add(buttonSizer, 0, wx.EXPAND, 0)
 
         characterImplantSizer = wx.BoxSizer(wx.VERTICAL)

gui/preferenceDialog.py

@@ -46,7 +46,7 @@ class PreferenceDialog(wx.Dialog):
         mainSizer.Add(self.m_staticline2, 0, wx.EXPAND, 5)
 
         btnSizer = wx.BoxSizer(wx.HORIZONTAL)
-        btnSizer.AddSpacer((0, 0), 1, wx.EXPAND, 5)
+        btnSizer.AddSpacer(0)
         self.btnOK = wx.Button(self, wx.ID_ANY, "OK", wx.DefaultPosition, wx.DefaultSize, 0)
         btnSizer.Add(self.btnOK, 0, wx.ALL, 5)
         mainSizer.Add(btnSizer, 0, wx.EXPAND, 5)

gui/updateDialog.py

@@ -70,10 +70,10 @@ class UpdateDialog(wx.Dialog):
         self.versionText.SetFont(wx.Font(12, 74, 90, 90, False))
 
         versionSizer.Add(self.versionText, 1, wx.ALL, 5)
-        versionSizer.AddSpacer((15, 5), 0, wx.EXPAND, 5)
+        versionSizer.AddSpacer(15)
 
         mainSizer.Add(versionSizer, 0, wx.EXPAND, 5)
-        mainSizer.AddSpacer((0, 5), 0, wx.EXPAND, 5)
+        mainSizer.AddSpacer(0)
 
         releaseDate = dateutil.parser.parse(self.releaseInfo['published_at'])
         notesSizer = wx.BoxSizer(wx.HORIZONTAL)