[gnue] r8450 - in trunk/gnue-designer/src: app ui/wx

[jcater]

Author: jcater
Date: 2006-04-27 15:02:44 -0500 (Thu, 27 Apr 2006)
New Revision: 8450

Modified:
   trunk/gnue-designer/src/app/designer.py
   trunk/gnue-designer/src/ui/wx/Base.py
Log:
fix wxversion import

Modified: trunk/gnue-designer/src/app/designer.py
===================================================================
--- trunk/gnue-designer/src/app/designer.py     2006-04-27 09:36:23 UTC (rev 
8449)
+++ trunk/gnue-designer/src/app/designer.py     2006-04-27 20:02:44 UTC (rev 
8450)
@@ -35,6 +35,8 @@
 from gnue.common.apps.GClientApp import GClientApp
 from gnue.common.utils.FileUtils import dyn_import
 
+# This is needed to force wxselect to be called # TODO: Fix
+from gnue.designer.ui.wx import Base
 from gnue.designer import VERSION, PACKAGE
 from gnue.designer.app.documents import document_types, document_types_valid
 from gnue.designer.base import TemplateParser, TemplateChooser, MRUManager

Modified: trunk/gnue-designer/src/ui/wx/Base.py
===================================================================
--- trunk/gnue-designer/src/ui/wx/Base.py       2006-04-27 09:36:23 UTC (rev 
8449)
+++ trunk/gnue-designer/src/ui/wx/Base.py       2006-04-27 20:02:44 UTC (rev 
8450)
@@ -32,19 +32,14 @@
 import string
 
 # ---------------------------------------------------------------------------
-# GNUe Imports
-# ---------------------------------------------------------------------------
-from gnue.forms.uidrivers.wx.GFwxApp import setWxApp
-from gnue.common.apps import GConfig
-
-# ---------------------------------------------------------------------------
 # wx Imports
 # ---------------------------------------------------------------------------
-try:  # Force wx2.6 to load
-    import wxselect
-    wxselect.wx.VersionFinder.setpath(version="2.6")
-except ImportError:
-    pass
+try: 
+    if not hasattr(sys, 'frozen'):
+        import wxversion
+        wxversion.select ('2.6')
+except ImportError: 
+    pass  # wxselect not installed
 
 try:  # Make sure 2.6 did in fact load
     import wx
@@ -62,7 +57,13 @@
     print "*" * 70
     print
 
+# ---------------------------------------------------------------------------
+# GNUe Imports
+# ---------------------------------------------------------------------------
+from gnue.forms.uidrivers.wx.GFwxApp import setWxApp
+from gnue.common.apps import GConfig
 
+
 #----------------------------------------------------------------------------
 # Module globals
 #----------------------------------------------------------------------------