[Python-checkins] python/dist/src/Mac/Modules/win _Winmodule.c,1.14,1.15 winsupport.py,1.33,1.34

jackjansen@users.sourceforge.net jackjansen@users.sourceforge.net
Fri, 13 Dec 2002 07:02:36 -0800


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

Modified Files:
	_Winmodule.c winsupport.py 
Log Message:
Get rid of support for Universal Headers older than 3.4 and various other
outdated things.


Index: _Winmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/win/_Winmodule.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** _Winmodule.c	12 Dec 2002 10:31:53 -0000	1.14
--- _Winmodule.c	13 Dec 2002 15:01:54 -0000	1.15
***************
*** 37,55 ****
  #endif
  
- #if !ACCESSOR_CALLS_ARE_FUNCTIONS  && UNIVERSAL_INTERFACES_VERSION < 0x340
- /* Carbon calls that we emulate in classic mode */
- #define GetWindowSpareFlag(win) (((CWindowPeek)(win))->spareFlag)
- #define GetWindowFromPort(port) ((WindowRef)(port))
- #define GetWindowPortBounds(win, rectp) (*(rectp) = ((CWindowPeek)(win))->port.portRect)
- #endif
- #if !ACCESSOR_CALLS_ARE_FUNCTIONS
- #define IsPointerValid(p) (((long)p&3) == 0)
- #endif
- #if ACCESSOR_CALLS_ARE_FUNCTIONS
  /* Classic calls that we emulate in carbon mode */
  #define GetWindowUpdateRgn(win, rgn) GetWindowRegion((win), kWindowUpdateRgn, (rgn))
  #define GetWindowStructureRgn(win, rgn) GetWindowRegion((win), kWindowStructureRgn, (rgn))
  #define GetWindowContentRgn(win, rgn) GetWindowRegion((win), kWindowContentRgn, (rgn))
- #endif
  
  /* Function to dispose a window, with a "normal" calling sequence */
--- 37,44 ----

Index: winsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/win/winsupport.py,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** winsupport.py	3 Dec 2002 23:40:22 -0000	1.33
--- winsupport.py	13 Dec 2002 15:02:00 -0000	1.34
***************
*** 75,93 ****
  #endif
  
- #if !ACCESSOR_CALLS_ARE_FUNCTIONS  && UNIVERSAL_INTERFACES_VERSION < 0x340
- /* Carbon calls that we emulate in classic mode */
- #define GetWindowSpareFlag(win) (((CWindowPeek)(win))->spareFlag)
- #define GetWindowFromPort(port) ((WindowRef)(port))
- #define GetWindowPortBounds(win, rectp) (*(rectp) = ((CWindowPeek)(win))->port.portRect)
- #endif
- #if !ACCESSOR_CALLS_ARE_FUNCTIONS
- #define IsPointerValid(p) (((long)p&3) == 0)
- #endif
- #if ACCESSOR_CALLS_ARE_FUNCTIONS
  /* Classic calls that we emulate in carbon mode */
  #define GetWindowUpdateRgn(win, rgn) GetWindowRegion((win), kWindowUpdateRgn, (rgn))
  #define GetWindowStructureRgn(win, rgn) GetWindowRegion((win), kWindowStructureRgn, (rgn))
  #define GetWindowContentRgn(win, rgn) GetWindowRegion((win), kWindowContentRgn, (rgn))
- #endif
  
  /* Function to dispose a window, with a "normal" calling sequence */
--- 75,82 ----