main.h (pymol-v1.8.6.0.tar.bz2) | : | main.h (pymol-v2.1.0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 22 | skipping to change at line 22 | |||
-* | -* | |||
-* | -* | |||
-* | -* | |||
Z* ------------------------------------------------------------------- | Z* ------------------------------------------------------------------- | |||
*/ | */ | |||
#ifndef _H_main | #ifndef _H_main | |||
#define _H_main | #define _H_main | |||
int MainSavingUnderWhileIdle(void); | int MainSavingUnderWhileIdle(void); | |||
#ifdef _PYMOL_NO_MAIN | ||||
/* BEGIN PROPRIETARY CODE SEGMENT (see disclaimer in "os_proprietary.h") */ | ||||
#ifdef _MACPYMOL_XCODE | ||||
#include"os_python.h" | #include"os_python.h" | |||
#include"PyMOLGlobals.h" | #include"PyMOLGlobals.h" | |||
PyObject *MainAsPyList(void); | ||||
#endif | ||||
/* END PROPRIETARY CODE SEGMENT */ | ||||
#else | PyObject *MainAsPyList(void); | |||
int MainFromPyList(PyObject * list); | ||||
#include"os_python.h" | #ifndef _PYMOL_NO_MAIN | |||
#include"PyMOLGlobals.h" | ||||
void MainFree(void); | void MainFree(void); | |||
void MainDoReshape(int width, int height); | void MainDoReshape(int width, int height); | |||
void MainRefreshNow(void); | void MainRefreshNow(void); | |||
void MainFlush(void); | void MainFlush(void); | |||
void MainFlushAsync(void); | void MainFlushAsync(void); | |||
int MainSavingUnderWhileIdle(void); | int MainSavingUnderWhileIdle(void); | |||
int MainFromPyList(PyObject * list); | ||||
PyObject *MainAsPyList(void); | ||||
void MainSetWindowVisibility(int mode); | void MainSetWindowVisibility(int mode); | |||
void MainMaximizeWindow(PyMOLGlobals * G); | void MainMaximizeWindow(PyMOLGlobals * G); | |||
void MainSetWindowSize(PyMOLGlobals * G, int w, int h); | void MainSetWindowSize(PyMOLGlobals * G, int w, int h); | |||
void MainSetWindowPosition(PyMOLGlobals * G, int x, int y); | void MainSetWindowPosition(PyMOLGlobals * G, int x, int y); | |||
void MainCheckWindowFit(PyMOLGlobals * G); | void MainCheckWindowFit(PyMOLGlobals * G); | |||
#endif | #endif | |||
/* BEGIN PROPRIETARY CODE SEGMENT (see disclaimer in "os_proprietary.h") */ | /* BEGIN PROPRIETARY CODE SEGMENT (see disclaimer in "os_proprietary.h") */ | |||
#ifdef _MACPYMOL_XCODE | #ifdef _MACPYMOL_XCODE | |||
End of changes. 5 change blocks. | ||||
14 lines changed or deleted | 3 lines changed or added |