gnue/navigator/src UIwxpython.py UIwxweb.py

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/01/18 15:57:06

Modified files:
        navigator/src  : UIwxpython.py UIwxweb.py 

Log message:
        fixed problem w/navigator hanging on exit

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/navigator/src/UIwxpython.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/navigator/src/UIwxweb.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gnue/navigator/src/UIwxpython.py
diff -c gnue/navigator/src/UIwxpython.py:1.2 
gnue/navigator/src/UIwxpython.py:1.3
*** gnue/navigator/src/UIwxpython.py:1.2        Tue Jan  8 19:07:36 2002
--- gnue/navigator/src/UIwxpython.py    Fri Jan 18 15:57:06 2002
***************
*** 41,46 ****
--- 41,47 ----
  
    def OnInit(self):
      self.frame = wxFrame(NULL, -1, "Nothing")
+     EVT_CLOSE(self.frame,self.OnClose)
      self.frame.Show(true)
      self.list = wxListCtrl(self.frame, -1, style=wxLC_LIST|wxLC_SINGLE_SEL)
      EVT_LIST_ITEM_ACTIVATED(self.frame, 
self.list.GetId(),self.OnItemActivated)
***************
*** 48,53 ****
--- 49,56 ----
      self.buildMenu(self.processes)
      return 1
  
+   def OnClose(self, event):
+     self.frame.Destroy()
  
    def buildMenu(self, process):
  
Index: gnue/navigator/src/UIwxweb.py
diff -c gnue/navigator/src/UIwxweb.py:1.1 gnue/navigator/src/UIwxweb.py:1.2
*** gnue/navigator/src/UIwxweb.py:1.1   Thu Jan 10 20:14:54 2002
--- gnue/navigator/src/UIwxweb.py       Fri Jan 18 15:57:06 2002
***************
*** 43,48 ****
--- 43,49 ----
    def OnInit(self):
  
      self.frame = wxFrame(NULL, -1, "Nothing")
+     EVT_CLOSE(self.frame,self.OnClose)
      self.frame.Show(true)
      self.htmlpanel = MyHtmlWindow(self, self.frame, -1)#, 
style=wxHW_SCROLLBAR_NEVER)
  #    self.htmlpanel = MyHtmlWindow(self.frame, -1)#, 
style=wxHW_SCROLLBAR_NEVER)
***************
*** 51,56 ****
--- 52,59 ----
      return 1
  
  
+   def OnClose(self, event):
+     self.frame.Destroy()
  
    def buildMenu(self, process):
  
***************
*** 81,87 ****
  
    def OnLinkClicked(self, event):
      print "Here!"
!     object = self.selections(string.split(event.GetHref(),"://",1))[1]
      if object._type == 'GNStep':
        object.run()
      else:
--- 84,90 ----
  
    def OnLinkClicked(self, event):
      print "Here!"
!     object = self.selections[event.GetHref()]
      if object._type == 'GNStep':
        object.run()
      else:
***************
*** 115,121 ****
      self.shading = not self.shading
  
      return """
! <tr%s><td><a href="%s"/>%s</a></td></tr>
  """ % (shade, url, description)
  
  
--- 118,124 ----
      self.shading = not self.shading
  
      return """
! <tr%s><td><a href="%s">%s</a></td></tr>
  """ % (shade, url, description)
  
  
***************
*** 128,134 ****
      self.shading = not self.shading
  
      return """
! <tr%s><td><a href="%s"/>%s</a></td></tr>
  """ % (shading,url, description)
  
  
--- 131,137 ----
      self.shading = not self.shading
  
      return """
! <tr%s><td><a href="%s">%s</a></td></tr>
  """ % (shading,url, description)
  
  
***************
*** 137,146 ****
    def __init__(self, instance, *args, **params):
      self.instance = instance
      wxHtmlWindow.__init__(self, *args, **params)
! 
!   def base_OnLinkClicked(self, event):
!     print "Something happened"
!     self.instance.OnLinkClicked(event)
  
    def OnLinkClicked(self, event):
      print "Something happened"
--- 140,146 ----
    def __init__(self, instance, *args, **params):
      self.instance = instance
      wxHtmlWindow.__init__(self, *args, **params)
!     print "I am a MyHTMLWindow instance"
  
    def OnLinkClicked(self, event):
      print "Something happened"