wxPython 4/various dialogs: wx.CENTER_ON_SCREEN is no more, use wx.Ce…

…nter instead. re nvaccess#7077.

Somehow, documentation says wx.CENTRE_ON_SCREEN is included but it isn't there at runtime. Instead, wx.Center is used (does not follow variable naming convention though), so using it for now.

source/appModules/outlook.py

@@ -72,7 +72,7 @@ def _registerCOMWithFocusJuggle(self):
 		import gui
 		# Translators: The title for the dialog shown while Microsoft Outlook initializes.
 		d=wx.Dialog(None,title=_("Waiting for Outlook..."))
-		d.Center(wx.BOTH | wx.CENTER_ON_SCREEN)
+		d.Center(wx.BOTH | wx.Center)
 		gui.mainFrame.prePopup()
 		d.Show()
 		self._hasTriedoutlookAppSwitch=True

source/appModules/powerpnt.py

@@ -1187,7 +1187,7 @@ def _registerCOMWithFocusJuggle(self):
 		import gui
 		# Translators: A title for a dialog shown while Microsoft PowerPoint initializes
 		d=wx.Dialog(None,title=_("Waiting for Powerpoint..."))
-		d.Center(wx.BOTH | wx.CENTER_ON_SCREEN)
+		d.Center(wx.BOTH | wx.Center)
 		gui.mainFrame.prePopup()
 		d.Show()
 		self.hasTriedPpAppSwitch=True

source/browseMode.py

@@ -759,7 +759,7 @@ def __init__(self, document):
 
 		self.tree.SetFocus()
 		self.initElementType(self.ELEMENT_TYPES[self.lastSelectedElementType][0])
-		self.Center(wx.BOTH | wx.CENTER_ON_SCREEN)
+		self.Center(wx.BOTH | wx.Center)
 
 	def onElementTypeChange(self, evt):
 		elementType=evt.GetInt()

source/cursorManager.py

@@ -54,7 +54,7 @@ def __init__(self, parent, cursorManager, text, caseSensitivity):
 		self.Bind(wx.EVT_BUTTON,self.onCancel,id=wx.ID_CANCEL)
 		mainSizer.Fit(self)
 		self.SetSizer(mainSizer)
-		self.Center(wx.BOTH | wx.CENTER_ON_SCREEN)
+		self.Center(wx.BOTH | wx.Center)
 		self.findTextField.SetFocus()
 
 	def onOk(self, evt):

source/gui/__init__.py

@@ -605,7 +605,7 @@ def __init__(self, parent):
 		self.SetSizer(mainSizer)
 		mainSizer.Fit(self)
 		self.capsAsNVDAModifierCheckBox.SetFocus()
-		self.Center(wx.BOTH | wx.CENTER_ON_SCREEN)
+		self.Center(wx.BOTH | wx.Center)
 
 	def onOk(self, evt):
 		config.conf["keyboard"]["useCapsLockAsNVDAModifierKey"] = self.capsAsNVDAModifierCheckBox.IsChecked()
@@ -679,7 +679,7 @@ def __init__(self, parent):
 		mainSizer.Add(sHelper.sizer, border = guiHelper.BORDER_FOR_DIALOGS, flag=wx.ALL)
 		self.Sizer = mainSizer
 		mainSizer.Fit(self)
-		self.Center(wx.BOTH | wx.CENTER_ON_SCREEN)
+		self.Center(wx.BOTH | wx.Center)
 
 	def onLicenseAgree(self, evt):
 		for ctrl in self.actionButtons:
@@ -757,7 +757,7 @@ def __init__(self, parent):
 		mainSizer.Fit(self)
 		self.Sizer = mainSizer
 		self.actionsList.SetFocus()
-		self.Center(wx.BOTH | wx.CENTER_ON_SCREEN)
+		self.Center(wx.BOTH | wx.Center)
 
 	def onOk(self, evt):
 		action=self.actionsList.GetSelection()
@@ -810,7 +810,7 @@ def __init__(self, parent, title, message):
 		self.timer = wx.PyTimer(self.Pulse)
 		self.timer.Start(1000)
 		self.Raise()
-		self.Center(wx.BOTH | wx.CENTER_ON_SCREEN)
+		self.Center(wx.BOTH | wx.Center)
 
 	def Pulse(self):
 		super(IndeterminateProgressDialog, self).Pulse()

source/gui/addonGui.py

@@ -91,7 +91,7 @@ def __init__(self,parent):
 		self.SetSizer(mainSizer)
 		self.refreshAddonsList()
 		self.addonsList.SetFocus()
-		self.Center(wx.BOTH | wx.CENTER_ON_SCREEN)
+		self.Center(wx.BOTH | wx.Center)
 
 	def onAddClick(self,evt):
 		# Translators: The message displayed in the dialog that allows you to choose an add-on package for installation.

