[Python-checkins] python/dist/src/Mac/Include macglue.h,1.63,1.64

[jackjansen at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Mac/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv32109/Mac/Include

Modified Files:
	macglue.h 
Log Message:
Getting rid of code conditional on TARGET_API_MAC_*.


Index: macglue.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Include/macglue.h,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** macglue.h	12 Dec 2002 10:31:49 -0000	1.63
--- macglue.h	19 Nov 2003 16:34:04 -0000	1.64
***************
*** 24,35 ****
  #ifndef Py_MACGLUE_H
  #define Py_MACGLUE_H
- #ifdef WITHOUT_FRAMEWORKS
- #include <Types.h>
- #include <Files.h>
- #include <Events.h>
- #include <StandardFile.h>
- #else
  #include <Carbon/Carbon.h>
- #endif
  
  #include "pymactoolbox.h"
--- 24,28 ----
***************
*** 50,58 ****
  unsigned char *Pstring(char *str);		/* Convert c-string to pascal-string in static buffer */
  
- #ifdef USE_GUSI
- extern int PyMac_ConsoleIsDead;			/* True when exiting */
- extern void PyMac_StopGUSISpin(void);		/* Stop eventprocessing during exit() */
- #endif
- 
  extern short PyMac_AppRefNum;			/* RefNum of application rsrcfork (from macmain.c) */
  extern FSSpec PyMac_ApplicationFSSpec;		/* Application location (from macargv.c) */
--- 43,46 ----
***************
*** 64,81 ****
  PyObject *PyMac_GetOSErrException(void);	/* Initialize & return it */
  
- #if !TARGET_API_MAC_OSX
- void PyMac_GetSchedParams(PyMacSchedParams *);	/* Get schedulers params */
- void PyMac_SetSchedParams(PyMacSchedParams *);	/* Set schedulers params */
- int PyMac_DoYield(int, int);	/* Yield cpu. First arg is maxtime, second ok to call python */
- #endif
  int PyMac_HandleEvent(EventRecord *);	/* Handle one event, possibly in Python */
  void PyMac_HandleEventIntern(EventRecord *); /* Handle one event internal only */
  int PyMac_SetEventHandler(PyObject *);	/* set python-coded event handler */
  
- #if !TARGET_API_MAC_OSX
- void PyMac_InitMenuBar(void);			/* Setup menu bar as we want it */
- void PyMac_RestoreMenuBar(void);		/* Restore menu bar for ease of exiting */
- void PyMac_RaiseConsoleWindow();		/* Bring console window to front, if it exists */
- #endif
  int PyMac_FindResourceModule(PyStringObject *, char *, char *); /* Test for 'PYC ' resource in a file */
  PyObject * PyMac_LoadResourceModule(char *, char *); /* Load 'PYC ' resource from file */
--- 52,59 ----
***************
*** 87,94 ****
  void PyMac_Initialize(void);			/* Initialize function for embedding Python */
  
- #ifdef USE_GUSI2
- short PyMac_OpenPrefFile(void);			/* From macgetpath.c, open and return preference file */
- #endif
- 
  
  /* From macfiletype.c: */
--- 65,68 ----
***************
*** 103,132 ****
  void PyMac_OutputNotSeen(void);
  int PyMac_GetDelayConsoleFlag(void);
- #ifdef USE_MAC_APPLET_SUPPORT
- void PyMac_InitApplet(void);
- #endif
  
  /* from macgetargv: */
  OSErr PyMac_init_process_location(void);
  char *	strdup(const char *str);
- 
- #ifdef USE_GUSI2
- /* from pyGUSISIOUX.cp */
- typedef long (*PyWriteHandler)(char *buffer, long n);
- typedef long (*PyReadHandler)(char *buffer, long n);
- 
- /* Override routines that normally reads and writes to the
- ** SIOUX console window. Intended for embedding applications
- ** that want to forestall a Python console window ever showing up.
- */
- void PyMac_SetConsoleHandler(PyReadHandler stdinH, PyWriteHandler stdoutH,
- 			     PyWriteHandler stderrH);
- 
- /* Courtesy console handlers that drop all output and return
- ** 0 on reads.
- */
- long PyMac_DummyReadHandler(char *, long);
- long PyMac_DummyWriteHandler(char *, long);
- #endif /* USE_GUSI2 */
  
  #ifdef __cplusplus
--- 77,84 ----