From d3faa78e758f34f45a98c5b62e787d72219aca6a Mon Sep 17 00:00:00 2001
From: Juhani Numminen <juhaninumminen0@gmail.com>
Date: Mon, 12 Oct 2020 15:35:55 +0300
Subject: [PATCH] Prune pysollib.macosx; it no longer had any effect

---
 MANIFEST.in                   |  2 +-
 pysollib/init.py              |  5 ----
 pysollib/macosx/__init__.py   |  0
 pysollib/macosx/appSupport.py | 51 -----------------------------------
 pysollib/winsystems/aqua.py   | 11 --------
 setup.py                      |  1 -
 6 files changed, 1 insertion(+), 69 deletions(-)
 delete mode 100644 pysollib/macosx/__init__.py
 delete mode 100644 pysollib/macosx/appSupport.py

diff --git a/MANIFEST.in b/MANIFEST.in
index 33d46753..e19daaed 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,7 +7,7 @@ include pysol.py setup.py setup_osx.py setup.cfg MANIFEST.in Makefile
 include COPYING README.md AUTHORS.md README.android README.kivy
 include NEWS.asciidoc
 #recursive-include pysollib *.py
-include pysollib/*.py pysollib/macosx/*.py
+include pysollib/*.py
 include pysollib/winsystems/*.py
 include pysollib/tk/*.py pysollib/tile/*.py pysollib/pysolgtk/*.py
 include pysollib/game/*.py
diff --git a/pysollib/init.py b/pysollib/init.py
index 3d658c4e..52906f41 100644
--- a/pysollib/init.py
+++ b/pysollib/init.py
@@ -106,11 +106,6 @@ def init():
             sys.exit("%s needs Tcl/Tk 8.4 or better (you have %s)" %
                      (pysollib.settings.TITLE, str(tkinter.TkVersion)))
         pysollib.settings.WIN_SYSTEM = root.tk.call('tk', 'windowingsystem')
-        if pysollib.settings.WIN_SYSTEM == 'aqua':
-            # TkAqua displays the console automatically in application
-            # bundles, so we hide it here.
-            from pysollib.macosx.appSupport import hideTkConsole
-            hideTkConsole(root)
         #
         if pysollib.settings.USE_TILE == 'auto':
             # check Tile
diff --git a/pysollib/macosx/__init__.py b/pysollib/macosx/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/pysollib/macosx/appSupport.py b/pysollib/macosx/appSupport.py
deleted file mode 100644
index f64e724c..00000000
--- a/pysollib/macosx/appSupport.py
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env python
-# -*- mode: python; coding: utf-8; -*-
-# ---------------------------------------------------------------------------##
-#
-# Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer
-# Copyright (C) 2003 Mt. Hood Playing Card Co.
-# Copyright (C) 2005-2009 Skomoroh
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# ---------------------------------------------------------------------------##
-"""
-A number of function that enhance PySol on MacOSX when it used as a normal
-GUI application (as opposed to an X11 application).
-"""
-import sys
-
-from six.moves.tkinter import TclError
-
-
-def runningAsOSXApp():
-    """ Returns True if-and-only-if running from the
-    PySol.app bundle on OSX """
-    return (sys.platform == 'darwin' and 'PySol.app' in sys.argv[0])
-
-
-def hideTkConsole(root):
-    try:
-        root.tk.call('console', 'hide')
-    except TclError:
-        pass
-
-
-def setupApp(app):
-    """
-    Perform setup for the OSX application bundle.
-    """
-    if not runningAsOSXApp():
-        return
-    hideTkConsole(app.top)
diff --git a/pysollib/winsystems/aqua.py b/pysollib/winsystems/aqua.py
index b9f47ee5..51bacfe4 100644
--- a/pysollib/winsystems/aqua.py
+++ b/pysollib/winsystems/aqua.py
@@ -21,22 +21,11 @@
 #
 # ---------------------------------------------------------------------------##
 
-from pysollib.macosx.appSupport import hideTkConsole
-from pysollib.settings import TOOLKIT, USE_TILE
 from pysollib.winsystems.common import BaseTkSettings, base_init_root_window
 
 
 def init_root_window(root, app):
     base_init_root_window(root, app)
-    if TOOLKIT == 'tk':
-        hideTkConsole(root)
-    if TOOLKIT == 'gtk':
-        pass
-    elif USE_TILE:
-        pass
-    else:                               # pure Tk
-        # root.option_add(...)
-        pass
 
 
 class TkSettings(BaseTkSettings):
diff --git a/setup.py b/setup.py
index 64104d5d..a37f2dfb 100644
--- a/setup.py
+++ b/setup.py
@@ -83,7 +83,6 @@ kw = {
     'license': 'GPL',
     'scripts': ['pysol.py'],
     'packages': ['pysollib',
-                 'pysollib.macosx',
                  'pysollib.winsystems',
                  'pysollib.tk',
                  'pysollib.tile',