gnue/designer/src GFDesigner.py Icons.py Instan...

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 01/11/19 22:37:56

Modified files:
        designer/src   : GFDesigner.py Icons.py Instance.py 

Log message:
        Our icons don't work with wxPython 2.2.x so disable them

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/GFDesigner.py.diff?cvsroot=OldCVS&tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/Icons.py.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/Instance.py.diff?cvsroot=OldCVS&tr1=1.31&tr2=1.32&r1=text&r2=text

Patches:
Index: gnue/designer/src/GFDesigner.py
diff -u gnue/designer/src/GFDesigner.py:1.23 
gnue/designer/src/GFDesigner.py:1.24
--- gnue/designer/src/GFDesigner.py:1.23        Mon Nov 19 21:00:16 2001
+++ gnue/designer/src/GFDesigner.py     Mon Nov 19 22:37:55 2001
@@ -35,7 +35,6 @@
 from gnue.common.GClientApp import GClientApp
 from gnue.forms import UIwxpython, GFForm
 
-
 class GFDesigner(GClientApp, wxApp):
 
   # GClientApp stuff...
Index: gnue/designer/src/Icons.py
diff -u gnue/designer/src/Icons.py:1.5 gnue/designer/src/Icons.py:1.6
--- gnue/designer/src/Icons.py:1.5      Tue Nov 13 17:12:49 2001
+++ gnue/designer/src/Icons.py  Mon Nov 19 22:37:55 2001
@@ -26,8 +26,11 @@
 # NOTES:
 #
 
+from gnue.common import GDebug
+
 import os
 from wxPython.wx import *
+from wxPython import __version__
 
 # Nasty hack to get around wxPython bug (still in 2.3.1)
 class myImageList(wxImageList):
@@ -37,7 +40,7 @@
 treeIconMap = {}
 treeIconList = myImageList(16,16,false)
 
-iconlocation = "%s/%s" % (os.environ['INSTALL_PREFIX'],'/shared/images')
+iconlocation = "%s/%s" % (os.environ['INSTALL_PREFIX'][:-1],'shared/images')
 
 if sys.platform != 'win32': 
   icontype = wxBITMAP_TYPE_XPM
@@ -46,9 +49,15 @@
   icontype = wxBITMAP_TYPE_ICO
   iconextension = 'ico'
 
+if __version__ < '2.3.0': # TODO: wxPython 2.2.x seems to segfault with icons
+  iconextension = ''      #       this is a hack to make it not find icons
+                          #       and thus not segfault.  We should never
+                          #       build a win version w/ that old a wxPython
+
 for f in ('block','datasource','entry','import','pagewidget',
           'page','trigger','properties'):
   if os.path.isfile('%s/destree_%s.%s' % (iconlocation, f,iconextension)):
+    GDebug.printMesg(0,'%s/destree_%s.%s' % (iconlocation, f,iconextension))
     treeIconMap[f] = treeIconList.AddIcon(
         wxIcon('%s/destree_%s.%s' % (iconlocation, f,iconextension), icontype))
   else:
Index: gnue/designer/src/Instance.py
diff -u gnue/designer/src/Instance.py:1.31 gnue/designer/src/Instance.py:1.32
--- gnue/designer/src/Instance.py:1.31  Mon Nov 19 21:00:16 2001
+++ gnue/designer/src/Instance.py       Mon Nov 19 22:37:55 2001
@@ -30,7 +30,7 @@
 from wxPython.wx import *
 from gnue.common import GDebug, GConfig
 from gnue.common.GClientApp import GClientApp
-from gnue.forms import GFInstance, GFParser, GFObjects, GFTrigger, GFLibrary, 
UIwxpython
+from gnue.forms import GFForm, GFInstance, GFParser, GFObjects, GFTrigger, 
GFLibrary, UIwxpython
 from MenuBar import MainMenuBar
 from PopupMenu import ObjectMenu
 from LayoutEditor import LayoutEditor