gnue gnue-common/src/GObjects.py gnuef/setup.py...

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 01/06/29 17:59:05

Modified files:
        gnue-common/src: GObjects.py 
        gnuef          : setup.py 
        gnuef/src      : GFClient.py GFForm.py GFInstance.py 

Log message:
        Misc changes required to get this puppy working on win32

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/GObjects.py.diff?cvsroot=OldCVS&tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/setup.py.diff?cvsroot=OldCVS&tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFClient.py.diff?cvsroot=OldCVS&tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFForm.py.diff?cvsroot=OldCVS&tr1=1.107&tr2=1.108&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFInstance.py.diff?cvsroot=OldCVS&tr1=1.12&tr2=1.13&r1=text&r2=text

Patches:
Index: gnue/gnue-common/src/GObjects.py
diff -u gnue/gnue-common/src/GObjects.py:1.12 
gnue/gnue-common/src/GObjects.py:1.13
--- gnue/gnue-common/src/GObjects.py:1.12       Wed Jun 27 19:20:35 2001
+++ gnue/gnue-common/src/GObjects.py    Fri Jun 29 17:59:05 2001
@@ -27,6 +27,8 @@
 #
 # NOTES:
 #
+import sys
+
 try: 
   from xml.sax import saxutils
 except ImportError: 
Index: gnue/gnuef/setup.py
diff -u gnue/gnuef/setup.py:1.31 gnue/gnuef/setup.py:1.32
--- gnue/gnuef/setup.py:1.31    Fri Jun 29 16:27:23 2001
+++ gnue/gnuef/setup.py Fri Jun 29 17:59:05 2001
@@ -25,7 +25,7 @@
 import os
 import os.path
 
-#import py2exe
+import py2exe
 
 
 if sys.platform != 'win32':
Index: gnue/gnuef/src/GFClient.py
diff -u gnue/gnuef/src/GFClient.py:1.22 gnue/gnuef/src/GFClient.py:1.23
--- gnue/gnuef/src/GFClient.py:1.22     Fri Jun 29 15:55:58 2001
+++ gnue/gnuef/src/GFClient.py  Fri Jun 29 17:59:05 2001
@@ -34,7 +34,7 @@
 #
 # Copyright (c) 2000 Free Software Foundation
 #
-# $Id: GFClient.py,v 1.22 2001/06/29 22:55:58 jamest Exp $
+# $Id: GFClient.py,v 1.23 2001/06/30 00:59:05 jamest Exp $
 #
 
 import pstats
@@ -53,12 +53,11 @@
 from gnue.common import GConfig
 from gnue.common.GClientApp import * 
 
-
 class GFClient(GClientApp):
   #
   # GClientApp() overrides
   #
-  VERSION = 'pre-0.0.9'
+  VERSION = VERSION
   COMMAND = "gfclient"
   NAME = "GNUe Forms"
   USAGE = "gfclient [options] file" 
Index: gnue/gnuef/src/GFForm.py
diff -u gnue/gnuef/src/GFForm.py:1.107 gnue/gnuef/src/GFForm.py:1.108
--- gnue/gnuef/src/GFForm.py:1.107      Fri Jun 29 15:55:58 2001
+++ gnue/gnuef/src/GFForm.py    Fri Jun 29 17:59:05 2001
@@ -44,7 +44,7 @@
 import GFParser
 import GFTrigger
 
-VERSION = "0.0.8"
+# VERSION = "0.0.8"
 
 class GFForm(GFObj, GFEventAware):
   def __init__(self, parent=None, app=None):
Index: gnue/gnuef/src/GFInstance.py
diff -u gnue/gnuef/src/GFInstance.py:1.12 gnue/gnuef/src/GFInstance.py:1.13
--- gnue/gnuef/src/GFInstance.py:1.12   Wed Jun 20 17:00:03 2001
+++ gnue/gnuef/src/GFInstance.py        Fri Jun 29 17:59:05 2001
@@ -34,7 +34,7 @@
 #
 # Copyright (c) 2000 Free Software Foundation
 #
-# $Id: GFInstance.py,v 1.12 2001/06/21 00:00:03 jamest Exp $
+# $Id: GFInstance.py,v 1.13 2001/06/30 00:59:05 jamest Exp $
 #
 
 import pstats
@@ -51,10 +51,11 @@
 
 from gnue.common.GClientApp import * 
 
+VERSION = "pre-0.0.9"
 
-class GFInstance(GFController):
 
 
+class GFInstance(GFController):
   # 
   # Initialize the class
   #
@@ -274,7 +275,8 @@
   # Displays the about dialog
   #
   def executeAbout(self,event):
-    version = GConfig.get('VERSION');
+    global VERSION
+    version = VERSION;
     name = self._form.getOption('title') or "Unknown"
     formversion = self._form.getOption('version') or "Unknown"
     author = self._form.getOption('author') or "Unknown"