Bgen now understands more constant definitions, but that means that a few which are...

diff --git a/Mac/Modules/ae/AEmodule.c b/Mac/Modules/ae/AEmodule.c
index 241cb5d44f0f42dd8d3142be5a01f388c3dfcb31..ebdb3e13d5ca2f2c5740f3d981474300496744d7 100644 (file)
--- a/Mac/Modules/ae/AEmodule.c
+++ b/Mac/Modules/ae/AEmodule.c
@@ -813,6 +813,12 @@ static PyObject *AEDesc_getattr(self, name)
 
 #define AEDesc_setattr NULL
 
+#define AEDesc_compare NULL
+
+#define AEDesc_repr NULL
+
+#define AEDesc_hash NULL
+
 PyTypeObject AEDesc_Type = {
        PyObject_HEAD_INIT(&PyType_Type)
        0, /*ob_size*/
@@ -824,6 +830,12 @@ PyTypeObject AEDesc_Type = {
        0, /*tp_print*/
        (getattrfunc) AEDesc_getattr, /*tp_getattr*/
        (setattrfunc) AEDesc_setattr, /*tp_setattr*/
+       (cmpfunc) AEDesc_compare, /*tp_compare*/
+       (reprfunc) AEDesc_repr, /*tp_repr*/
+       (PyNumberMethods *)0, /* tp_as_number */
+       (PySequenceMethods *)0, /* tp_as_sequence */
+       (PyMappingMethods *)0, /* tp_as_mapping */
+       (hashfunc) AEDesc_hash, /*tp_hash*/
 };
 
 /* --------------------- End object type AEDesc --------------------- */

diff --git a/Mac/Modules/ae/aescan.py b/Mac/Modules/ae/aescan.py
index c1f4251a4700a0f019f3e9ca04b25f085f915b76..b2174a88c17e43358d3f1f3639f29bf5cfa5beaa 100644 (file)
--- a/Mac/Modules/ae/aescan.py
+++ b/Mac/Modules/ae/aescan.py
@@ -70,6 +70,9 @@ class AppleEventsScanner(Scanner):
                return [
                        "AEDisposeDesc",
 #                      "AEGetEventHandler",
+                       # Constants with funny definitions
+                       "kAEDontDisposeOnResume",
+                       "kAEUseStandardDispatch",
                        ]
 
        def makeblacklisttypes(self):

diff --git a/Mac/Modules/evt/evtscan.py b/Mac/Modules/evt/evtscan.py
index 1f558ead367ba781d539baa4b2bf1c79187e21ff..0a3ede0c381179a48385ca321759d2c30b724178 100644 (file)
--- a/Mac/Modules/evt/evtscan.py
+++ b/Mac/Modules/evt/evtscan.py
@@ -39,7 +39,9 @@ class MyScanner(Scanner):
                return [
                        "KeyTranslate",
                        "GetEventMask",         # I cannot seem to find this routine...
-                       "WaitNextEvent"         # Manually generated because of optional region
+                       "WaitNextEvent",        # Manually generated because of optional region
+                       # Constants with funny definitions
+                       "osEvtMessageMask",
                        ]
 
        def makeblacklisttypes(self):

diff --git a/Mac/Modules/icn/icnscan.py b/Mac/Modules/icn/icnscan.py
index c8c2e6b76fd3618d1f022ca640ec453d36f13c95..ee5a269e60b33164c469724d89c7122da526f8e8 100644 (file)
--- a/Mac/Modules/icn/icnscan.py
+++ b/Mac/Modules/icn/icnscan.py
@@ -39,6 +39,10 @@ class MyScanner(Scanner):
                return [
                        "GetIconCacheData",
                        "SetIconCacheData",
+                       # Constants with funny definitions
+                       "kSelectorAllHugeData",
+                       "kSelectorAllAvailableData",
+                       "svAllAvailableData",
                        ]
 
        def makeblacklisttypes(self):
@@ -51,6 +55,9 @@ class MyScanner(Scanner):
        def makerepairinstructions(self):
                return [
                        ]
+
+       def writeinitialdefs(self):
+               self.defsfile.write("def FOUR_CHAR_CODE(x): return x\n")
                        
 if __name__ == "__main__":
        main()

diff --git a/Mac/Modules/snd/sndscan.py b/Mac/Modules/snd/sndscan.py
index 676c8892229d0c2f9276457a071b0054bf913be2..a190bfe1bbaa2c3ea4fde80c460e28d4dff51d7e 100644 (file)
--- a/Mac/Modules/snd/sndscan.py
+++ b/Mac/Modules/snd/sndscan.py
@@ -55,6 +55,10 @@ class SoundScanner(Scanner):
                        # And old calls that are no longer supported
                        'SetSoundVol',
                        'GetSoundVol',
+                       # Constants with funny definitions
+                       'rate48khz',
+                       'rate44khz',
+                       'kInvalidSource',
 
                        ]
 

diff --git a/Mac/Modules/win/Winmodule.c b/Mac/Modules/win/Winmodule.c
index f89591109b14f09ab78ff6bb85fdd489908a5ad7..954244702983a5b998e14c249f60f88939cba9be 100644 (file)
--- a/Mac/Modules/win/Winmodule.c
+++ b/Mac/Modules/win/Winmodule.c
@@ -713,7 +713,7 @@ static PyObject *WinObj_GetWindowProxyFSSpec(_self, _args)
                                    &outFile);
        if (_err != noErr) return PyMac_Error(_err);
        _res = Py_BuildValue("O&",
-                            PyMac_BuildFSSpec, outFile);
+                            PyMac_BuildFSSpec, &outFile);
        return _res;
 }
 

diff --git a/Mac/Modules/win/winscan.py b/Mac/Modules/win/winscan.py
index d9ca18b3d5311c4fc0c93305614c6d25daa0ff26..22f0d1a45c8e1fe96aa8b018dd4db3b7f47f1b01 100644 (file)
--- a/Mac/Modules/win/winscan.py
+++ b/Mac/Modules/win/winscan.py
@@ -41,6 +41,8 @@ class MyScanner(Scanner):
                        'GetWindowProperty',
                        'GetWindowPropertySize',
                        'RemoveWindowProperty',
+                       # Constants with funny definitions
+                       'kMouseUpOutOfSlop',
                        ]
 
        def makeblacklisttypes(self):