gnue/designer/src/base Instance.py MenuBar.py

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 03/04/04 23:52:50

Modified files:
        designer/src/base: Instance.py MenuBar.py 

Log message:
        toolbar icons no longer generate traceback
        new form icon now works

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/Instance.py.diff?tr1=1.90&tr2=1.91&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/MenuBar.py.diff?tr1=1.41&tr2=1.42&r1=text&r2=text

Patches:
Index: gnue/designer/src/base/Instance.py
diff -c gnue/designer/src/base/Instance.py:1.90 
gnue/designer/src/base/Instance.py:1.91
*** gnue/designer/src/base/Instance.py:1.90     Fri Apr  4 23:03:16 2003
--- gnue/designer/src/base/Instance.py  Fri Apr  4 23:52:50 2003
***************
*** 586,592 ****
        print _("Unable to connect to %s") % conn
  
  
!   def OnNew(self, event):
      self._app.newInstance(self._fileNewMap[event.GetId()])
  
  
--- 586,592 ----
        print _("Unable to connect to %s") % conn
  
  
!   def OnNew(self, event):    
      self._app.newInstance(self._fileNewMap[event.GetId()])
  
  
***************
*** 641,647 ****
  
  
    def OnClose(self, event):
-     print self
      if self.isDirty():
        dlg = wxMessageDialog(NULL,
                _("This document has unsaved changes.\n") +
--- 641,646 ----
Index: gnue/designer/src/base/MenuBar.py
diff -c gnue/designer/src/base/MenuBar.py:1.41 
gnue/designer/src/base/MenuBar.py:1.42
*** gnue/designer/src/base/MenuBar.py:1.41      Fri Apr  4 22:41:55 2003
--- gnue/designer/src/base/MenuBar.py   Fri Apr  4 23:52:50 2003
***************
*** 306,312 ****
  
    def simulateMenuEvent(self, location):
      method, id = self._eventMappings[location]
!     method(wxEvent(id))
  
  
  
--- 306,312 ----
  
    def simulateMenuEvent(self, location):
      method, id = self._eventMappings[location]
!     method(fakeWxEvent(id))
  
  
  
***************
*** 345,347 ****
--- 345,360 ----
  
    def finalize(self):
      self.toolFrame.finalize()
+ 
+ #
+ # fakeWxEvent
+ #
+ # There seem to be issues in wx2.4 will
+ # calling wxEvent(id#).  This event lets
+ # us pass a fake event in it's place
+ #
+ class fakeWxEvent:
+   def __init__(self,id):
+     self.id=id
+   def GetId(self):
+     return self.id