From ff873afc0be7bb090796e03a176efda3c556255d Mon Sep 17 00:00:00 2001 From: Eugenio Parodi Date: Wed, 25 Oct 2023 16:31:09 +0100 Subject: [PATCH] Adapted pyodide to the new structure --- TermTk/TTkCore/TTkTerm/input.py | 7 +------ tests/sandbox/sandbox.html | 4 ++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/TermTk/TTkCore/TTkTerm/input.py b/TermTk/TTkCore/TTkTerm/input.py index acf8a8e1..27ab9141 100644 --- a/TermTk/TTkCore/TTkTerm/input.py +++ b/TermTk/TTkCore/TTkTerm/input.py @@ -27,12 +27,7 @@ from time import time import platform -if platform.system() == 'Linux': - from ..drivers.unix import TTkInputDriver -elif platform.system() == 'Darwin': - from ..drivers.unix import TTkInputDriver -elif platform.system() == 'Windows': - from ..drivers.windows import TTkInputDriver +from ..drivers import TTkInputDriver from TermTk.TTkCore.log import TTkLog from TermTk.TTkCore.constant import TTkK diff --git a/tests/sandbox/sandbox.html b/tests/sandbox/sandbox.html index 18ea6023..5e36d6d5 100644 --- a/tests/sandbox/sandbox.html +++ b/tests/sandbox/sandbox.html @@ -231,11 +231,11 @@ pyodide.runPython(` import sys import TermTk as ttk + from TermTk.TTkCore.TTkTerm.input import TTkInput import pyodideProxy def ttk_input(val): - if ttk.TTkHelper._rootWidget and ttk.TTkHelper._rootWidget._input: - ttk.TTkHelper._rootWidget._input.key_process(val) + TTkInput.key_process(val) def ttk_resize(w,h): ttk.TTkLog.debug(f"Resize: {w=} {h=}")