Various tweaks to make it everything build and compile again under carbon. Mainly greylisted functions.
diff --git a/Mac/Modules/qt/Qtmodule.c b/Mac/Modules/qt/Qtmodule.c
index 69347da..20f10cc 100644
--- a/Mac/Modules/qt/Qtmodule.c
+++ b/Mac/Modules/qt/Qtmodule.c
@@ -5733,6 +5733,8 @@
return _res;
}
+#if !TARGET_API_MAC_CARBON
+
static PyObject *MovieObj_SetMovieAnchorDataRef(_self, _args)
MovieObject *_self;
PyObject *_args;
@@ -5753,6 +5755,9 @@
_res = Py_None;
return _res;
}
+#endif
+
+#if !TARGET_API_MAC_CARBON
static PyObject *MovieObj_GetMovieAnchorDataRef(_self, _args)
MovieObject *_self;
@@ -5776,6 +5781,7 @@
outFlags);
return _res;
}
+#endif
static PyObject *MovieObj_SetMovieColorTable(_self, _args)
MovieObject *_self;
@@ -5974,6 +5980,8 @@
return _res;
}
+#if !TARGET_API_MAC_CARBON
+
static PyObject *MovieObj_GetMovieLoadState(_self, _args)
MovieObject *_self;
PyObject *_args;
@@ -5987,6 +5995,7 @@
_rv);
return _res;
}
+#endif
static PyObject *MovieObj_NewMovieController(_self, _args)
MovieObject *_self;
@@ -6287,10 +6296,16 @@
"(Handle dataRef, OSType dataRefType) -> None"},
{"GetMovieDefaultDataRef", (PyCFunction)MovieObj_GetMovieDefaultDataRef, 1,
"() -> (Handle dataRef, OSType dataRefType)"},
+
+#if !TARGET_API_MAC_CARBON
{"SetMovieAnchorDataRef", (PyCFunction)MovieObj_SetMovieAnchorDataRef, 1,
"(Handle dataRef, OSType dataRefType) -> None"},
+#endif
+
+#if !TARGET_API_MAC_CARBON
{"GetMovieAnchorDataRef", (PyCFunction)MovieObj_GetMovieAnchorDataRef, 1,
"() -> (Handle dataRef, OSType dataRefType, long outFlags)"},
+#endif
{"SetMovieColorTable", (PyCFunction)MovieObj_SetMovieColorTable, 1,
"(CTabHandle ctab) -> None"},
{"GetMovieColorTable", (PyCFunction)MovieObj_GetMovieColorTable, 1,
@@ -6309,8 +6324,11 @@
"(TimeValue time, TimeValue duration) -> (RgnHandle _rv)"},
{"GetMovieStatus", (PyCFunction)MovieObj_GetMovieStatus, 1,
"() -> (ComponentResult _rv, Track firstProblemTrack)"},
+
+#if !TARGET_API_MAC_CARBON
{"GetMovieLoadState", (PyCFunction)MovieObj_GetMovieLoadState, 1,
"() -> (long _rv)"},
+#endif
{"NewMovieController", (PyCFunction)MovieObj_NewMovieController, 1,
"(Rect movieRect, long someFlags) -> (MovieController _rv)"},
{"PutMovieOnScrap", (PyCFunction)MovieObj_PutMovieOnScrap, 1,
@@ -6510,6 +6528,8 @@
return _res;
}
+#if !TARGET_API_MAC_CARBON
+
static PyObject *Qt_OpenADataHandler(_self, _args)
PyObject *_self;
PyObject *_args;
@@ -6543,6 +6563,7 @@
CmpInstObj_New, dh);
return _res;
}
+#endif
static PyObject *Qt_PasteHandleIntoMovie(_self, _args)
PyObject *_self;
@@ -8330,6 +8351,8 @@
return _res;
}
+#if !TARGET_API_MAC_CARBON
+
static PyObject *Qt_MovieMediaGetCurrentMovieProperty(_self, _args)
PyObject *_self;
PyObject *_args;
@@ -8351,6 +8374,9 @@
_rv);
return _res;
}
+#endif
+
+#if !TARGET_API_MAC_CARBON
static PyObject *Qt_MovieMediaGetCurrentTrackProperty(_self, _args)
PyObject *_self;
@@ -8376,6 +8402,9 @@
_rv);
return _res;
}
+#endif
+
+#if !TARGET_API_MAC_CARBON
static PyObject *Qt_MovieMediaGetChildMovieDataReference(_self, _args)
PyObject *_self;
@@ -8410,6 +8439,9 @@
dataRefIndexOut);
return _res;
}
+#endif
+
+#if !TARGET_API_MAC_CARBON
static PyObject *Qt_MovieMediaSetChildMovieDataReference(_self, _args)
PyObject *_self;
@@ -8435,6 +8467,9 @@
_rv);
return _res;
}
+#endif
+
+#if !TARGET_API_MAC_CARBON
static PyObject *Qt_MovieMediaLoadChildMovieFromDataReference(_self, _args)
PyObject *_self;
@@ -8454,6 +8489,7 @@
_rv);
return _res;
}
+#endif
static PyObject *Qt_Media3DGetCurrentGroup(_self, _args)
PyObject *_self;
@@ -8678,6 +8714,8 @@
return _res;
}
+#if !TARGET_API_MAC_CARBON
+
static PyObject *Qt_Media3DGetViewObject(_self, _args)
PyObject *_self;
PyObject *_args;
@@ -8696,6 +8734,7 @@
_rv);
return _res;
}
+#endif
static PyObject *Qt_NewTimeBase(_self, _args)
PyObject *_self;
@@ -8886,8 +8925,11 @@
"(long flags) -> (Movie _rv)"},
{"GetDataHandler", (PyCFunction)Qt_GetDataHandler, 1,
"(Handle dataRef, OSType dataHandlerSubType, long flags) -> (Component _rv)"},
+
+#if !TARGET_API_MAC_CARBON
{"OpenADataHandler", (PyCFunction)Qt_OpenADataHandler, 1,
"(Handle dataRef, OSType dataHandlerSubType, Handle anchorDataRef, OSType anchorDataRefType, TimeBase tb, long flags) -> (ComponentInstance dh)"},
+#endif
{"PasteHandleIntoMovie", (PyCFunction)Qt_PasteHandleIntoMovie, 1,
"(Handle h, OSType handleType, Movie theMovie, long flags, ComponentInstance userComp) -> None"},
{"GetMovieImporterForDataRef", (PyCFunction)Qt_GetMovieImporterForDataRef, 1,
@@ -9037,16 +9079,31 @@
"(MediaHandler mh, long flashFrameNumber) -> (ComponentResult _rv, TimeValue movieTime)"},
{"FlashMediaFrameLabelToMovieTime", (PyCFunction)Qt_FlashMediaFrameLabelToMovieTime, 1,
"(MediaHandler mh, Ptr theLabel) -> (ComponentResult _rv, TimeValue movieTime)"},
+
+#if !TARGET_API_MAC_CARBON
{"MovieMediaGetCurrentMovieProperty", (PyCFunction)Qt_MovieMediaGetCurrentMovieProperty, 1,
"(MediaHandler mh, OSType whichProperty, void * value) -> (ComponentResult _rv)"},
+#endif
+
+#if !TARGET_API_MAC_CARBON
{"MovieMediaGetCurrentTrackProperty", (PyCFunction)Qt_MovieMediaGetCurrentTrackProperty, 1,
"(MediaHandler mh, long trackID, OSType whichProperty, void * value) -> (ComponentResult _rv)"},
+#endif
+
+#if !TARGET_API_MAC_CARBON
{"MovieMediaGetChildMovieDataReference", (PyCFunction)Qt_MovieMediaGetChildMovieDataReference, 1,
"(MediaHandler mh, QTAtomID dataRefID, short dataRefIndex) -> (ComponentResult _rv, OSType dataRefType, Handle dataRef, QTAtomID dataRefIDOut, short dataRefIndexOut)"},
+#endif
+
+#if !TARGET_API_MAC_CARBON
{"MovieMediaSetChildMovieDataReference", (PyCFunction)Qt_MovieMediaSetChildMovieDataReference, 1,
"(MediaHandler mh, QTAtomID dataRefID, OSType dataRefType, Handle dataRef) -> (ComponentResult _rv)"},
+#endif
+
+#if !TARGET_API_MAC_CARBON
{"MovieMediaLoadChildMovieFromDataReference", (PyCFunction)Qt_MovieMediaLoadChildMovieFromDataReference, 1,
"(MediaHandler mh, QTAtomID dataRefID) -> (ComponentResult _rv)"},
+#endif
{"Media3DGetCurrentGroup", (PyCFunction)Qt_Media3DGetCurrentGroup, 1,
"(MediaHandler mh, void * group) -> (ComponentResult _rv)"},
{"Media3DTranslateNamedObjectTo", (PyCFunction)Qt_Media3DTranslateNamedObjectTo, 1,
@@ -9067,8 +9124,11 @@
"(MediaHandler mh, void * tQ3CameraRange) -> (ComponentResult _rv)"},
{"Media3DGetCameraRange", (PyCFunction)Qt_Media3DGetCameraRange, 1,
"(MediaHandler mh, void * tQ3CameraRange) -> (ComponentResult _rv)"},
+
+#if !TARGET_API_MAC_CARBON
{"Media3DGetViewObject", (PyCFunction)Qt_Media3DGetViewObject, 1,
"(MediaHandler mh, void * tq3viewObject) -> (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 9dd120b..45ef428 100644
--- a/Mac/Modules/qt/qtscan.py
+++ b/Mac/Modules/qt/qtscan.py
@@ -68,6 +68,16 @@
('#if !TARGET_API_MAC_CARBON', [
'SpriteMediaGetIndImageProperty', # XXXX Why isn't this in carbon?
'CheckQuickTimeRegistration',
+ 'SetMovieAnchorDataRef',
+ 'GetMovieAnchorDataRef',
+ 'GetMovieLoadState',
+ 'OpenADataHandler',
+ 'MovieMediaGetCurrentMovieProperty',
+ 'MovieMediaGetCurrentTrackProperty',
+ 'MovieMediaGetChildMovieDataReference',
+ 'MovieMediaSetChildMovieDataReference',
+ 'MovieMediaLoadChildMovieFromDataReference',
+ 'Media3DGetViewObject',
])]
def makeblacklisttypes(self):
diff --git a/Mac/Modules/win/Winmodule.c b/Mac/Modules/win/Winmodule.c
index 7984293..0ff5733 100644
--- a/Mac/Modules/win/Winmodule.c
+++ b/Mac/Modules/win/Winmodule.c
@@ -1872,6 +1872,8 @@
return _res;
}
+#if !TARGET_API_MAC_CARBON
+
static PyObject *WinObj_GetWindowZoomFlag(_self, _args)
WindowObject *_self;
PyObject *_args;
@@ -1885,6 +1887,7 @@
_rv);
return _res;
}
+#endif
static PyObject *WinObj_GetWindowStructureRgn(_self, _args)
WindowObject *_self;
@@ -1934,6 +1937,8 @@
return _res;
}
+#if !TARGET_API_MAC_CARBON
+
static PyObject *WinObj_GetWindowTitleWidth(_self, _args)
WindowObject *_self;
PyObject *_args;
@@ -1947,6 +1952,7 @@
_rv);
return _res;
}
+#endif
static PyObject *WinObj_GetNextWindow(_self, _args)
WindowObject *_self;
@@ -2255,16 +2261,22 @@
"() -> (Rect bounds)"},
{"IsWindowVisible", (PyCFunction)WinObj_IsWindowVisible, 1,
"() -> (Boolean _rv)"},
+
+#if !TARGET_API_MAC_CARBON
{"GetWindowZoomFlag", (PyCFunction)WinObj_GetWindowZoomFlag, 1,
"() -> (Boolean _rv)"},
+#endif
{"GetWindowStructureRgn", (PyCFunction)WinObj_GetWindowStructureRgn, 1,
"(RgnHandle r) -> None"},
{"GetWindowContentRgn", (PyCFunction)WinObj_GetWindowContentRgn, 1,
"(RgnHandle r) -> None"},
{"GetWindowUpdateRgn", (PyCFunction)WinObj_GetWindowUpdateRgn, 1,
"(RgnHandle r) -> None"},
+
+#if !TARGET_API_MAC_CARBON
{"GetWindowTitleWidth", (PyCFunction)WinObj_GetWindowTitleWidth, 1,
"() -> (short _rv)"},
+#endif
{"GetNextWindow", (PyCFunction)WinObj_GetNextWindow, 1,
"() -> (WindowPtr _rv)"},
diff --git a/Mac/Modules/win/winedit.py b/Mac/Modules/win/winedit.py
index 09fd300..b1e27c3 100644
--- a/Mac/Modules/win/winedit.py
+++ b/Mac/Modules/win/winedit.py
@@ -8,6 +8,7 @@
f = Method(Boolean, 'GetWindowZoomFlag',
(WindowRef, 'theWindow', InMode),
+ condition='#if !TARGET_API_MAC_CARBON'
)
methods.append(f)
@@ -31,6 +32,7 @@
f = Method(short, 'GetWindowTitleWidth',
(WindowRef, 'theWindow', InMode),
+ condition='#if !TARGET_API_MAC_CARBON'
)
methods.append(f)
diff --git a/Mac/Modules/win/winscan.py b/Mac/Modules/win/winscan.py
index 316a812..cdc2b66 100644
--- a/Mac/Modules/win/winscan.py
+++ b/Mac/Modules/win/winscan.py
@@ -66,6 +66,8 @@
'InvalRgn',
'InvalRect',
'IsValidWindowPtr', # I think this is useless for Python, but not sure...
+ 'GetWindowZoomFlag', # Not available in Carbon
+ 'GetWindowTitleWidth', # Ditto
]),
('#if TARGET_API_MAC_CARBON', [
'IsWindowUpdatePending',