[GRASS-SVN] r48898 - grass/trunk/gui/wxpython/gui_modules

svn_grass at osgeo.org svn_grass at osgeo.org
Fri Oct 21 06:48:26 EDT 2011


Author: martinl
Date: 2011-10-21 03:48:26 -0700 (Fri, 21 Oct 2011)
New Revision: 48898

Modified:
   grass/trunk/gui/wxpython/gui_modules/gdialogs.py
Log:
wxGUI: gdialogs.GroupDialog - back to StdDialogButtonSizer


Modified: grass/trunk/gui/wxpython/gui_modules/gdialogs.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/gdialogs.py	2011-10-21 10:42:42 UTC (rev 48897)
+++ grass/trunk/gui/wxpython/gui_modules/gdialogs.py	2011-10-21 10:48:26 UTC (rev 48898)
@@ -917,7 +917,7 @@
         
         # buttons
         btnApply = wx.Button(parent = self, id = wx.ID_APPLY)
-        btnClose = wx.Button(parent = self, id = wx.ID_CLOSE)
+        btnClose = wx.Button(parent = self, id = wx.ID_CANCEL)
         
         btnApply.SetToolTipString(_("Apply changes to selected group."))
         btnClose.SetToolTipString(_("Close dialog, changes are not applied."))
@@ -925,11 +925,15 @@
         btnApply.SetDefault()
         
         # sizers & do layout
-        btnSizer = wx.BoxSizer(wx.HORIZONTAL)
-        btnSizer.Add(item = btnClose, proportion = 0,
-                     flag = wx.RIGHT | wx.ALIGN_RIGHT | wx.EXPAND, border = 5)
-        btnSizer.Add(item = btnApply, proportion = 0,
-                     flag = wx.LEFT, border = 5)
+        # btnSizer = wx.BoxSizer(wx.HORIZONTAL)
+        # btnSizer.Add(item = btnClose, proportion = 0,
+        #              flag = wx.RIGHT | wx.ALIGN_RIGHT | wx.EXPAND, border = 5)
+        # btnSizer.Add(item = btnApply, proportion = 0,
+        #              flag = wx.LEFT, border = 5)
+        btnSizer = wx.StdDialogButtonSizer()
+        btnSizer.AddButton(btnApply)
+        btnSizer.AddButton(btnClose)
+        btnSizer.Realize()
         
         mainSizer = wx.BoxSizer(wx.VERTICAL)
         mainSizer.Add(item = self.bodySizer, proportion = 1,



More information about the grass-commit mailing list