[Python-checkins] python/dist/src/Mac/Modules/scrap _Scrapmodule.c, 1.8, 1.9

[jackjansen at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Mac/Modules/scrap
In directory sc8-pr-cvs1:/tmp/cvs-serv7692/Mac/Modules/scrap

Modified Files:
	_Scrapmodule.c 
Log Message:
Got rid of macglue.h, replacing it by pymactoolbox.h where relevant.
Cleaned up various things in the toolbox modules.


Index: _Scrapmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/scrap/_Scrapmodule.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** _Scrapmodule.c	19 Nov 2003 16:13:34 -0000	1.8
--- _Scrapmodule.c	20 Nov 2003 13:30:59 -0000	1.9
***************
*** 6,24 ****
  
  
- #ifndef PyDoc_STR
- #define PyDoc_STR(x) (x)
- #endif
- #ifdef _WIN32
- #include "pywintoolbox.h"
- #else
- #include "macglue.h"
  #include "pymactoolbox.h"
- #endif
  
  /* Macro to test whether a weak-loaded CFM function exists */
  #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL )  {\
!     	PyErr_SetString(PyExc_NotImplementedError, \
!     	"Not available in this shared library/OS version"); \
!     	return NULL; \
      }} while(0)
  
--- 6,16 ----
  
  
  #include "pymactoolbox.h"
  
  /* Macro to test whether a weak-loaded CFM function exists */
  #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL )  {\
!         PyErr_SetString(PyExc_NotImplementedError, \
!         "Not available in this shared library/OS version"); \
!         return NULL; \
      }} while(0)
  
***************
*** 32,36 ****
  PyTypeObject Scrap_Type;
  
! #define ScrapObj_Check(x) ((x)->ob_type == &Scrap_Type)
  
  typedef struct ScrapObject {
--- 24,28 ----
  PyTypeObject Scrap_Type;
  
! #define ScrapObj_Check(x) ((x)->ob_type == &Scrap_Type || PyObject_TypeCheck((x), &Scrap_Type))
  
  typedef struct ScrapObject {
***************
*** 61,65 ****
  {
  	/* Cleanup of self->ob_itself goes here */
! 	PyObject_DEL(self);
  }
  
--- 53,57 ----
  {
  	/* Cleanup of self->ob_itself goes here */
! 	self->ob_type->tp_free((PyObject *)self);
  }
  
***************
*** 209,223 ****
  static PyMethodDef ScrapObj_methods[] = {
  	{"GetScrapFlavorFlags", (PyCFunction)ScrapObj_GetScrapFlavorFlags, 1,
! 	 "(ScrapFlavorType flavorType) -> (ScrapFlavorFlags flavorFlags)"},
  	{"GetScrapFlavorSize", (PyCFunction)ScrapObj_GetScrapFlavorSize, 1,
! 	 "(ScrapFlavorType flavorType) -> (Size byteCount)"},
  	{"GetScrapFlavorData", (PyCFunction)ScrapObj_GetScrapFlavorData, 1,
! 	 "(ScrapFlavorType flavorType) -> string"},
  	{"PutScrapFlavor", (PyCFunction)ScrapObj_PutScrapFlavor, 1,
! 	 "(ScrapFlavorType flavorType, ScrapFlavorFlags flavorFlags, Buffer flavorData) -> None"},
  	{"GetScrapFlavorCount", (PyCFunction)ScrapObj_GetScrapFlavorCount, 1,
! 	 "() -> (UInt32 infoCount)"},
  	{"GetScrapFlavorInfoList", (PyCFunction)ScrapObj_GetScrapFlavorInfoList, 1,
! 	 "() -> ([(ScrapFlavorType, ScrapFlavorInfo), ...])"},
  	{NULL, NULL, 0}
  };
--- 201,215 ----
  static PyMethodDef ScrapObj_methods[] = {
  	{"GetScrapFlavorFlags", (PyCFunction)ScrapObj_GetScrapFlavorFlags, 1,
! 	 PyDoc_STR("(ScrapFlavorType flavorType) -> (ScrapFlavorFlags flavorFlags)")},
  	{"GetScrapFlavorSize", (PyCFunction)ScrapObj_GetScrapFlavorSize, 1,
! 	 PyDoc_STR("(ScrapFlavorType flavorType) -> (Size byteCount)")},
  	{"GetScrapFlavorData", (PyCFunction)ScrapObj_GetScrapFlavorData, 1,
! 	 PyDoc_STR("(ScrapFlavorType flavorType, Buffer destination) -> (Size byteCount)")},
  	{"PutScrapFlavor", (PyCFunction)ScrapObj_PutScrapFlavor, 1,
! 	 PyDoc_STR("(ScrapFlavorType flavorType, ScrapFlavorFlags flavorFlags, Size flavorSize, Buffer flavorData) -> None")},
  	{"GetScrapFlavorCount", (PyCFunction)ScrapObj_GetScrapFlavorCount, 1,
! 	 PyDoc_STR("() -> (UInt32 infoCount)")},
  	{"GetScrapFlavorInfoList", (PyCFunction)ScrapObj_GetScrapFlavorInfoList, 1,
! 	 PyDoc_STR("() -> ([(ScrapFlavorType, ScrapFlavorInfo), ...])")},
  	{NULL, NULL, 0}
  };
***************
*** 327,339 ****
  static PyMethodDef Scrap_methods[] = {
  	{"LoadScrap", (PyCFunction)Scrap_LoadScrap, 1,
! 	 "() -> None"},
  	{"UnloadScrap", (PyCFunction)Scrap_UnloadScrap, 1,
! 	 "() -> None"},
  	{"GetCurrentScrap", (PyCFunction)Scrap_GetCurrentScrap, 1,
! 	 "() -> (ScrapRef scrap)"},
  	{"ClearCurrentScrap", (PyCFunction)Scrap_ClearCurrentScrap, 1,
! 	 "() -> None"},
  	{"CallInScrapPromises", (PyCFunction)Scrap_CallInScrapPromises, 1,
! 	 "() -> None"},
  	{NULL, NULL, 0}
  };
--- 319,331 ----
  static PyMethodDef Scrap_methods[] = {
  	{"LoadScrap", (PyCFunction)Scrap_LoadScrap, 1,
! 	 PyDoc_STR("() -> None")},
  	{"UnloadScrap", (PyCFunction)Scrap_UnloadScrap, 1,
! 	 PyDoc_STR("() -> None")},
  	{"GetCurrentScrap", (PyCFunction)Scrap_GetCurrentScrap, 1,
! 	 PyDoc_STR("() -> (ScrapRef scrap)")},
  	{"ClearCurrentScrap", (PyCFunction)Scrap_ClearCurrentScrap, 1,
! 	 PyDoc_STR("() -> None")},
  	{"CallInScrapPromises", (PyCFunction)Scrap_CallInScrapPromises, 1,
! 	 PyDoc_STR("() -> None")},
  	{NULL, NULL, 0}
  };