[GRASS-SVN] r71284 - grass/branches/releasebranch_7_2/gui/wxpython/web_services

[svn_grass at osgeo.org]

Author: annakrat
Date: 2017-07-18 10:25:31 -0700 (Tue, 18 Jul 2017)
New Revision: 71284

Modified:
   grass/branches/releasebranch_7_2/gui/wxpython/web_services/dialogs.py
Log:
wxGUI/WMS: fix Save WMS dialog closing to prevent starting download when dialog is closed with x (merge from trunk, r71283)

Modified: grass/branches/releasebranch_7_2/gui/wxpython/web_services/dialogs.py
===================================================================
--- grass/branches/releasebranch_7_2/gui/wxpython/web_services/dialogs.py	2017-07-18 17:20:00 UTC (rev 71283)
+++ grass/branches/releasebranch_7_2/gui/wxpython/web_services/dialogs.py	2017-07-18 17:25:31 UTC (rev 71284)
@@ -896,11 +896,11 @@
 
         # buttons
         self.btn_close = wx.Button(parent=self, id=wx.ID_CLOSE)
+        self.SetEscapeId(self.btn_close.GetId())
         self.btn_close.SetToolTipString(_("Close dialog"))
 
         self.btn_ok = wx.Button(
             parent=self,
-            id=wx.ID_OK,
             label=_("&Save layer"))
         self.btn_ok.SetToolTipString(_("Save web service layer as raster map"))
 
@@ -964,7 +964,6 @@
         self.Fit()
 
         # bindings
-        self.btn_close.Bind(wx.EVT_BUTTON, self.OnClose)
         self.btn_ok.Bind(wx.EVT_BUTTON, self.OnSave)
 
         self.Bind(EVT_CMD_DONE, self.OnCmdDone)
@@ -994,13 +993,6 @@
 
         return selSizer
 
-    def OnClose(self, event):
-        """Close dialog
-        """
-        if not self.IsModal():
-            self.Destroy()
-        event.Skip()
-
     def OnRegionType(self, event):
         selected = event.GetEventObject()
         if selected == self.region_types['named']: