Index: /trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc
===================================================================
--- /trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc	(revision 3477)
+++ /trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc	(revision 3478)
@@ -454,4 +454,5 @@
     TMarker *tip=new TMarker(v0.X(), v0.Y(), kDot);
     tip->SetBit(kCanDelete);
+    tip->SetBit(kCannotPick);
     tip->SetMarkerColor(kWhite+type*2);
     fMapG.Add((Long_t)tip, (Long_t)new TString(txt));
@@ -699,4 +700,24 @@
 void MAstroCatalog::EventInfo(Int_t event, Int_t px, Int_t py, TObject *selected)
 {
+    // Try to find a corresponding object with kCannotPick set and
+    // an available TString (for a tool tip)
+    if (!selected || selected==this)
+    {
+        Long_t key, val;
+        TExMapIter map(&fMapG);
+        while (map.Next(key, val))
+        {
+            if (!val)
+                continue;
+
+            TObject *o=(TObject*)key;
+            if (o->DistancetoPrimitive(px, py)>TPad::GetMaxPickDistance())
+                continue;
+
+            selected = o;
+            break;
+        }
+    }
+
     if (!selected)
         return;