[Python-checkins] python/dist/src/Mac/Modules/win _Winmodule.c,1.13,1.14 winedit.py,1.9,1.10 winscan.py,1.23,1.24

[jackjansen@users.sourceforge.net]

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

Modified Files:
	_Winmodule.c winedit.py winscan.py 
Log Message:
Getting rid of pre-Carbon (MacOS8) support. All code depending on
TARGET_API_MAC_OS8 (or !TARGET_API_MAC_CARBON) is gone. Also some
TARGET_API_MAC_OSX conditional code is gone, because it is no longer
used on OSX-only Python (only in MacPython-OS9).


Index: _Winmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/win/_Winmodule.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** _Winmodule.c	3 Dec 2002 23:40:22 -0000	1.13
--- _Winmodule.c	12 Dec 2002 10:31:53 -0000	1.14
***************
*** 159,164 ****
  }
  
- #if !TARGET_API_MAC_OS8
- 
  static PyObject *WinObj_GetWindowRetainCount(WindowObject *_self, PyObject *_args)
  {
--- 159,162 ----
***************
*** 175,181 ****
  	return _res;
[...1056 lines suppressed...]
  	{"CollapseAllWindows", (PyCFunction)Win_CollapseAllWindows, 1,
  	 PyDoc_STR("(Boolean collapse) -> None")},
- 
- #if !TARGET_API_MAC_OS8
  	{"GetAvailableWindowPositioningBounds", (PyCFunction)Win_GetAvailableWindowPositioningBounds, 1,
  	 PyDoc_STR("(GDHandle inDevice) -> (Rect availableRect)")},
- #endif
- 
- #if !TARGET_API_MAC_OS8
  	{"DisableScreenUpdates", (PyCFunction)Win_DisableScreenUpdates, 1,
  	 PyDoc_STR("() -> None")},
- #endif
- 
- #if !TARGET_API_MAC_OS8
  	{"EnableScreenUpdates", (PyCFunction)Win_EnableScreenUpdates, 1,
  	 PyDoc_STR("() -> None")},
- #endif
  	{"PinRect", (PyCFunction)Win_PinRect, 1,
  	 PyDoc_STR("(Rect theRect, Point thePt) -> (long _rv)")},
--- 3164,3181 ----

Index: winedit.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/win/winedit.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** winedit.py	9 Jan 2001 22:09:31 -0000	1.9
--- winedit.py	12 Dec 2002 10:31:53 -0000	1.10
***************
*** 7,16 ****
  methods.append(f)
  
- f = Method(Boolean, 'GetWindowZoomFlag',
-     (WindowRef, 'theWindow', InMode),
-     condition='#if !TARGET_API_MAC_CARBON'
- )
- methods.append(f)
- 
  f = Method(void, 'GetWindowStructureRgn',
  	(WindowRef, 'theWindow', InMode),
--- 7,10 ----
***************
*** 31,50 ****
  methods.append(f)
  
- f = Method(short, 'GetWindowTitleWidth',
-     (WindowRef, 'theWindow', InMode),
-     condition='#if !TARGET_API_MAC_CARBON'
- )
- methods.append(f)
- 
  f = Method(ExistingWindowPtr, 'GetNextWindow',
  	(WindowRef, 'theWindow', InMode),
- )
- methods.append(f)
- 
- # These have Mac prefixed to their name in the 3.1 universal headers,
- # so we add the old/real names by hand.
- f = Method(void, 'CloseWindow',
-     (WindowPtr, 'theWindow', InMode),
-     condition='#if !TARGET_API_MAC_CARBON'
  )
  methods.append(f)
--- 25,30 ----

Index: winscan.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/win/winscan.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** winscan.py	15 Aug 2002 21:48:16 -0000	1.23
--- winscan.py	12 Dec 2002 10:31:53 -0000	1.24
***************
*** 50,109 ****
  			'kMouseUpOutOfSlop',
  			'kAllWindowClasses',
  			]
  			
  	def makegreylist(self):
  		return [
- 			('#if !TARGET_API_MAC_CARBON', [
- 				'GetAuxWin',
- 				'GetWindowDataHandle',
- 				'SaveOld',
- 				'DrawNew',
- 				'SetWinColor',
- 				'SetDeskCPat',
- 				'InitWindows',
- 				'InitFloatingWindows',
- 				'GetWMgrPort',
- 				'GetCWMgrPort',
- 				'ValidRgn',		# Use versions with Window in their name
- 				'ValidRect',
- 				'InvalRgn',
- 				'InvalRect',
- 				'IsValidWindowPtr', # I think this is useless for Python, but not sure...
- 				'GetWindowZoomFlag',	# Not available in Carbon
- 				'GetWindowTitleWidth',	# Ditto
- 				'GetWindowGoAwayFlag',
- 				'GetWindowSpareFlag',
- 			]),
- 			('#if !TARGET_API_MAC_OS8', [
- 				'IsWindowUpdatePending',
- 				'FindWindowOfClass',
- 				'GetFrontWindowOfClass',
- 				'ChangeWindowPropertyAttributes',
- 				'GetWindowPropertyAttributes',
- 				'GetNextWindowOfClass',
- 				'ScrollWindowRegion',
- 				'ScrollWindowRect',
- 				'ChangeWindowAttributes',
- 				'ReshapeCustomWindow',
- 				'EnableScreenUpdates',
- 				'DisableScreenUpdates',
- 				'GetAvailableWindowPositioningBounds',
- 				'CreateStandardWindowMenu',
- 				'GetSheetWindowParent',
- 				'HideSheetWindow',
- 				'ShowSheetWindow',
- 				'ConstrainWindowToScreen',
- 				'GetWindowGreatestAreaDevice',
- 				'CopyWindowTitleAsCFString',
- 				'SetWindowTitleWithCFString',
- 				'CopyWindowAlternateTitle',
- 				'SetWindowAlternateTitle',
- 				'GetWindowModality',
- 				'SetWindowModality',
- 				'SetWindowClass',
- 				'ReleaseWindow',
- 				'RetainWindow',
- 				'GetWindowRetainCount',
- 			]),
  			('#if TARGET_API_MAC_OSX', [
  				'TransitionWindowAndParent',
--- 50,77 ----
  			'kMouseUpOutOfSlop',
  			'kAllWindowClasses',
+ 			# OS8 only:
+ 			'GetAuxWin',
+ 			'GetWindowDataHandle',
+ 			'SaveOld',
+ 			'DrawNew',
+ 			'SetWinColor',
+ 			'SetDeskCPat',
+ 			'InitWindows',
+ 			'InitFloatingWindows',
+ 			'GetWMgrPort',
+ 			'GetCWMgrPort',
+ 			'ValidRgn',		# Use versions with Window in their name
+ 			'ValidRect',
+ 			'InvalRgn',
+ 			'InvalRect',
+ 			'IsValidWindowPtr', # I think this is useless for Python, but not sure...
+ 			'GetWindowZoomFlag',	# Not available in Carbon
+ 			'GetWindowTitleWidth',	# Ditto
+ 			'GetWindowGoAwayFlag',
+ 			'GetWindowSpareFlag',
  			]
  			
  	def makegreylist(self):
  		return [
  			('#if TARGET_API_MAC_OSX', [
  				'TransitionWindowAndParent',