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

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/01/28 00:44:12

Modified files:
        designer/src   : Instance.py MenuBar.py 
        designer/src/forms: LayoutEditor.py LayoutEditorTools.py 

Log message:
        misc changes to get win32 support working again (still has some issues)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/Instance.py.diff?cvsroot=OldCVS&tr1=1.46&tr2=1.47&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/MenuBar.py.diff?cvsroot=OldCVS&tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/forms/LayoutEditor.py.diff?cvsroot=OldCVS&tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/forms/LayoutEditorTools.py.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gnue/designer/src/Instance.py
diff -c gnue/designer/src/Instance.py:1.46 gnue/designer/src/Instance.py:1.47
*** gnue/designer/src/Instance.py:1.46  Tue Jan 22 21:48:53 2002
--- gnue/designer/src/Instance.py       Mon Jan 28 00:44:12 2002
***************
*** 156,166 ****
  
      # Create our tools
  
      self.visualEditorWindow = self
      self.visualEditor = self.createVisualEditor()
  
  
!     self.__objectListeners = [self.visualEditor]
  
  
      # Create the supplemental tools
--- 156,167 ----
  
      # Create our tools
  
+     self.__objectListeners = []
      self.visualEditorWindow = self
      self.visualEditor = self.createVisualEditor()
  
  
!     self.__objectListeners.append(self.visualEditor)
  
  
      # Create the supplemental tools
Index: gnue/designer/src/MenuBar.py
diff -c gnue/designer/src/MenuBar.py:1.17 gnue/designer/src/MenuBar.py:1.18
*** gnue/designer/src/MenuBar.py:1.17   Tue Jan 22 14:19:15 2002
--- gnue/designer/src/MenuBar.py        Mon Jan 28 00:44:12 2002
***************
*** 134,140 ****
         frame.connectionMap[id] = conn
         EVT_MENU(frame, id, frame.OnConnectTo)
  
-      self._fileNew.Enable(ID_NEW_REPORT,0)
       self._file.Enable(ID_RELOAD,0)
  
       self._help = wxMenu()
--- 134,139 ----
Index: gnue/designer/src/forms/LayoutEditor.py
diff -c gnue/designer/src/forms/LayoutEditor.py:1.10 
gnue/designer/src/forms/LayoutEditor.py:1.11
*** gnue/designer/src/forms/LayoutEditor.py:1.10        Sat Jan 26 19:53:23 2002
--- gnue/designer/src/forms/LayoutEditor.py     Mon Jan 28 00:44:12 2002
***************
*** 45,51 ****
      self._app = instance._app
      self.widgets = {}
      self.widgets.update(UIwxpython.WIDGETS)
!     self.toolbar = LayoutEditorTools.LayoutEditorTools(self)
      self.frame.SetToolBar(self.toolbar)
      del self.widgets['GFPage']
  
--- 45,51 ----
      self._app = instance._app
      self.widgets = {}
      self.widgets.update(UIwxpython.WIDGETS)
!     self.toolbar = LayoutEditorTools.LayoutEditorTools(self, self.frame)
      self.frame.SetToolBar(self.toolbar)
      del self.widgets['GFPage']
  
Index: gnue/designer/src/forms/LayoutEditorTools.py
diff -c gnue/designer/src/forms/LayoutEditorTools.py:1.3 
gnue/designer/src/forms/LayoutEditorTools.py:1.4
*** gnue/designer/src/forms/LayoutEditorTools.py:1.3    Mon Jan 21 20:41:55 2002
--- gnue/designer/src/forms/LayoutEditorTools.py        Mon Jan 28 00:44:12 2002
***************
*** 33,41 ****
  
  class LayoutEditorTools(wxToolBar):
  
!   def __init__(self, editor):
      self.editor = editor
!     wxToolBar.__init__(self, editor, -1, style=wxTB_DOCKABLE)
  
  
      self.mapping = {}
--- 33,41 ----
  
  class LayoutEditorTools(wxToolBar):
  
!   def __init__(self, editor, frame):
      self.editor = editor
!     wxToolBar.__init__(self, frame, -1)#, style=wxTB_DOCKABLE)
  
  
      self.mapping = {}