[Python-checkins] python/dist/src/Mac/Modules/ctl _Ctlmodule.c, 1.25, 1.26 ctlscan.py, 1.31, 1.32

[jackjansen at users.sourceforge.net]

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

Modified Files:
	_Ctlmodule.c ctlscan.py 
Log Message:
Getting rid of code conditional on TARGET_API_MAC_*.


Index: _Ctlmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/ctl/_Ctlmodule.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** _Ctlmodule.c	19 Nov 2003 16:13:25 -0000	1.25
--- _Ctlmodule.c	19 Nov 2003 16:34:03 -0000	1.26
***************
*** 307,312 ****
  }
  
- #if TARGET_API_MAC_OSX
- 
  static PyObject *CtlObj_IsControlEnabled(ControlObject *_self, PyObject *_args)
  {
--- 307,310 ----
***************
*** 323,329 ****
  	return _res;
  }
- #endif
- 
- #if TARGET_API_MAC_OSX
  
  static PyObject *CtlObj_EnableControl(ControlObject *_self, PyObject *_args)
--- 321,324 ----
***************
*** 342,348 ****
  	return _res;
  }
- #endif
- 
- #if TARGET_API_MAC_OSX
  
  static PyObject *CtlObj_DisableControl(ControlObject *_self, PyObject *_args)
--- 337,340 ----
***************
*** 361,365 ****
  	return _res;
  }
- #endif
  
  static PyObject *CtlObj_Draw1Control(ControlObject *_self, PyObject *_args)
--- 353,356 ----
***************
*** 2462,2467 ****
  }
  
- #if TARGET_API_MAC_OSX
- 
  static PyObject *CtlObj_CopyDataBrowserEditText(ControlObject *_self, PyObject *_args)
  {
--- 2453,2456 ----
***************
*** 2481,2485 ****
  	return _res;
  }
- #endif
  
  static PyObject *CtlObj_GetDataBrowserEditText(ControlObject *_self, PyObject *_args)
--- 2470,2473 ----
***************
*** 3509,3527 ****
  	{"SetControlVisibility", (PyCFunction)CtlObj_SetControlVisibility, 1,
  	 PyDoc_STR("(Boolean inIsVisible, Boolean inDoDraw) -> None")},
- 
- #if TARGET_API_MAC_OSX
  	{"IsControlEnabled", (PyCFunction)CtlObj_IsControlEnabled, 1,
  	 PyDoc_STR("() -> (Boolean _rv)")},
- #endif
- 
- #if TARGET_API_MAC_OSX
  	{"EnableControl", (PyCFunction)CtlObj_EnableControl, 1,
  	 PyDoc_STR("() -> None")},
- #endif
- 
- #if TARGET_API_MAC_OSX
  	{"DisableControl", (PyCFunction)CtlObj_DisableControl, 1,
  	 PyDoc_STR("() -> None")},
- #endif
  	{"Draw1Control", (PyCFunction)CtlObj_Draw1Control, 1,
  	 PyDoc_STR("() -> None")},
--- 3497,3506 ----
***************
*** 3746,3754 ****
  	{"SetDataBrowserEditText", (PyCFunction)CtlObj_SetDataBrowserEditText, 1,
  	 PyDoc_STR("(CFStringRef text) -> None")},
- 
- #if TARGET_API_MAC_OSX
  	{"CopyDataBrowserEditText", (PyCFunction)CtlObj_CopyDataBrowserEditText, 1,
  	 PyDoc_STR("() -> (CFStringRef text)")},
- #endif
  	{"GetDataBrowserEditText", (PyCFunction)CtlObj_GetDataBrowserEditText, 1,
  	 PyDoc_STR("(CFMutableStringRef text) -> None")},
--- 3725,3730 ----
***************
*** 4461,4466 ****
  }
  
- #if TARGET_API_MAC_OSX
- 
  static PyObject *Ctl_CreateRelevanceBarControl(PyObject *_self, PyObject *_args)
  {
--- 4437,4440 ----
***************
*** 4494,4498 ****
  	return _res;
  }
- #endif
  
  static PyObject *Ctl_CreateLittleArrowsControl(PyObject *_self, PyObject *_args)
--- 4468,4471 ----
***************
*** 5233,5238 ****
  }
  
- #if TARGET_API_MAC_OSX
- 
  static PyObject *Ctl_CreateDisclosureButtonControl(PyObject *_self, PyObject *_args)
  {
--- 5206,5209 ----
***************
*** 5263,5269 ****
  	return _res;
  }
- #endif
- 
- #if TARGET_API_MAC_OSX
  
  static PyObject *Ctl_CreateRoundButtonControl(PyObject *_self, PyObject *_args)
