From 1085096f377f52deda04985bee60a0ee042eba2f Mon Sep 17 00:00:00 2001
From: Shlomi Fish <shlomif@shlomifish.org>
Date: Wed, 16 Nov 2016 20:35:59 +0200
Subject: [PATCH] Refactored the refactoring.

Meta-refactoring!
---
 pysollib/tile/colorsdialog.py      | 16 +++-------------
 pysollib/tk/colorsdialog.py        | 16 +++-------------
 pysollib/ui/tktile/colorsdialog.py | 15 ++++++++++++---
 3 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/pysollib/tile/colorsdialog.py b/pysollib/tile/colorsdialog.py
index 49074d38..4dd0f177 100644
--- a/pysollib/tile/colorsdialog.py
+++ b/pysollib/tile/colorsdialog.py
@@ -23,22 +23,12 @@
 
 __all__ = ['ColorsDialog']
 
-# imports
-import ttk
-
 from pysollib.ui.tktile.colorsdialog import BaseColorsDialog
+from pysollib.tile.basetilemfxdialog import BaseTileMfxDialog
 
 # ************************************************************************
 # *
 # ************************************************************************
 
-class ColorsDialog(BaseColorsDialog):
-    def _calcFrame(self):
-        return ttk.Frame
-
-    def _calcLabel(self):
-        return ttk.Label
-
-    def _calcButton(self):
-        return ttk.Button
-
+class ColorsDialog(BaseColorsDialog, BaseTileMfxDialog):
+    pass
diff --git a/pysollib/tk/colorsdialog.py b/pysollib/tk/colorsdialog.py
index c112145e..4020c422 100644
--- a/pysollib/tk/colorsdialog.py
+++ b/pysollib/tk/colorsdialog.py
@@ -23,22 +23,12 @@
 
 __all__ = ['ColorsDialog']
 
-# imports
-import Tkinter
-
 from pysollib.ui.tktile.colorsdialog import BaseColorsDialog
+from pysollib.tk.basetkmfxdialog import BaseTkMfxDialog
 
 # ************************************************************************
 # *
 # ************************************************************************
 
-class ColorsDialog(BaseColorsDialog):
-    def _calcFrame(self):
-        return Tkinter.Frame
-
-    def _calcLabel(self):
-        return Tkinter.Label
-
-    def _calcButton(self):
-        return Tkinter.Button
-
+class ColorsDialog(BaseColorsDialog, BaseTkMfxDialog):
+    pass
diff --git a/pysollib/ui/tktile/colorsdialog.py b/pysollib/ui/tktile/colorsdialog.py
index 5ce1ba63..5452f07b 100644
--- a/pysollib/ui/tktile/colorsdialog.py
+++ b/pysollib/ui/tktile/colorsdialog.py
@@ -38,10 +38,19 @@ from pysollib.tk.tkwidget import MfxDialog
 # *
 # ************************************************************************
 
-class BaseColorsDialog(MfxDialog):
+class BaseColorsDialog:
+    def _calcFrame(self):
+        return self._calcToolkit().Frame
+
+    def _calcLabel(self):
+        return self._calcToolkit().Label
+
+    def _calcButton(self):
+        return self._calcToolkit().Button
+
     def __init__(self, parent, title, app, **kw):
         kw = self.initKw(kw)
-        MfxDialog.__init__(self, parent, title, kw.resizable, kw.default)
+        self._calc_MfxDialog().__init__(self, parent, title, kw.resizable, kw.default)
         top_frame, bottom_frame = self.createFrames(kw)
         self.createBitmaps(top_frame, kw)
 
@@ -116,7 +125,7 @@ class BaseColorsDialog(MfxDialog):
                       strings=(_("&OK"), _("&Cancel")),
                       default=0,
                       )
-        return MfxDialog.initKw(self, kw)
+        return self._calc_MfxDialog().initKw(self, kw)