source/gui/configProfiles.py

@@ -102,7 +102,7 @@ def __init__(self, parent):
 		mainSizer.Fit(self)
 		self.Sizer = mainSizer
 		self.profileList.SetFocus()
-		self.Center(wx.BOTH | wx.CENTER_ON_SCREEN)
+		self.Center(wx.BOTH | wx.Center)
 
 	def __del__(self):
 		ProfilesDialog._instance = None
@@ -334,7 +334,7 @@ def __init__(self, parent):
 		mainSizer.Add(sHelper.sizer, border = guiHelper.BORDER_FOR_DIALOGS, flag=wx.ALL)
 		mainSizer.Fit(self)
 		self.Sizer = mainSizer
-		self.Center(wx.BOTH | wx.CENTER_ON_SCREEN)
+		self.Center(wx.BOTH | wx.Center)
 
 	def onTriggerListChoice(self, evt):
 		trig = self.triggers[self.triggerList.Selection]
@@ -396,7 +396,7 @@ def __init__(self, parent):
 		mainSizer.Fit(self)
 		self.Sizer = mainSizer
 		self.profileName.SetFocus()
-		self.Center(wx.BOTH | wx.CENTER_ON_SCREEN)
+		self.Center(wx.BOTH | wx.Center)
 
 	def onOk(self, evt):
 		confTrigs = config.conf.triggersToProfiles

source/gui/installerGui.py

@@ -136,7 +136,7 @@ def __init__(self, parent, isUpdate):
 		mainSizer.Add(sHelper.sizer, border=guiHelper.BORDER_FOR_DIALOGS, flag=wx.ALL)
 		self.Sizer = mainSizer
 		mainSizer.Fit(self)
-		self.Center(wx.BOTH | wx.CENTER_ON_SCREEN)
+		self.Center(wx.BOTH | wx.Center)
 
 	def onInstall(self, evt):
 		self.Hide()
@@ -172,7 +172,7 @@ def showInstallGui():
 		mainSizer.Add(sizer)
 		d.Sizer = mainSizer
 		mainSizer.Fit(d)
-		d.Center(wx.BOTH | wx.CENTER_ON_SCREEN)
+		d.Center(wx.BOTH | wx.Center)
 		with d:
 			if d.ShowModal() == wx.ID_CANCEL:
 				gui.mainFrame.postPopup()
@@ -224,7 +224,7 @@ def __init__(self, parent):
 		mainSizer.Add(sHelper.sizer, border=gui.guiHelper.BORDER_FOR_DIALOGS, flag=wx.ALL)
 		self.Sizer = mainSizer
 		mainSizer.Fit(self)
-		self.Center(wx.BOTH | wx.CENTER_ON_SCREEN)
+		self.Center(wx.BOTH | wx.Center)
 
 	def onCreatePortable(self, evt):
 		if not self.portableDirectoryEdit.Value:

source/gui/settingsDialogs.py

@@ -88,7 +88,7 @@ def __init__(self, parent):
 		self.Bind(wx.EVT_BUTTON,self.onOk,id=wx.ID_OK)
 		self.Bind(wx.EVT_BUTTON,self.onCancel,id=wx.ID_CANCEL)
 		self.postInit()
-		self.Center(wx.BOTH | wx.CENTER_ON_SCREEN)
+		self.Center(wx.BOTH | wx.Center)
 
 	def __del__(self):
 		SettingsDialog._hasInstance=False
@@ -1693,7 +1693,7 @@ def __init__(self, parent):
 		mainSizer.Fit(self)
 		self.SetSizer(mainSizer)
 		self.identifierTextCtrl.SetFocus()
-		self.Center(wx.BOTH | wx.CENTER_ON_SCREEN)
+		self.Center(wx.BOTH | wx.Center)
 
 class SpeechSymbolsDialog(SettingsDialog):
 

source/updateCheck.py

@@ -234,7 +234,7 @@ def __init__(self, parent, updateInfo, auto):
 		mainSizer.Add(sHelper.sizer, border=guiHelper.BORDER_FOR_DIALOGS, flag=wx.ALL)
 		self.Sizer = mainSizer
 		mainSizer.Fit(self)
-		self.Center(wx.BOTH | wx.CENTER_ON_SCREEN)
+		self.Center(wx.BOTH | wx.Center)
 		self.Show()
 
 	def onDownloadButton(self, evt):
@@ -436,7 +436,7 @@ def __init__(self, parent, continueFunc):
 
 		self.Sizer = mainSizer
 		mainSizer.Fit(self)
-		self.Center(wx.BOTH | wx.CENTER_ON_SCREEN)
+		self.Center(wx.BOTH | wx.Center)
 		self.Show()
 
 	def onDonate(self, evt):