Index: EditorWindow.py
===================================================================
--- EditorWindow.py	(revision 60668)
+++ EditorWindow.py	(working copy)
@@ -1299,7 +1299,6 @@
         new = self.askinteger(
                   "Indent width",
                   "New indent width (2-16)\n(Always use 8 when using tabs)",
-                  parent=self.text,
                   initialvalue=self.indentwidth,
                   minvalue=2,
                   maxvalue=16)
@@ -1359,7 +1358,6 @@
         return self.askinteger(
             "Tab width",
             "Columns per tab? (2-16)",
-            parent=self.text,
             initialvalue=self.indentwidth,
             minvalue=2,
             maxvalue=16) or self.tabwidth
Index: PyShell.py
===================================================================
--- PyShell.py	(revision 60668)
+++ PyShell.py	(working copy)
@@ -714,11 +714,10 @@
                 exec code in self.locals
         except SystemExit:
             if not self.tkconsole.closing:
-                if tkMessageBox.askyesno(
+                if self.tkconsole.askyesno(
                     "Exit?",
                     "Do you want to exit altogether?",
-                    default="yes",
-                    master=self.tkconsole.text):
+                    default=tkMessageBox.YES):
                     raise
                 else:
                     self.showtraceback()
@@ -869,9 +868,8 @@
 
     def toggle_debugger(self, event=None):
         if self.executing:
-            tkMessageBox.showerror("Don't debug now",
-                "You can only toggle the debugger when idle",
-                master=self.text)
+            self.showerror("Don't debug now",
+                "You can only toggle the debugger when idle")
             self.set_debugger_indicator()
             return "break"
         else: