wxGUI: revert some recent decoration changes. Dialogs for barscale and

legend cannot be shown as modal - in the result d.barscale and
d.legend are not selectable.
	 (merge from relbr64, https://trac.osgeo.org/grass/changeset/35133)


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@35134 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/wxpython/gui_modules/gdialogs.py

@@ -354,9 +354,10 @@ class DecorationDialog(wx.Dialog):
             if mapName:
                 # enable 'OK' button
                 self.btnOK.Enable()
-                # set title
-                self.SetTitle(_('Legend of raster map <%s>') % \
-                              mapName)
+                if name == 'legend':
+                    # set title
+                    self.SetTitle(_('Legend of raster map <%s>') % \
+                                      mapName)
         
     def _CreateOverlay(self):
         if not self.parent.Map.GetOverlay(self.ovlId):

gui/wxpython/gui_modules/mapdisp.py

@@ -3889,7 +3889,9 @@ class MapFrame(wx.Frame):
                                       ctrltxt = _("scale object"))
 
         self.dialogs['barscale'].CentreOnParent()
-        self.dialogs['barscale'].ShowModal()
+        ### dialog cannot be show as modal - in the result d.barscale is not selectable
+        ### self.dialogs['barscale'].ShowModal()
+        self.dialogs['barscale'].Show()
         self.MapWindow.mouse['use'] = 'pointer'        
 
     def OnAddLegend(self, event):
@@ -3917,8 +3919,10 @@ class MapFrame(wx.Frame):
                                       checktxt = _("Show/hide legend"),
                                       ctrltxt = _("legend object")) 
 
-        self.dialogs['legend'].CentreOnParent()
-        self.dialogs['legend'].ShowModal()
+        self.dialogs['legend'].CentreOnParent() 
+        ### dialog cannot be show as modal - in the result d.legend is not selectable
+        ### self.dialogs['legend'].ShowModal()
+        self.dialogs['legend'].Show()
         self.MapWindow.mouse['use'] = 'pointer'
 
     def OnAddText(self, event):