From 76d5792c61dfb616ddadf058890258d5b32b33be Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Mon, 20 Aug 2012 13:27:56 -0400 Subject: [PATCH] Move wxversion.select call to hooke.ui.gui and remove evtmgr import. This ensures wxversion.select gets called before anyone has a change to import wx. evtmgr hasn't been used since commit bbf2b7eb99e94cf82de4c4160c9fdf8702cd1ba4 Author: W. Trevor King Date: Mon Aug 2 10:56:10 2010 -0400 Updated gui.panel.note and simplified hooke.plugin.note. --- hooke/ui/gui/__init__.py | 2 ++ hooke/ui/gui/interface.py | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/hooke/ui/gui/__init__.py b/hooke/ui/gui/__init__.py index dcd7fab..59ea1b7 100644 --- a/hooke/ui/gui/__init__.py +++ b/hooke/ui/gui/__init__.py @@ -32,6 +32,8 @@ except ImportError, e: _wxversion = None _wxversion_error = e else: + WX_GOOD=['2.9'] + _wxversion.select(WX_GOOD) try: from .interface import HookeApp as _HookeApp except _wxversion.VersionError, e: diff --git a/hooke/ui/gui/interface.py b/hooke/ui/gui/interface.py index 3ea8631..f157cbd 100644 --- a/hooke/ui/gui/interface.py +++ b/hooke/ui/gui/interface.py @@ -18,11 +18,6 @@ """Define :class:`HookeApp` and related, central application classes. """ -WX_GOOD=['2.9'] - -import wxversion -wxversion.select(WX_GOOD) - import copy import logging import os @@ -35,7 +30,6 @@ import wx import wx.html #import wx.aui as aui # C++ implementation import wx.lib.agw.aui as aui # Python implementation -import wx.lib.evtmgr as evtmgr # wxPropertyGrid is included in wxPython >= 2.9.1, see # http://wxpropgrid.sourceforge.net/cgi-bin/index?page=download # until then, we'll avoid it because of the *nix build problems. -- 2.26.2