# HG changeset patch
# User Rik <rik@octave.org>
# Date 1461596856 25200
# Node ID 7bdfa98a98a30c5d71a3f74f057f091586f9b4b8
# Parent  da9c75ffd1a357c7723c8a892f6ee60f3b7195ff# Parent  9191c24fb329186585e30272ccc302a084c02c1a
maint: Periodic merge of stable to default.

diff -r da9c75ffd1a3 -r 7bdfa98a98a3 libgui/graphics/Canvas.cc
--- a/libgui/graphics/Canvas.cc	Sun Apr 24 23:15:57 2016 +1000
+++ b/libgui/graphics/Canvas.cc	Mon Apr 25 08:07:36 2016 -0700
@@ -599,7 +599,9 @@
 
       if (axesObj)
         {
-          if (axesObj.get_properties ().handlevisibility_is ("on"))
+              if (axesObj.get_properties ().handlevisibility_is ("on")
+                  && axesObj.get_properties ().get_tag () != "legend"
+                  && axesObj.get_properties ().get_tag () != "colorbar")
             Utils::properties<figure> (figObj)
               .set_currentaxes (axesObj.get_handle ().as_octave_value ());
           if (! currentObj)
diff -r da9c75ffd1a3 -r 7bdfa98a98a3 libinterp/dldfcn/__init_fltk__.cc
--- a/libinterp/dldfcn/__init_fltk__.cc	Sun Apr 24 23:15:57 2016 +1000
+++ b/libinterp/dldfcn/__init_fltk__.cc	Mon Apr 25 08:07:36 2016 -0700
@@ -1085,7 +1085,9 @@
   void set_on_ax_obj (const std::string& name, const std::string& value)
   {
     // ax_obj is the last clicked axes object
-    if (ax_obj && ax_obj.isa ("axes"))
+    if (ax_obj && ax_obj.isa ("axes")
+        && ax_obj.get_properties ().get_tag () != "legend"
+        && ax_obj.get_properties ().get_tag () != "colorbar")
       {
         axes::properties& ap =
           dynamic_cast<axes::properties&>(ax_obj.get_properties ());
@@ -1265,7 +1267,8 @@
         pos(1,2) = tmp(2);
 
         ap.set_currentpoint (pos);
-        fp.set_currentaxes (ap.get___myhandle__ ().value ());
+        if (ap.get_tag () != "legend" && ap.get_tag () != "colorbar")
+          fp.set_currentaxes (ap.get___myhandle__ ().value ());
       }
   }