Переглянути джерело

wxGUI/WMS: fix Save WMS dialog closing to prevent starting download when dialog is closed with x

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@71283 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová 7 роки тому
батько
коміт
7a7c65e513
1 змінених файлів з 1 додано та 9 видалено
  1. 1 9
      gui/wxpython/web_services/dialogs.py

+ 1 - 9
gui/wxpython/web_services/dialogs.py

@@ -897,11 +897,11 @@ class SaveWMSLayerDialog(wx.Dialog):
 
         # buttons
         self.btn_close = Button(parent=self, id=wx.ID_CLOSE)
+        self.SetEscapeId(self.btn_close.GetId())
         self.btn_close.SetToolTip(_("Close dialog"))
 
         self.btn_ok = Button(
             parent=self,
-            id=wx.ID_OK,
             label=_("&Save layer"))
         self.btn_ok.SetToolTip(_("Save web service layer as raster map"))
 
@@ -965,7 +965,6 @@ class SaveWMSLayerDialog(wx.Dialog):
         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)
@@ -995,13 +994,6 @@ class SaveWMSLayerDialog(wx.Dialog):
 
         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']: