From 0bbf7918f52dd9dcc17d88ada9d508d65835d257 Mon Sep 17 00:00:00 2001
From: Shlomi Fish <shlomif@shlomifish.org>
Date: Sun, 13 Nov 2016 16:18:01 +0200
Subject: [PATCH] Extract the equivalent tk base class.

---
 pysollib/tk/basetkmfxdialog.py | 10 ++++++++++
 pysollib/tk/edittextdialog.py  | 11 ++---------
 pysollib/tk/gameinfodialog.py  | 15 +++------------
 pysollib/tk/solverdialog.py    | 13 +++----------
 4 files changed, 18 insertions(+), 31 deletions(-)
 create mode 100644 pysollib/tk/basetkmfxdialog.py

diff --git a/pysollib/tk/basetkmfxdialog.py b/pysollib/tk/basetkmfxdialog.py
new file mode 100644
index 00000000..26e715ea
--- /dev/null
+++ b/pysollib/tk/basetkmfxdialog.py
@@ -0,0 +1,10 @@
+import Tkinter
+
+from tkwidget import MfxDialog
+
+class BaseTkMfxDialog(MfxDialog):
+    def _calcToolkit(self):
+        return Tkinter
+
+    def _calc_MfxDialog(self):
+        return MfxDialog
diff --git a/pysollib/tk/edittextdialog.py b/pysollib/tk/edittextdialog.py
index 41e366a1..f712906c 100644
--- a/pysollib/tk/edittextdialog.py
+++ b/pysollib/tk/edittextdialog.py
@@ -27,20 +27,13 @@ __all__ = ['EditTextDialog']
 import Tkinter
 
 # Toolkit imports
-from tkwidget import MfxDialog
+from pysollib.tk.basetkmfxdialog import BaseTkMfxDialog
 from pysollib.ui.tktile.edittextdialog import BaseEditTextDialog
 
 # ************************************************************************
 # *
 # ************************************************************************
 
-class EditTextDialog(BaseEditTextDialog, MfxDialog):
-
-    def _calcToolkit(self):
-        return Tkinter
-
-    def _calc_MfxDialog(self):
-        return MfxDialog
-
+class EditTextDialog(BaseEditTextDialog, BaseTkMfxDialog):
     def _calc_Resizable(self):
         return True
diff --git a/pysollib/tk/gameinfodialog.py b/pysollib/tk/gameinfodialog.py
index 34e5419d..000e9d50 100644
--- a/pysollib/tk/gameinfodialog.py
+++ b/pysollib/tk/gameinfodialog.py
@@ -21,19 +21,10 @@
 ##
 ##---------------------------------------------------------------------------##
 
-
 __all__ = ['GameInfoDialog']
 
-# imports
-import Tkinter
-
 import pysollib.ui.tktile.gameinfodialog
-from tkwidget import MfxDialog
+from pysollib.tk.basetkmfxdialog import BaseTkMfxDialog
 
-class GameInfoDialog(MfxDialog, pysollib.ui.tktile.gameinfodialog.BaseGameInfoDialog):
-
-    def _calcToolkit(self):
-        return Tkinter
-
-    def _calc_MfxDialog(self):
-        return MfxDialog
+class GameInfoDialog(pysollib.ui.tktile.gameinfodialog.BaseGameInfoDialog, BaseTkMfxDialog):
+    True
diff --git a/pysollib/tk/solverdialog.py b/pysollib/tk/solverdialog.py
index fc725c83..c88e0e97 100644
--- a/pysollib/tk/solverdialog.py
+++ b/pysollib/tk/solverdialog.py
@@ -37,7 +37,7 @@ from pysollib.mygettext import _, n_
 from pysollib.mfxutil import KwStruct
 
 # Toolkit imports
-from tkwidget import MfxDialog
+from pysollib.tk.basetkmfxdialog import BaseTkMfxDialog
 from pysollib.ui.tktile.solverdialog import BaseSolverDialog, solver_dialog, connect_game_solver_dialog, destroy_solver_dialog, reset_solver_dialog
 
 
@@ -45,14 +45,7 @@ from pysollib.ui.tktile.solverdialog import BaseSolverDialog, solver_dialog, con
 # *
 # ************************************************************************
 
-class SolverDialog(BaseSolverDialog, MfxDialog):
-
-    def _calcToolkit(self):
-        return Tkinter
-
-    def _calc_MfxDialog(self):
-        return MfxDialog
-
+class SolverDialog(BaseSolverDialog, BaseTkMfxDialog):
     def _createGamesVar(self, frame, row):
         var = Tkinter.StringVar()
         om = Tkinter.OptionMenu(frame, var, command=self.gameSelected,
@@ -82,7 +75,7 @@ class SolverDialog(BaseSolverDialog, MfxDialog):
                       strings=strings,
                       default=0,
                       )
-        return MfxDialog.initKw(self, kw)
+        return self._calc_MfxDialog().initKw(self, kw)
 
     def connectGame(self, game):
         name = self.app.getGameTitleName(game.id)