PyMOLGlobals.h (pymol-v1.8.6.0.tar.bz2) | : | PyMOLGlobals.h (pymol-v2.1.0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 20 | skipping to change at line 20 | |||
H* ------------------------------------------------------------------- | H* ------------------------------------------------------------------- | |||
I* Additional authors of this source file include: | I* Additional authors of this source file include: | |||
-* | -* | |||
-* | -* | |||
-* | -* | |||
Z* ------------------------------------------------------------------- | Z* ------------------------------------------------------------------- | |||
*/ | */ | |||
#ifndef _H_PyMOLGlobals | #ifndef _H_PyMOLGlobals | |||
#define _H_PyMOLGlobals | #define _H_PyMOLGlobals | |||
/* retina scale factor for ortho gui */ | ||||
extern int _gScaleFactor; | ||||
inline int DIP2PIXEL(int v) { return v * _gScaleFactor; } | ||||
inline float DIP2PIXEL(float v) { return v * _gScaleFactor; } | ||||
/* all of the private singleton classes associated with a PyMOL instance */ | /* all of the private singleton classes associated with a PyMOL instance */ | |||
/* this gets included in virtually every PyMOL source file, so keep it | /* this gets included in virtually every PyMOL source file, so keep it | |||
short and sweet */ | short and sweet */ | |||
typedef int lexidx_t; | typedef int lexidx_t; | |||
typedef struct _CMemoryCache CMemoryCache; | typedef struct _CMemoryCache CMemoryCache; | |||
typedef struct _CIsosurf CIsosurf; | typedef struct _CIsosurf CIsosurf; | |||
typedef struct _CTetsurf CTetsurf; | typedef struct _CTetsurf CTetsurf; | |||
skipping to change at line 59 | skipping to change at line 64 | |||
typedef struct _CSculptCache CSculptCache; | typedef struct _CSculptCache CSculptCache; | |||
typedef struct _CVFont CVFont; | typedef struct _CVFont CVFont; | |||
typedef struct _CEditor CEditor; | typedef struct _CEditor CEditor; | |||
typedef struct _CExecutive CExecutive; | typedef struct _CExecutive CExecutive; | |||
typedef struct _CSeeker CSeeker; | typedef struct _CSeeker CSeeker; | |||
struct CSelector; | struct CSelector; | |||
typedef struct _CTexture CTexture; | typedef struct _CTexture CTexture; | |||
typedef struct _CType CType; | typedef struct _CType CType; | |||
typedef struct _CMain CMain; | typedef struct _CMain CMain; | |||
typedef struct _CPlugIOManager CPlugIOManager; | typedef struct _CPlugIOManager CPlugIOManager; | |||
typedef struct _CShaderMgr CShaderMgr; | ||||
class CShaderMgr; | ||||
class CMovieScenes; | class CMovieScenes; | |||
#ifndef _PYMOL_NOPY | #ifndef _PYMOL_NOPY | |||
typedef struct _CP_inst CP_inst; | typedef struct _CP_inst CP_inst; | |||
#endif | #endif | |||
#ifndef OVLexicon_DEFINED | #ifndef OVLexicon_DEFINED | |||
typedef struct _OVLexicon OVLexicon; | typedef struct _OVLexicon OVLexicon; | |||
#define OVLexicon_DEFINED | #define OVLexicon_DEFINED | |||
#endif | #endif | |||
skipping to change at line 98 | skipping to change at line 103 | |||
typedef struct _CObject CObject; | typedef struct _CObject CObject; | |||
#define CObject_DEFINED | #define CObject_DEFINED | |||
#endif | #endif | |||
#ifndef CPyMOL_DEFINED | #ifndef CPyMOL_DEFINED | |||
typedef struct _CPyMOL CPyMOL; | typedef struct _CPyMOL CPyMOL; | |||
#define CPyMOL_DEFINED | #define CPyMOL_DEFINED | |||
#endif | #endif | |||
#ifndef CGO_DEFINED | #ifndef CGO_DEFINED | |||
typedef struct _CGO CGO; | class CGO; | |||
#define CGO_DEFINED | #define CGO_DEFINED | |||
#endif | #endif | |||
#define cPyMOLGlobals_LaunchStatus_StereoFailed 0x1 | #define cPyMOLGlobals_LaunchStatus_StereoFailed 0x1 | |||
#define cPyMOLGlobals_LaunchStatus_MultisampleFailed 0x2 | #define cPyMOLGlobals_LaunchStatus_MultisampleFailed 0x2 | |||
typedef struct _PyMOLGlobals PyMOLGlobals; | typedef struct _PyMOLGlobals PyMOLGlobals; | |||
struct _PyMOLGlobals { | struct _PyMOLGlobals { | |||
/* singleton objects */ | /* singleton objects */ | |||
End of changes. 4 change blocks. | ||||
2 lines changed or deleted | 7 lines changed or added |