updated gpdf2swf (patch from Ricardo Pedroso)

[swftools.git] / wx / gpdf2swf.py

diff --git a/wx/gpdf2swf.py b/wx/gpdf2swf.py
index 3fd12c6..e6941c2 100644 (file)
--- a/wx/gpdf2swf.py
+++ b/wx/gpdf2swf.py
@@ -23,6 +23,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 from __future__ import division
+import __builtin__
 import os
 import sys
 import imp
@@ -32,13 +33,31 @@ def main_is_frozen():
             hasattr(sys, "importers") # old py2exe
             or imp.is_frozen("__main__")) # tools/freeze
 
+#if not main_is_frozen():
+#    try:
+#        import wxversion
+#        wxversion.select("2.6")
+#    except:
+#        wxversion.select("2.8")
+
+def get_main_dir():
+    if main_is_frozen():
+        return os.path.dirname(sys.executable)
+    return os.path.dirname(os.path.abspath(__file__))
+__builtin__.get_main_dir = get_main_dir
+__builtin__.GPDF2SWF_BASEDIR = get_main_dir()
+
+pyver = "".join(map(str, sys.version_info[0:2]))
+#print >>sys.stderr, pyver
 if main_is_frozen():
-    sys.path.insert(0, os.path.join("..", "python25"))
+    sys.path.insert(0, os.path.join("..", "python%s" % pyver))
 else:
     sys.path.insert(0, os.path.join("..", "lib", "python"))
+    sys.path.insert(1, os.path.join("..", "python%s" % pyver))
 
 import wx
-from app import Pdf2Swf
+#print >>sys.stderr, wx.VERSION
+from lib.app import Pdf2Swf
 
 if __name__ == "__main__":
     app = wx.App(False)