Merge branch 'master' into merge-master-to-epd8

.gitignore

@@ -1,7 +1,10 @@
 # file types to ignore
 *.pyc
+*.pyd
 *.so
+*.enamlc
 *~
+.DS_Store
 
 # ignore the build directories
 *.egg-info/

docs/source/traitsui_user_manual/advanced_view.rst

@@ -412,6 +412,12 @@ For example::
 
     Item('object.axle.chassis.serial_number')
 
+where `"object"` is the literal name which refers to the top-level object being
+viewed. (Note that `"object"` is **not** some user-defined attribute name like
+`"axle"` in this example.) More precisely, `"object"` is the default name, in
+the view's `context` dictionary, of this top-level viewed object
+(see :ref:`advanced-view-concepts`).
+
 Because an Item can refer only to a single trait, do not use extended trait
 references that refer to multiple traits, since the behavior of such references
 is not defined. Also, avoid extended trait references where one of the

traitsui/qt4/list_str_editor.py

@@ -139,9 +139,6 @@ def init ( self, parent ):
         signal = QtCore.SIGNAL('activated(QModelIndex)')
         QtCore.QObject.connect(self.list_view, signal, self._on_activate)
 
-        signal = QtCore.SIGNAL('customContextMenuRequested(QPoint)')
-        QtCore.QObject.connect(self.list_view, signal, self._on_context_menu)
-
         # Initialize the editor title:
         self.title = factory.title
         self.sync_value(factory.title_name, 'title', 'from')

traitsui/qt4/tree_editor.py

@@ -1721,24 +1721,21 @@ def startDrag(self, actions):
         # Render the item being dragged as a pixmap.
         nid_rect = self.visualItemRect(nid)
         rect = nid_rect.intersected(self.viewport().rect())
-
         pm = QtGui.QPixmap(rect.size())
         pm.fill(self.palette().base().color())
-
         painter = QtGui.QPainter(pm)
 
         option = self.viewOptions()
         option.state |= QtGui.QStyle.State_Selected
         option.rect = QtCore.QRect(nid_rect.topLeft() - rect.topLeft(), nid_rect.size())
-
         self.itemDelegate().paint(painter, option, self.indexFromItem(nid))
 
         painter.end()
 
         # Calculate the hotspot so that the pixmap appears on top of the
         # original item.
         rect.adjust(self.horizontalOffset(), self.verticalOffset(), 0, 0)
-        hspos = self.mapFromGlobal(QtGui.QCursor.pos()) - rect.topLeft()
+        hspos = self.mapFromGlobal(QtGui.QCursor.pos()) - nid_rect.topLeft()
 
         # Start the drag.
         drag = QtGui.QDrag(self)