--- 5234,5237 ----
***************
*** 5295,5299 ****
  	return _res;
  }
- #endif
  
  static PyObject *Ctl_CreateDataBrowserControl(PyObject *_self, PyObject *_args)
--- 5263,5266 ----
***************
*** 5323,5328 ****
  }
  
- #if TARGET_API_MAC_OSX
- 
  static PyObject *Ctl_CreateEditUnicodeTextControl(PyObject *_self, PyObject *_args)
  {
--- 5290,5293 ----
***************
*** 5356,5360 ****
  	return _res;
  }
- #endif
  
  static PyObject *Ctl_FindControlUnderMouse(PyObject *_self, PyObject *_args)
--- 5321,5324 ----
***************
*** 5499,5507 ****
  	{"CreateProgressBarControl", (PyCFunction)Ctl_CreateProgressBarControl, 1,
  	 PyDoc_STR("(WindowPtr window, Rect boundsRect, SInt32 value, SInt32 minimum, SInt32 maximum, Boolean indeterminate) -> (ControlHandle outControl)")},
- 
- #if TARGET_API_MAC_OSX
  	{"CreateRelevanceBarControl", (PyCFunction)Ctl_CreateRelevanceBarControl, 1,
  	 PyDoc_STR("(WindowPtr window, Rect boundsRect, SInt32 value, SInt32 minimum, SInt32 maximum) -> (ControlHandle outControl)")},
- #endif
  	{"CreateLittleArrowsControl", (PyCFunction)Ctl_CreateLittleArrowsControl, 1,
  	 PyDoc_STR("(WindowPtr window, Rect boundsRect, SInt32 value, SInt32 minimum, SInt32 maximum, SInt32 increment) -> (ControlHandle outControl)")},
--- 5463,5468 ----
***************
*** 5552,5572 ****
  	{"CreateScrollingTextBoxControl", (PyCFunction)Ctl_CreateScrollingTextBoxControl, 1,
  	 PyDoc_STR("(WindowPtr window, Rect boundsRect, SInt16 contentResID, Boolean autoScroll, UInt32 delayBeforeAutoScroll, UInt32 delayBetweenAutoScroll, UInt16 autoScrollAmount) -> (ControlHandle outControl)")},
- 
- #if TARGET_API_MAC_OSX
  	{"CreateDisclosureButtonControl", (PyCFunction)Ctl_CreateDisclosureButtonControl, 1,
  	 PyDoc_STR("(WindowPtr inWindow, Rect inBoundsRect, SInt32 inValue, Boolean inAutoToggles) -> (ControlHandle outControl)")},
- #endif
- 
- #if TARGET_API_MAC_OSX
  	{"CreateRoundButtonControl", (PyCFunction)Ctl_CreateRoundButtonControl, 1,
  	 PyDoc_STR("(WindowPtr inWindow, Rect inBoundsRect, SInt16 inSize, ControlButtonContentInfo inContent) -> (ControlHandle outControl)")},
- #endif
  	{"CreateDataBrowserControl", (PyCFunction)Ctl_CreateDataBrowserControl, 1,
  	 PyDoc_STR("(WindowPtr window, Rect boundsRect, OSType style) -> (ControlHandle outControl)")},
- 
- #if TARGET_API_MAC_OSX
  	{"CreateEditUnicodeTextControl", (PyCFunction)Ctl_CreateEditUnicodeTextControl, 1,
  	 PyDoc_STR("(WindowPtr window, Rect boundsRect, CFStringRef text, Boolean isPassword, ControlFontStyleRec style) -> (ControlHandle outControl)")},
- #endif
  	{"FindControlUnderMouse", (PyCFunction)Ctl_FindControlUnderMouse, 1,
  	 PyDoc_STR("(Point inWhere, WindowPtr inWindow) -> (ControlHandle _rv, SInt16 outPart)")},
--- 5513,5524 ----

Index: ctlscan.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/ctl/ctlscan.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** ctlscan.py	12 Dec 2002 10:31:50 -0000	1.31
--- ctlscan.py	19 Nov 2003 16:34:03 -0000	1.32
***************
*** 100,117 ****
  			]
  
- 	def makegreylist(self):
- 		return [
- 			('#if TARGET_API_MAC_OSX', [
- 				'CreateRoundButtonControl',
- 				'CreateDisclosureButtonControl',
- 				'CreateRelevanceBarControl',
- 				'DisableControl',
- 				'EnableControl',
- 				'IsControlEnabled',
- 				'CreateEditUnicodeTextControl',
- 				'CopyDataBrowserEditText',
- 			]),
- 			]
- 			
  	def makeblacklisttypes(self):
  		return [
--- 100,103 ----