# HG changeset patch
# User laurent
# Date 1260972552 -3600
# Node ID ba136820dd7d4f0874ab9df63e091a7cdfa05ea9
# Parent  862d9adcd904dea8fe6b9ec8701c47120aecc11e# Parent  61e6f03328de381a7893d7d05ce6380ba8215020
Changes merged

diff -r 61e6f03328de -r ba136820dd7d LPCBeremiz.py
--- a/LPCBeremiz.py	Wed Dec 16 14:53:36 2009 +0100
+++ b/LPCBeremiz.py	Wed Dec 16 15:09:12 2009 +0100
@@ -306,7 +306,7 @@
                     i += 1
                     group = next
             var_loc = loc[i:]
-            for variable in group["children"]:
+            for variable in _GetModuleChildren(group):
                 if variable["location"] == var_loc:
                     if location["DIR"] != LOCATION_DIRS[variable["type"]]:
                         raise Exception, "Direction conflict in variable definition"
diff -r 61e6f03328de -r ba136820dd7d plugger.py
--- a/plugger.py	Wed Dec 16 14:53:36 2009 +0100
+++ b/plugger.py	Wed Dec 16 15:09:12 2009 +0100
@@ -972,7 +972,11 @@
     
     def SaveProjectAs(self, dosave=True):
         # Ask user to choose a path with write permissions
-        dirdialog = wx.DirDialog(self.AppFrame , _("Choose a directory to save project"), os.getenv("HOME"), wx.DD_NEW_DIR_BUTTON)
+        if wx.Platform == '__WXMSW__':
+            path = os.getenv("USERPROFILE")
+        else:
+            path = os.getenv("HOME")
+        dirdialog = wx.DirDialog(self.AppFrame , _("Choose a directory to save project"), path, wx.DD_NEW_DIR_BUTTON)
         answer = dirdialog.ShowModal()
         dirdialog.Destroy()
         if answer == wx.ID_OK: