[Python-checkins] CVS: python/dist/src/Mac/Modules/evt Evtmodule.c,1.18,1.19

Jack Jansen jackjansen@users.sourceforge.net
Tue, 22 May 2001 14:52:15 -0700


Update of /cvsroot/python/python/dist/src/Mac/Modules/evt
In directory usw-pr-cvs1:/tmp/cvs-serv14080/Python/Mac/Modules/evt

Modified Files:
	Evtmodule.c 
Log Message:
Lots more Carbon/Carbon.h includes, new UPP routine names, function prototypes. Most toolbox modules now compile, link and import in MacOSX-MachO python.

Index: Evtmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/evt/Evtmodule.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** Evtmodule.c	2000/12/10 23:43:39	1.18
--- Evtmodule.c	2001/05/22 21:52:13	1.19
***************
*** 9,19 ****
  #include "pymactoolbox.h"
  
  #include <Events.h>
  
  static PyObject *Evt_Error;
  
! static PyObject *Evt_GetMouse(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
  {
  	PyObject *_res = NULL;
--- 9,22 ----
  #include "pymactoolbox.h"
  
+ #ifdef WITHOUT_FRAMEWORKS
  #include <Events.h>
+ #else
+ #include <Carbon/Carbon.h>
+ #endif
+ 
  
  static PyObject *Evt_Error;
  
! static PyObject *Evt_GetMouse(PyObject *_self, PyObject *_args)
  {
  	PyObject *_res = NULL;
***************
*** 27,33 ****
  }
  
! static PyObject *Evt_Button(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
  {
  	PyObject *_res = NULL;
--- 30,34 ----
  }
  
! static PyObject *Evt_Button(PyObject *_self, PyObject *_args)
  {
  	PyObject *_res = NULL;
***************
*** 41,47 ****
  }
  
! static PyObject *Evt_StillDown(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
  {
  	PyObject *_res = NULL;
--- 42,46 ----
  }
  
! static PyObject *Evt_StillDown(PyObject *_self, PyObject *_args)
  {
  	PyObject *_res = NULL;
***************
*** 55,61 ****
  }
  
! static PyObject *Evt_WaitMouseUp(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
  {
  	PyObject *_res = NULL;
--- 54,58 ----
  }
  
! static PyObject *Evt_WaitMouseUp(PyObject *_self, PyObject *_args)
  {
  	PyObject *_res = NULL;
***************
*** 69,75 ****
  }
  
! static PyObject *Evt_TickCount(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
  {
  	PyObject *_res = NULL;
--- 66,70 ----
  }
  
! static PyObject *Evt_TickCount(PyObject *_self, PyObject *_args)
  {
  	PyObject *_res = NULL;
***************
*** 83,89 ****
  }
  
! static PyObject *Evt_GetCaretTime(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
  {
  	PyObject *_res = NULL;
--- 78,82 ----
  }
  
! static PyObject *Evt_GetCaretTime(PyObject *_self, PyObject *_args)
  {
  	PyObject *_res = NULL;
***************
*** 97,103 ****
  }
  
! static PyObject *Evt_GetKeys(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
  {
  	PyObject *_res = NULL;
--- 90,94 ----
  }
  
! static PyObject *Evt_GetKeys(PyObject *_self, PyObject *_args)
  {
  	PyObject *_res = NULL;
***************
*** 112,118 ****
  }
  
! static PyObject *Evt_GetDblTime(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
  {
  	PyObject *_res = NULL;
--- 103,107 ----
  }
  
! static PyObject *Evt_GetDblTime(PyObject *_self, PyObject *_args)
  {
  	PyObject *_res = NULL;
***************
*** 126,132 ****
  }
  
! static PyObject *Evt_SetEventMask(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
  {
  	PyObject *_res = NULL;
--- 115,119 ----
  }
  
! static PyObject *Evt_SetEventMask(PyObject *_self, PyObject *_args)
  {
  	PyObject *_res = NULL;
***************
*** 141,147 ****
  }
  
! static PyObject *Evt_GetNextEvent(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
  {
  	PyObject *_res = NULL;
--- 128,132 ----
  }
  
! static PyObject *Evt_GetNextEvent(PyObject *_self, PyObject *_args)
  {
  	PyObject *_res = NULL;
***************
*** 160,166 ****
  }
  
! static PyObject *Evt_EventAvail(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
  {
  	PyObject *_res = NULL;
--- 145,149 ----
  }
  
! static PyObject *Evt_EventAvail(PyObject *_self, PyObject *_args)
  {
  	PyObject *_res = NULL;
***************
*** 179,185 ****
  }
  
! static PyObject *Evt_PostEvent(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
  {
  	PyObject *_res = NULL;
--- 162,166 ----
  }
  
! static PyObject *Evt_PostEvent(PyObject *_self, PyObject *_args)
  {
  	PyObject *_res = NULL;
***************
*** 201,207 ****
  #if !TARGET_API_MAC_CARBON
  
! static PyObject *Evt_OSEventAvail(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
  {
  	PyObject *_res = NULL;
--- 182,186 ----
  #if !TARGET_API_MAC_CARBON
  
! static PyObject *Evt_OSEventAvail(PyObject *_self, PyObject *_args)
  {
  	PyObject *_res = NULL;
***************
*** 223,229 ****
  #if !TARGET_API_MAC_CARBON
  
! static PyObject *Evt_GetOSEvent(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
  {
  	PyObject *_res = NULL;
--- 202,206 ----
  #if !TARGET_API_MAC_CARBON
  
! static PyObject *Evt_GetOSEvent(PyObject *_self, PyObject *_args)
  {
  	PyObject *_res = NULL;
***************
*** 243,249 ****
  #endif
  
! static PyObject *Evt_FlushEvents(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
  {
  	PyObject *_res = NULL;
--- 220,224 ----
  #endif
  
! static PyObject *Evt_FlushEvents(PyObject *_self, PyObject *_args)
  {
  	PyObject *_res = NULL;
***************
*** 263,269 ****
  #if !TARGET_API_MAC_CARBON
  
! static PyObject *Evt_SystemClick(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
  {
  	PyObject *_res = NULL;
--- 238,242 ----
  #if !TARGET_API_MAC_CARBON
  
! static PyObject *Evt_SystemClick(PyObject *_self, PyObject *_args)
  {
  	PyObject *_res = NULL;
***************
*** 284,290 ****
  #if !TARGET_API_MAC_CARBON
  
! static PyObject *Evt_SystemTask(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
  {
  	PyObject *_res = NULL;
--- 257,261 ----
  #if !TARGET_API_MAC_CARBON
  
! static PyObject *Evt_SystemTask(PyObject *_self, PyObject *_args)
  {
  	PyObject *_res = NULL;
***************
*** 300,306 ****
  #if !TARGET_API_MAC_CARBON
  
! static PyObject *Evt_SystemEvent(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
  {
  	PyObject *_res = NULL;
--- 271,275 ----
  #if !TARGET_API_MAC_CARBON
  
! static PyObject *Evt_SystemEvent(PyObject *_self, PyObject *_args)
  {
  	PyObject *_res = NULL;
***************
*** 319,325 ****
  #if TARGET_API_MAC_CARBON
  
! static PyObject *Evt_GetGlobalMouse(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
  {
  	PyObject *_res = NULL;
--- 288,292 ----
  #if TARGET_API_MAC_CARBON
  
! static PyObject *Evt_GetGlobalMouse(PyObject *_self, PyObject *_args)
  {
  	PyObject *_res = NULL;
***************
*** 336,342 ****
  #if TARGET_API_MAC_CARBON
  
! static PyObject *Evt_GetCurrentKeyModifiers(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
  {
  	PyObject *_res = NULL;
--- 303,307 ----
  #if TARGET_API_MAC_CARBON
  
! static PyObject *Evt_GetCurrentKeyModifiers(PyObject *_self, PyObject *_args)
  {
  	PyObject *_res = NULL;
***************
*** 353,359 ****
  #if TARGET_API_MAC_CARBON
  
! static PyObject *Evt_CheckEventQueueForUserCancel(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
  {
  	PyObject *_res = NULL;
--- 318,322 ----
  #if TARGET_API_MAC_CARBON
  
! static PyObject *Evt_CheckEventQueueForUserCancel(PyObject *_self, PyObject *_args)
  {
  	PyObject *_res = NULL;
***************
*** 368,374 ****
  #endif
  
! static PyObject *Evt_WaitNextEvent(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
  {
  	PyObject *_res = NULL;
--- 331,335 ----
  #endif
  
! static PyObject *Evt_WaitNextEvent(PyObject *_self, PyObject *_args)
  {
  	PyObject *_res = NULL;
***************
*** 471,475 ****
  
  
! void initEvt()
  {
  	PyObject *m;
--- 432,436 ----
  
  
! void initEvt(void)
  {
  	PyObject *m;