[Python-checkins] python/dist/src/Mac/Modules/app _Appmodule.c,1.14,1.15 appscan.py,1.10,1.11

[jackjansen@users.sourceforge.net]

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

Modified Files:
	_Appmodule.c appscan.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: _Appmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/app/_Appmodule.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** _Appmodule.c	3 Dec 2002 23:40:18 -0000	1.14
--- _Appmodule.c	12 Dec 2002 10:31:50 -0000	1.15
***************
*** 925,930 ****
  }
  
- #if TARGET_API_MAC_CARBON
- 
  static PyObject *App_DrawThemeTextBox(PyObject *_self, PyObject *_args)
  {
--- 925,928 ----
***************
*** 960,966 ****
  	return _res;
  }
- #endif
- 
- #if TARGET_API_MAC_CARBON
  
  static PyObject *App_TruncateThemeText(PyObject *_self, PyObject *_args)
--- 958,961 ----
***************
*** 995,1001 ****
  	return _res;
  }
- #endif
- 
- #if TARGET_API_MAC_CARBON
  
  static PyObject *App_GetThemeTextDimensions(PyObject *_self, PyObject *_args)
--- 990,993 ----
***************
*** 1031,1037 ****
  	return _res;
  }
- #endif
- 
- #if TARGET_API_MAC_CARBON
  
  static PyObject *App_GetThemeTextShadowOutset(PyObject *_self, PyObject *_args)
--- 1023,1026 ----
***************
*** 1057,1061 ****
  	return _res;
  }
- #endif
  
  static PyObject *App_DrawThemeScrollBarArrows(PyObject *_self, PyObject *_args)
--- 1046,1049 ----
***************
*** 1659,1664 ****
  }
  
- #if TARGET_API_MAC_CARBON
- 
  static PyObject *App_GetThemeMetric(PyObject *_self, PyObject *_args)
  {
--- 1647,1650 ----
***************
*** 1680,1684 ****
  	return _res;
  }
- #endif
  
  static PyMethodDef App_methods[] = {
--- 1666,1669 ----
***************
*** 1755,1778 ****
  	{"UseThemeFont", (PyCFunction)App_UseThemeFont, 1,
  	 PyDoc_STR("(ThemeFontID inFontID, ScriptCode inScript) -> None")},
- 
- #if TARGET_API_MAC_CARBON
  	{"DrawThemeTextBox", (PyCFunction)App_DrawThemeTextBox, 1,
  	 PyDoc_STR("(CFStringRef inString, ThemeFontID inFontID, ThemeDrawState inState, Boolean inWrapToWidth, Rect inBoundingBox, SInt16 inJust) -> None")},
- #endif
- 
- #if TARGET_API_MAC_CARBON
  	{"TruncateThemeText", (PyCFunction)App_TruncateThemeText, 1,
  	 PyDoc_STR("(CFMutableStringRef inString, ThemeFontID inFontID, ThemeDrawState inState, SInt16 inPixelWidthLimit, TruncCode inTruncWhere) -> (Boolean outTruncated)")},
- #endif
- 
- #if TARGET_API_MAC_CARBON
  	{"GetThemeTextDimensions", (PyCFunction)App_GetThemeTextDimensions, 1,
  	 PyDoc_STR("(CFStringRef inString, ThemeFontID inFontID, ThemeDrawState inState, Boolean inWrapToWidth, Point ioBounds) -> (Point ioBounds, SInt16 outBaseline)")},
- #endif
- 
- #if TARGET_API_MAC_CARBON
  	{"GetThemeTextShadowOutset", (PyCFunction)App_GetThemeTextShadowOutset, 1,
  	 PyDoc_STR("(ThemeFontID inFontID, ThemeDrawState inState) -> (Rect outOutset)")},
- #endif
  	{"DrawThemeScrollBarArrows", (PyCFunction)App_DrawThemeScrollBarArrows, 1,
  	 PyDoc_STR("(Rect bounds, ThemeTrackEnableState enableState, ThemeTrackPressState pressState, Boolean isHoriz) -> (Rect trackBounds)")},
--- 1740,1751 ----
***************
*** 1823,1831 ****
  	{"GetThemeTextColor", (PyCFunction)App_GetThemeTextColor, 1,
  	 PyDoc_STR("(ThemeTextColor inColor, SInt16 inDepth, Boolean inColorDev) -> (RGBColor outColor)")},
- 
- #if TARGET_API_MAC_CARBON
  	{"GetThemeMetric", (PyCFunction)App_GetThemeMetric, 1,
  	 PyDoc_STR("(ThemeMetric inMetric) -> (SInt32 outMetric)")},
- #endif
  	{NULL, NULL, 0}
  };
--- 1796,1801 ----

Index: appscan.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/app/appscan.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** appscan.py	15 Aug 2002 21:48:12 -0000	1.10
--- appscan.py	12 Dec 2002 10:31:50 -0000	1.11
***************
*** 52,65 ****
  			]
  
- 	def makegreylist(self):
- 		return [
- 			('#if TARGET_API_MAC_CARBON', [
- 				'GetThemeMetric',
- 				'GetThemeTextShadowOutset',
- 				'GetThemeTextDimensions',
- 				'TruncateThemeText',
- 				'DrawThemeTextBox',
- 			])]
- 			
  	def makeblacklisttypes(self):
  		return [
--- 52,55 ----