GUIClasses: add "global" parameter to MakeDefault

issue #126
gemrb · Apr 19, 2018 · 630ed6a · 630ed6a
1 parent 2016794
commit 630ed6a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/gemrb/GUIScripts/GUIClasses.py b/gemrb/GUIScripts/GUIClasses.py
@@ -295,13 +295,13 @@ class GButton(GControl):
     'SetActionIcon': _GemRB.Button_SetActionIcon
   }
 
-  def MakeDefault(self):
+  def MakeDefault(self, glob=False):
 	  # return key
-	  return self.SetHotKey(chr(0x86), 0)
+	  return self.SetHotKey(chr(0x86), 0, glob)
 
-  def MakeEscape(self):
+  def MakeEscape(self, glob=False):
 	  # escape key
-	  return self.SetHotKey(chr(0x8c), 0)
+	  return self.SetHotKey(chr(0x8c), 0, glob)
 
   def SetMOS(self, mos):
 	  self.SetPicture(mos) # backwards compatibility

diff --git a/gemrb/GUIScripts/GUIWORLD.py b/gemrb/GUIScripts/GUIWORLD.py
@@ -95,15 +95,15 @@ def OpenEndMessageWindow ():
 	Button.SetVisible(True)
 	Button.SetText (9371)
 	Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, CloseContinueWindow)
-	Button.SetHotKey(chr(0x86), 0, True)
+	Button.MakeDefault(True)
 
 def OpenContinueMessageWindow ():
 	#continue
 	Button = ContinueWindow.GetControl (0)
 	Button.SetVisible(True)
 	Button.SetText (9372)
 	Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, CloseContinueWindow)
-	Button.SetHotKey(chr(0x86), 0, True)
+	Button.MakeDefault(True)
 
 def UpdateReformWindow ():
 	Window = ReformPartyWindow

diff --git a/gemrb/GUIScripts/iwd2/GUIWORLD.py b/gemrb/GUIScripts/iwd2/GUIWORLD.py
@@ -73,14 +73,14 @@ def OpenEndMessageWindow ():
 	Button = ContinueWindow.GetControl (0)
 	Button.SetText (9371)
 	Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, CloseContinueWindow)
-	Button.SetHotKey(chr(0x86), 0, True)
+	Button.MakeDefault(True)
 
 def OpenContinueMessageWindow ():
 	#continue
 	Button = ContinueWindow.GetControl (0)
 	Button.SetText (9372)
 	Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, CloseContinueWindow)
-	Button.SetHotKey(chr(0x86), 0, True)
+	Button.MakeDefault(True)
 
 def OpenReformPartyWindow ():
 	global ReformPartyWindow

diff --git a/gemrb/GUIScripts/pst/GUIWORLD.py b/gemrb/GUIScripts/pst/GUIWORLD.py
@@ -62,14 +62,14 @@ def OpenEndMessageWindow ():
 	Button = MessageWindow.MWindow.GetControl (0)
 	Button.SetText (34602)
 	Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, CloseContinueWindow)
-	Button.SetHotKey(chr(0x86), 0, True)
+	Button.MakeDefault(True)
 
 def OpenContinueMessageWindow ():
 	#continue
 	Button = MessageWindow.MWindow.GetControl (0)
 	Button.SetText (34603)
 	Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, CloseContinueWindow)
-	Button.SetHotKey(chr(0x86), 0, True)
+	Button.MakeDefault(True)
 
 def OpenReformPartyWindow ():
 	global ReformPartyWindow