[GRASS-SVN] r30887 - grass/trunk/gui/wxpython

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-04-07 07:08:40 -0400 (Mon, 07 Apr 2008)
New Revision: 30887

Modified:
   grass/trunk/gui/wxpython/wxgui.py
Log:
wxGUI (wxgui) use wx.YES_NO style for wx.ICON_QUESTION


Modified: grass/trunk/gui/wxpython/wxgui.py
===================================================================
--- grass/trunk/gui/wxpython/wxgui.py	2008-04-07 11:03:40 UTC (rev 30886)
+++ grass/trunk/gui/wxpython/wxgui.py	2008-04-07 11:08:40 UTC (rev 30887)
@@ -506,7 +506,7 @@
                                                     "Do you want to store current settings "
                                                     "to workspace file?"),
                                     caption=_("Save current settings?"),
-                                    style=wxYES_NO | wxYES_DEFAULT | wx.ICON_QUESTION)
+                                    style=wx.YES_NO | wx.YES_DEFAULT | wx.ICON_QUESTION)
              if dlg.ShowModal() == wx.ID_YES:
                  self.OnWorkspaceSaveAs()
              dlg.Destroy()
@@ -680,8 +680,8 @@
         if os.path.exists(filename):
             dlg = wx.MessageDialog(self, message=_("Workspace file <%s> already exists. "
                                                    "Do you want to overwrite this file?") % filename,
-                                   caption=_("Warning"), style=wx.OK | wx.CANCEL | wx.ICON_QUESTION)
-            if dlg.ShowModal() != wx.ID_OK:
+                                   caption=_("Warning"), style=wx.YES_NO | wx.YES_DEFAULT | wx.ICON_QUESTION)
+            if dlg.ShowModal() != wx.ID_YES:
                 dlg.Destroy()
                 return False
 
@@ -698,8 +698,8 @@
             dlg = wx.MessageDialog(self, message=_("Workspace file <%s> already exists. "
                                                    "Do you want to overwrite this file?") % \
                                        self.workspaceFile,
-                                   caption=_("Warning"), style=wx.OK | wx.CANCEL | wx.ICON_QUESTION)
-            if dlg.ShowModal() != wx.ID_OK:
+                                   caption=_("Warning"), style=wx.YES_NO | wx.YES_DEFAULT | wx.ICON_QUESTION)
+            if dlg.ShowModal() == wx.ID_NO:
                 dlg.Destroy()
             else:
                 Debug.msg(4, "GMFrame.OnWorkspaceSave(): filename=%s" % self.workspaceFile)