[Python-checkins] CVS: python/dist/src/Mac/Modules/help _Helpmodule.c,1.3,1.3.2.1

[Jack Jansen]

Update of /cvsroot/python/python/dist/src/Mac/Modules/help
In directory usw-pr-cvs1:/tmp/cvs-serv12554/Modules/help

Modified Files:
      Tag: r22rc1-branch
	_Helpmodule.c 
Log Message:
Merged Mac subtree into the 22c1 branch.


Index: _Helpmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/help/_Helpmodule.c,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** _Helpmodule.c	2001/11/30 14:16:33	1.3
--- _Helpmodule.c	2001/12/19 15:10:15	1.3.2.1
***************
*** 6,11 ****
--- 6,15 ----
  
  
+ #ifdef _WIN32
+ #include "pywintoolbox.h"
+ #else
  #include "macglue.h"
  #include "pymactoolbox.h"
+ #endif
  
  /* Macro to test whether a weak-loaded CFM function exists */
***************
*** 25,29 ****
  	PyObject *_res = NULL;
  	OSErr _err;
! 	MenuHandle mh;
  	if (!PyArg_ParseTuple(_args, ""))
  		return NULL;
--- 29,33 ----
  	PyObject *_res = NULL;
  	OSErr _err;
! 	MenuRef mh;
  	if (!PyArg_ParseTuple(_args, ""))
  		return NULL;
***************
*** 240,244 ****
  	if (_err != noErr) return PyMac_Error(_err);
  	_res = Py_BuildValue("O&",
! 	                     WinObj_WhichWindow, window);
  	return _res;
  }
--- 244,248 ----
  	if (_err != noErr) return PyMac_Error(_err);
  	_res = Py_BuildValue("O&",
! 	                     WinObj_New, window);
  	return _res;
  }
***************
*** 246,250 ****
  static PyMethodDef Help_methods[] = {
  	{"HMGetHelpMenuHandle", (PyCFunction)Help_HMGetHelpMenuHandle, 1,
! 	 "() -> (MenuHandle mh)"},
  	{"HMRemoveBalloon", (PyCFunction)Help_HMRemoveBalloon, 1,
  	 "() -> None"},
--- 250,254 ----
  static PyMethodDef Help_methods[] = {
  	{"HMGetHelpMenuHandle", (PyCFunction)Help_HMGetHelpMenuHandle, 1,
! 	 "() -> (MenuRef mh)"},
  	{"HMRemoveBalloon", (PyCFunction)Help_HMRemoveBalloon, 1,
  	 "() -> None"},