summaryrefslogtreecommitdiffstats
path: root/Mac/Modules/qt
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>2000-06-21 22:07:06 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>2000-06-21 22:07:06 (GMT)
commit8d929aee499ddc289c1af07a090fb6b885d4ae0a (patch)
tree291be3c1a3efc28930163bed90426b97b0915b8d /Mac/Modules/qt
parent349a3d3a9a4a25a217e2060bcecc10177fa549da (diff)
downloadcpython-8d929aee499ddc289c1af07a090fb6b885d4ae0a.zip
cpython-8d929aee499ddc289c1af07a090fb6b885d4ae0a.tar.gz
cpython-8d929aee499ddc289c1af07a090fb6b885d4ae0a.tar.bz2
All relevant toolbox modules have now been carbonized.
Diffstat (limited to 'Mac/Modules/qt')
-rw-r--r--Mac/Modules/qt/Qtmodule.c12
-rw-r--r--Mac/Modules/qt/qtscan.py7
2 files changed, 19 insertions, 0 deletions
diff --git a/Mac/Modules/qt/Qtmodule.c b/Mac/Modules/qt/Qtmodule.c
index a03286e..f382f9f 100644
--- a/Mac/Modules/qt/Qtmodule.c
+++ b/Mac/Modules/qt/Qtmodule.c
@@ -6235,6 +6235,8 @@ PyTypeObject Movie_Type = {
/* --------------------- End object type Movie ---------------------- */
+#ifndef TARGET_API_MAC_CARBON
+
static PyObject *Qt_CheckQuickTimeRegistration(_self, _args)
PyObject *_self;
PyObject *_args;
@@ -6252,6 +6254,7 @@ static PyObject *Qt_CheckQuickTimeRegistration(_self, _args)
_res = Py_None;
return _res;
}
+#endif
static PyObject *Qt_EnterMovies(_self, _args)
PyObject *_self;
@@ -7625,6 +7628,8 @@ static PyObject *Qt_SpriteMediaGetActionVariable(_self, _args)
return _res;
}
+#ifndef TARGET_API_MAC_CARBON
+
static PyObject *Qt_SpriteMediaGetIndImageProperty(_self, _args)
PyObject *_self;
PyObject *_args;
@@ -7649,6 +7654,7 @@ static PyObject *Qt_SpriteMediaGetIndImageProperty(_self, _args)
_rv);
return _res;
}
+#endif
static PyObject *Qt_NewTimeBase(_self, _args)
PyObject *_self;
@@ -7818,8 +7824,11 @@ static PyObject *Qt_MoviesTask(_self, _args)
}
static PyMethodDef Qt_methods[] = {
+
+#ifndef TARGET_API_MAC_CARBON
{"CheckQuickTimeRegistration", (PyCFunction)Qt_CheckQuickTimeRegistration, 1,
"(void * registrationKey, long flags) -> None"},
+#endif
{"EnterMovies", (PyCFunction)Qt_EnterMovies, 1,
"() -> None"},
{"ExitMovies", (PyCFunction)Qt_ExitMovies, 1,
@@ -7940,8 +7949,11 @@ static PyMethodDef Qt_methods[] = {
"(MediaHandler mh, QTAtomID variableID, float value) -> (ComponentResult _rv)"},
{"SpriteMediaGetActionVariable", (PyCFunction)Qt_SpriteMediaGetActionVariable, 1,
"(MediaHandler mh, QTAtomID variableID) -> (ComponentResult _rv, float value)"},
+
+#ifndef TARGET_API_MAC_CARBON
{"SpriteMediaGetIndImageProperty", (PyCFunction)Qt_SpriteMediaGetIndImageProperty, 1,
"(MediaHandler mh, short imageIndex, long imagePropertyType, void * imagePropertyValue) -> (ComponentResult _rv)"},
+#endif
{"NewTimeBase", (PyCFunction)Qt_NewTimeBase, 1,
"() -> (TimeBase _rv)"},
{"ConvertTime", (PyCFunction)Qt_ConvertTime, 1,
diff --git a/Mac/Modules/qt/qtscan.py b/Mac/Modules/qt/qtscan.py
index 5f35195..d57a32d 100644
--- a/Mac/Modules/qt/qtscan.py
+++ b/Mac/Modules/qt/qtscan.py
@@ -63,6 +63,13 @@ class MyScanner(Scanner):
## "VideoMediaGetStallCount", # Undefined in CW Pro 3 library
]
+ def makegreylist(self):
+ return [
+ ('#ifndef TARGET_API_MAC_CARBON', [
+ 'SpriteMediaGetIndImageProperty', # XXXX Why isn't this in carbon?
+ 'CheckQuickTimeRegistration',
+ ])]
+
def makeblacklisttypes(self):
return [
# I don't think we want to do these