"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "layer4/Menu.cpp" between
pymol-v1.8.6.0.tar.bz2 and pymol-v2.1.0.tar.bz2

About: PyMOL is a Python-enhanced molecular graphics tool. It excels at 3D visualization of proteins, small molecules, density, surfaces, and trajectories. It also includes molecular editing, ray tracing, and movies. Open Source version.

Menu.cpp  (pymol-v1.8.6.0.tar.bz2)	:	Menu.cpp  (pymol-v2.1.0.tar.bz2)
skipping to change at line 57		skipping to change at line 57
void MenuActivate3fv(PyMOLGlobals * G, int x, int y, int last_x, int last_y, int passive,		void MenuActivate3fv(PyMOLGlobals * G, int x, int y, int last_x, int last_y, int passive,
const char *name, const float *xyz)		const char *name, const float *xyz)
{		{
#ifndef _PYMOL_NOPY		#ifndef _PYMOL_NOPY
PyObject *list;		PyObject *list;
PBlock(G);		PBlock(G);
list =		list =
PYOBJECT_CALLMETHOD(P_menu, name, "O(fff)", G->P_inst->cmd, xyz[0], xyz[1],		PYOBJECT_CALLMETHOD(P_menu, name, "O(fff)(ii)", G->P_inst->cmd,
xyz[2]);		xyz[0], xyz[1], xyz[2], x, y);
if(PyErr_Occurred())		if(PyErr_Occurred())
PyErr_Print();		PyErr_Print();
if(list) {		if(list) {
PopUpNew(G, x, y, last_x, last_y, passive, list, NULL);		PopUpNew(G, x, y, last_x, last_y, passive, list, NULL);
Py_DECREF(list);		Py_DECREF(list);
}		}
PUnblock(G);		PUnblock(G);
#endif		#endif
}		}
skipping to change at line 87		skipping to change at line 88
if(PyErr_Occurred())		if(PyErr_Occurred())
PyErr_Print();		PyErr_Print();
if(list) {		if(list) {
PopUpNew(G, x, y, last_x, last_y, passive, list, NULL);		PopUpNew(G, x, y, last_x, last_y, passive, list, NULL);
Py_DECREF(list);		Py_DECREF(list);
}		}
PUnblock(G);		PUnblock(G);
#endif		#endif
}		}
void MenuActivate1Arg(PyMOLGlobals * G, int x, int y, int last_x, int last_y, in		Block *MenuActivate1Arg(PyMOLGlobals * G, int x, int y, int last_x, int last_y,
t passive,		int passive,
const char *name, const char *arg1)		const char *name, const char *arg1)
{		{
		Block *block = NULL;
#ifndef _PYMOL_NOPY		#ifndef _PYMOL_NOPY
PyObject *list;		PyObject *list;
PBlock(G);		PBlock(G);
list = PYOBJECT_CALLMETHOD(P_menu, name, "Os", G->P_inst->cmd, arg1);		list = PYOBJECT_CALLMETHOD(P_menu, name, "Os", G->P_inst->cmd, arg1);
if(PyErr_Occurred())		if(PyErr_Occurred())
PyErr_Print();		PyErr_Print();
if(list) {		if(list) {
PopUpNew(G, x, y, last_x, last_y, passive, list, NULL);		block = PopUpNew(G, x, y, last_x, last_y, passive, list, NULL);
Py_DECREF(list);		Py_DECREF(list);
}		}
PUnblock(G);		PUnblock(G);
#endif		#endif
		return block;
}		}
void MenuActivate0Arg(PyMOLGlobals * G, int x, int y, int last_x, int last_y, in t passive,		void MenuActivate0Arg(PyMOLGlobals * G, int x, int y, int last_x, int last_y, in t passive,
const char *name)		const char *name)
{		{
#ifndef _PYMOL_NOPY		#ifndef _PYMOL_NOPY
PyObject *list;		PyObject *list;
PBlock(G);		PBlock(G);
End of changes. 6 change blocks.
7 lines changed or deleted		8 lines changed or added

---