From 7633593683fb4bef8b92534ff0ee845c0e55352a Mon Sep 17 00:00:00 2001
From: Just van Rossum <just@letterror.com>
Date: Mon, 31 Dec 2001 09:50:32 +0000
Subject: [PATCH] Oops, forgot to mark CreateScrollBarControl and
 CreateSliderControl as Carbon-only

---
 Mac/Modules/ctl/_Ctlmodule.c | 12 ++++++++++++
 Mac/Modules/ctl/ctlscan.py   |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/Mac/Modules/ctl/_Ctlmodule.c b/Mac/Modules/ctl/_Ctlmodule.c
index f379d32b978..954beea7123 100644
--- a/Mac/Modules/ctl/_Ctlmodule.c
+++ b/Mac/Modules/ctl/_Ctlmodule.c
@@ -5012,6 +5012,8 @@ static PyObject *Ctl_CreateBevelButtonControl(PyObject *_self, PyObject *_args)
 }
 #endif
 
+#if TARGET_API_MAC_CARBON
+
 static PyObject *Ctl_CreateSliderControl(PyObject *_self, PyObject *_args)
 {
 	PyObject *_res = NULL;
@@ -5057,6 +5059,7 @@ static PyObject *Ctl_CreateSliderControl(PyObject *_self, PyObject *_args)
 	setcallback(_res, kMyControlActionProcTag, liveTrackingProc, &c_callback);
 	return _res;
 }
+#endif
 
 #if TARGET_API_MAC_CARBON
 
@@ -5824,6 +5827,8 @@ static PyObject *Ctl_CreateCheckBoxControl(PyObject *_self, PyObject *_args)
 }
 #endif
 
+#if TARGET_API_MAC_CARBON
+
 static PyObject *Ctl_CreateScrollBarControl(PyObject *_self, PyObject *_args)
 {
 	PyObject *_res = NULL;
@@ -5866,6 +5871,7 @@ static PyObject *Ctl_CreateScrollBarControl(PyObject *_self, PyObject *_args)
 	setcallback(_res, kMyControlActionProcTag, liveTrackingProc, &c_callback);
 	return _res;
 }
+#endif
 
 #if TARGET_API_MAC_CARBON
 
@@ -6256,8 +6262,11 @@ static PyMethodDef Ctl_methods[] = {
 	{"CreateBevelButtonControl", (PyCFunction)Ctl_CreateBevelButtonControl, 1,
 	 "(WindowPtr window, Rect boundsRect, CFStringRef title, UInt16 thickness, UInt16 behavior, ControlButtonContentInfo info, SInt16 menuID, UInt16 menuBehavior, UInt16 menuPlacement) -> (ControlHandle outControl)"},
 #endif
+
+#if TARGET_API_MAC_CARBON
 	{"CreateSliderControl", (PyCFunction)Ctl_CreateSliderControl, 1,
 	 "(WindowPtr window, Rect boundsRect, SInt32 value, SInt32 minimum, SInt32 maximum, UInt16 orientation, UInt16 numTickMarks, Boolean liveTracking, PyObject* liveTrackingProc) -> (ControlHandle outControl)"},
+#endif
 
 #if TARGET_API_MAC_CARBON
 	{"CreateDisclosureTriangleControl", (PyCFunction)Ctl_CreateDisclosureTriangleControl, 1,
@@ -6373,8 +6382,11 @@ static PyMethodDef Ctl_methods[] = {
 	{"CreateCheckBoxControl", (PyCFunction)Ctl_CreateCheckBoxControl, 1,
 	 "(WindowPtr window, Rect boundsRect, CFStringRef title, SInt32 initialValue, Boolean autoToggle) -> (ControlHandle outControl)"},
 #endif
+
+#if TARGET_API_MAC_CARBON
 	{"CreateScrollBarControl", (PyCFunction)Ctl_CreateScrollBarControl, 1,
 	 "(WindowPtr window, Rect boundsRect, SInt32 value, SInt32 minimum, SInt32 maximum, SInt32 viewSize, Boolean liveTracking, PyObject* liveTrackingProc) -> (ControlHandle outControl)"},
+#endif
 
 #if TARGET_API_MAC_CARBON
 	{"CreatePopupButtonControl", (PyCFunction)Ctl_CreatePopupButtonControl, 1,
diff --git a/Mac/Modules/ctl/ctlscan.py b/Mac/Modules/ctl/ctlscan.py
index 2677f737b1a..0e0a80aa158 100644
--- a/Mac/Modules/ctl/ctlscan.py
+++ b/Mac/Modules/ctl/ctlscan.py
@@ -126,6 +126,8 @@ def makegreylist(self):
 				'GetControlClickActivation',
 				'HandleControlContextualMenuClick',
 				
+				"CreateScrollBarControl",
+				"CreateSliderControl",
 				"CreateBevelButtonControl",
 				"CreateImageWellControl",
 				"CreatePictureControl",