[gnue] r7590 - in trunk/gnue-designer/src: base base/tools forms/LayoutEditor

[btami]

Author: btami
Date: 2005-06-12 12:40:54 -0500 (Sun, 12 Jun 2005)
New Revision: 7590

Modified:
   trunk/gnue-designer/src/base/Instance.py
   trunk/gnue-designer/src/base/tools/SchemaNavigator.py
   trunk/gnue-designer/src/forms/LayoutEditor/LayoutEditor.py
Log:
fix save as, + minor win32 fixes

Modified: trunk/gnue-designer/src/base/Instance.py
===================================================================
--- trunk/gnue-designer/src/base/Instance.py    2005-06-10 18:09:10 UTC (rev 
7589)
+++ trunk/gnue-designer/src/base/Instance.py    2005-06-12 17:40:54 UTC (rev 
7590)
@@ -586,11 +586,11 @@
 #         path += "." + filterIndex[dlg.GetFilterIndex()]
 
       if os.path.isfile(path):
-        path = self.base.ui.dialogYesNo(
+        overwrite = self.base.ui.dialogYesNo(
               _('The file "%s".\n' % path) +
               _("exists. Overwrite?"),
               _("Unsaved Changes"), icon="warn", parentWindow=self.uiinstance)
-        if not path:
+        if not overwrite:
           self.OnSaveAs(event)
           return
 

Modified: trunk/gnue-designer/src/base/tools/SchemaNavigator.py
===================================================================
--- trunk/gnue-designer/src/base/tools/SchemaNavigator.py       2005-06-10 
18:09:10 UTC (rev 7589)
+++ trunk/gnue-designer/src/base/tools/SchemaNavigator.py       2005-06-12 
17:40:54 UTC (rev 7590)
@@ -124,12 +124,15 @@
   def OnBeginRDrag(self, event):
     self.OnBeginDrag(event, right=1)
 
-  def OnSelectionChange(self, event):
-    o = self.tree.GetPyData(event.GetItem())
-    if o.getColumn():
-      self.setFeedback(o.getLabel() + ':  ' + o.getColumn())
-    else:
-      self.setFeedback('')
+  def OnSelectionChange(self, event):
+    try:
+      o = self.tree.GetPyData(event.GetItem())
+      if o.getColumn():
+        self.setFeedback(o.getLabel() + ':  ' + o.getColumn())
+      else:
+        self.setFeedback('')
+    except:
+      pass
 
   def __addTable(self, object):
     # Find the "connection" node

Modified: trunk/gnue-designer/src/forms/LayoutEditor/LayoutEditor.py
===================================================================
--- trunk/gnue-designer/src/forms/LayoutEditor/LayoutEditor.py  2005-06-10 
18:09:10 UTC (rev 7589)
+++ trunk/gnue-designer/src/forms/LayoutEditor/LayoutEditor.py  2005-06-12 
17:40:54 UTC (rev 7590)
@@ -92,7 +92,6 @@
     self.backcolor = wxWHITE
 
     EVT_RIGHT_DOWN(self.notebook, self.onRightDown)
-    EVT_NOTEBOOK_PAGE_CHANGED(self,self.notebook.GetId(), self.OnPageSelected)
     EVT_SIZE(self, self.OnSize)
 
     self._currentObject = None
@@ -124,8 +123,11 @@
                        'EndWizard': self.endWizard,
                       })
 
-    self.instance.rootObject.walk (self.inventoryObject)
-    try:
+    self.instance.rootObject.walk (self.inventoryObject)
+
+    # don't put this before walk on win32...
+    EVT_NOTEBOOK_PAGE_CHANGED(self,self.notebook.GetId(), self.OnPageSelected)
+    try:
       self._setCurrentPage(self._notebookMap[0])
     except KeyError:
       pass
@@ -161,11 +163,12 @@
          pos=wxPoint(0,0),
          style=wxCLIP_CHILDREN|wxHSCROLL|wxVSCROLL|wxSUNKEN_BORDER)
 
-      EVT_SIZE(self.workspacescroll, self.__OnGridSize)
       self.workspace = wxPanel(self.workspacescroll,-1)
       self.workspace.SetBackgroundColour(self.backcolor)
 
-      self.notebook.AddPage(self.workspacescroll, wxEncode(object.name))
+      self.notebook.AddPage(self.workspacescroll, wxEncode(object.name))
+      # don't put this before AddPage on win32...
+      EVT_SIZE(self.workspacescroll, self.__OnGridSize)
 
       object.__workspace = self.workspace
       self.drawPage(object)