wxGUI: fix map display combobox option after switching between toolba…

…rs (#2625)
OSGeo · Jan 19, 2023 · aca771d · aca771d
1 parent 8d71654
commit aca771d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/gui/wxpython/mapdisp/frame.py b/gui/wxpython/mapdisp/frame.py
@@ -523,6 +523,11 @@ def AddToolbar(self, name, fixed=False):
                               CloseButton(False).Layer(2).
                               BestSize((self.toolbars['map'].GetBestSize())))
 
+        # nviz
+        elif name == "nviz":
+            self.toolbars["map"].combo.SetValue(_("3D view"))
+            self.AddNviz()
+
         # vector digitizer
         elif name == "vdigit":
             self.toolbars['map'].combo.SetValue(_("Vector digitizer"))

diff --git a/gui/wxpython/mapdisp/toolbars.py b/gui/wxpython/mapdisp/toolbars.py
@@ -237,11 +237,13 @@ def OnSelectTool(self, event):
         if tool == self.toolId['2d']:
             self.ExitToolbars()
             self.Enable2D(True)
+            self.parent.MapWindow.SetFocus()
 
         elif tool == self.toolId['3d'] and \
                 not (self.parent.MapWindow3D and self.parent.IsPaneShown('3d')):
             self.ExitToolbars()
-            self.parent.AddNviz()
+            self.parent.AddToolbar("nviz")
+            self.parent.MapWindow.SetFocus()
 
         elif tool == self.toolId['vdigit'] and \
                 not self.parent.GetToolbar('vdigit'):
@@ -251,7 +253,8 @@ def OnSelectTool(self, event):
 
         elif tool == self.toolId['rdigit']:
             self.ExitToolbars()
-            self.parent.AddRDigit()
+            self.parent.AddToolbar("rdigit")
+            self.parent.MapWindow.SetFocus()
 
     def OnAnalyze(self, event):
         """Analysis tools menu