Преглед изворни кода

wxGUI: no menu in workspace toolbar

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@46593 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa пре 14 година
родитељ
комит
0579a431b6
2 измењених фајлова са 4 додато и 7 уклоњено
  1. 4 1
      gui/wxpython/gui_modules/toolbars.py
  2. 0 6
      gui/wxpython/wxgui.py

+ 4 - 1
gui/wxpython/gui_modules/toolbars.py

@@ -1575,13 +1575,16 @@ class LMWorkspaceToolbar(AbstractToolbar):
         """!Toolbar data
         """
         self.newdisplay = wx.NewId()
+        self.workspaceNew = wx.NewId()
         self.workspaceOpen = wx.NewId()
         self.workspaceSave = wx.NewId()
         
         icons = Icons['layerManager']
         return self._getToolbarData(((self.newdisplay, 'newdisplay', icons["newdisplay"],
-                                      self.parent.OnNewMenu),
+                                      self.parent.OnNewDisplay),
                                      (None, ),
+                                     (self.workspaceNew, 'workspaceNew', icons["workspaceNew"],
+                                      self.parent.OnWorkspaceNew),
                                      (self.workspaceOpen, 'workspaceOpen', icons["workspaceOpen"],
                                       self.parent.OnWorkspaceOpen),
                                      (self.workspaceSave, 'workspaceSave', icons["workspaceSave"],

+ 0 - 6
gui/wxpython/wxgui.py

@@ -641,12 +641,6 @@ class GMFrame(wx.Frame):
         self.PopupMenu(menu)
         menu.Destroy()
 
-    def OnNewMenu(self, event):
-        """!New display/workspace menu
-        """
-        self._popupMenu((('newdisplay', self.OnNewDisplay),
-                         ('workspaceNew',  self.OnWorkspaceNew)))
-
     def OnImportMenu(self, event):
         """!Import maps menu (import, link)
         """