[GRASS-SVN] r55752 - in grass/trunk/gui/wxpython: dbmgr gui_core

[svn_grass at osgeo.org]

Author: annakrat
Date: 2013-04-13 07:57:47 -0700 (Sat, 13 Apr 2013)
New Revision: 55752

Modified:
   grass/trunk/gui/wxpython/dbmgr/base.py
   grass/trunk/gui/wxpython/gui_core/preferences.py
Log:
wxGUI/dbmgr: workaround for #1633 (merged from releasebranch, r55719)

Modified: grass/trunk/gui/wxpython/dbmgr/base.py
===================================================================
--- grass/trunk/gui/wxpython/dbmgr/base.py	2013-04-13 14:35:59 UTC (rev 55751)
+++ grass/trunk/gui/wxpython/dbmgr/base.py	2013-04-13 14:57:47 UTC (rev 55752)
@@ -174,7 +174,8 @@
         cmdParams = dict(quiet = True,
                          parent = self,
                          flags = 'c')
-        if sys.platform != "win32":
+        # pipe must not be given in the params for windows
+        if not (sys.platform == "win32" and fs == '|'):
             cmdParams.update(dict(sep = fs))
 
         if sql:

Modified: grass/trunk/gui/wxpython/gui_core/preferences.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/preferences.py	2013-04-13 14:35:59 UTC (rev 55751)
+++ grass/trunk/gui/wxpython/gui_core/preferences.py	2013-04-13 14:57:47 UTC (rev 55752)
@@ -1133,9 +1133,6 @@
 
         flexSizer.Add(label, proportion = 0, flag = wx.ALIGN_CENTER_VERTICAL)
         flexSizer.Add(separator, proportion = 0, flag = wx.ALIGN_RIGHT | wx.FIXED_MINSIZE)
-        if sys.platform == "win32":
-            label.Hide()
-            separator.Hide()
 
         # ask on delete record
         askOnDeleteRec = wx.CheckBox(parent = panel, id = wx.ID_ANY,