diff options
author | Jack Jansen <jack.jansen@cwi.nl> | 2000-07-07 13:09:35 (GMT) |
---|---|---|
committer | Jack Jansen <jack.jansen@cwi.nl> | 2000-07-07 13:09:35 (GMT) |
commit | 0b13e7c1531351452703d6b9770194e53a3d3f69 (patch) | |
tree | 0a4fc2efc2674b48cebfa7b1058776aa3ec841e8 /Mac/Modules/app | |
parent | 89d017d072cce9a3baee8861b10818a401127f08 (diff) | |
download | cpython-0b13e7c1531351452703d6b9770194e53a3d3f69.zip cpython-0b13e7c1531351452703d6b9770194e53a3d3f69.tar.gz cpython-0b13e7c1531351452703d6b9770194e53a3d3f69.tar.bz2 |
Changed all (hopefully) uses of unsigned 16 bit value to use H format specifier, now that h is signed-only.
Diffstat (limited to 'Mac/Modules/app')
-rw-r--r-- | Mac/Modules/app/Appmodule.c | 26 | ||||
-rw-r--r-- | Mac/Modules/app/appsupport.py | 32 |
2 files changed, 29 insertions, 29 deletions
diff --git a/Mac/Modules/app/Appmodule.c b/Mac/Modules/app/Appmodule.c index d047476..06f573d 100644 --- a/Mac/Modules/app/Appmodule.c +++ b/Mac/Modules/app/Appmodule.c @@ -459,7 +459,7 @@ static PyObject *App_DrawThemeMenuBarBackground(_self, _args) Rect inBounds; ThemeMenuBarState inState; UInt32 inAttributes; - if (!PyArg_ParseTuple(_args, "O&hl", + if (!PyArg_ParseTuple(_args, "O&Hl", PyMac_GetRect, &inBounds, &inState, &inAttributes)) @@ -497,7 +497,7 @@ static PyObject *App_DrawThemeMenuBackground(_self, _args) OSStatus _err; Rect inMenuRect; ThemeMenuType inMenuType; - if (!PyArg_ParseTuple(_args, "O&h", + if (!PyArg_ParseTuple(_args, "O&H", PyMac_GetRect, &inMenuRect, &inMenuType)) return NULL; @@ -517,7 +517,7 @@ static PyObject *App_GetThemeMenuBackgroundRegion(_self, _args) OSStatus _err; Rect inMenuRect; ThemeMenuType menuType; - if (!PyArg_ParseTuple(_args, "O&h", + if (!PyArg_ParseTuple(_args, "O&H", PyMac_GetRect, &inMenuRect, &menuType)) return NULL; @@ -572,7 +572,7 @@ static PyObject *App_GetThemeMenuItemExtra(_self, _args) ThemeMenuItemType inItemType; SInt16 outHeight; SInt16 outWidth; - if (!PyArg_ParseTuple(_args, "h", + if (!PyArg_ParseTuple(_args, "H", &inItemType)) return NULL; _err = GetThemeMenuItemExtra(inItemType, @@ -633,7 +633,7 @@ static PyObject *App_GetThemeTabRegion(_self, _args) Rect inRect; ThemeTabStyle inStyle; ThemeTabDirection inDirection; - if (!PyArg_ParseTuple(_args, "O&hh", + if (!PyArg_ParseTuple(_args, "O&HH", PyMac_GetRect, &inRect, &inStyle, &inDirection)) @@ -696,7 +696,7 @@ static PyObject *App_GetThemeScrollBarThumbStyle(_self, _args) return NULL; _err = GetThemeScrollBarThumbStyle(&outStyle); if (_err != noErr) return PyMac_Error(_err); - _res = Py_BuildValue("h", + _res = Py_BuildValue("H", outStyle); return _res; } @@ -712,7 +712,7 @@ static PyObject *App_GetThemeScrollBarArrowStyle(_self, _args) return NULL; _err = GetThemeScrollBarArrowStyle(&outStyle); if (_err != noErr) return PyMac_Error(_err); - _res = Py_BuildValue("h", + _res = Py_BuildValue("H", outStyle); return _res; } @@ -728,7 +728,7 @@ static PyObject *App_GetThemeCheckBoxStyle(_self, _args) return NULL; _err = GetThemeCheckBoxStyle(&outStyle); if (_err != noErr) return PyMac_Error(_err); - _res = Py_BuildValue("h", + _res = Py_BuildValue("H", outStyle); return _res; } @@ -741,7 +741,7 @@ static PyObject *App_UseThemeFont(_self, _args) OSStatus _err; ThemeFontID inFontID; ScriptCode inScript; - if (!PyArg_ParseTuple(_args, "hh", + if (!PyArg_ParseTuple(_args, "Hh", &inFontID, &inScript)) return NULL; @@ -853,7 +853,7 @@ static PyObject *App_DrawThemeScrollBarDelimiters(_self, _args) Rect inContRect; ThemeDrawState state; ThemeWindowAttributes attributes; - if (!PyArg_ParseTuple(_args, "hO&ll", + if (!PyArg_ParseTuple(_args, "HO&ll", &flavor, PyMac_GetRect, &inContRect, &state, @@ -948,7 +948,7 @@ static PyObject *App_DrawThemeStandaloneGrowBox(_self, _args) ThemeGrowDirection growDirection; Boolean isSmall; ThemeDrawState state; - if (!PyArg_ParseTuple(_args, "O&hbl", + if (!PyArg_ParseTuple(_args, "O&Hbl", PyMac_GetPoint, &origin, &growDirection, &isSmall, @@ -974,7 +974,7 @@ static PyObject *App_DrawThemeStandaloneNoGrowBox(_self, _args) ThemeGrowDirection growDirection; Boolean isSmall; ThemeDrawState state; - if (!PyArg_ParseTuple(_args, "O&hbl", + if (!PyArg_ParseTuple(_args, "O&Hbl", PyMac_GetPoint, &origin, &growDirection, &isSmall, @@ -1000,7 +1000,7 @@ static PyObject *App_GetThemeStandaloneGrowBoxBounds(_self, _args) ThemeGrowDirection growDirection; Boolean isSmall; Rect bounds; - if (!PyArg_ParseTuple(_args, "O&hb", + if (!PyArg_ParseTuple(_args, "O&Hb", PyMac_GetPoint, &origin, &growDirection, &isSmall)) diff --git a/Mac/Modules/app/appsupport.py b/Mac/Modules/app/appsupport.py index a90aa52..3bf5912 100644 --- a/Mac/Modules/app/appsupport.py +++ b/Mac/Modules/app/appsupport.py @@ -38,30 +38,30 @@ RgnHandle = FakeType("(RgnHandle)0") ThemeBrush = Type("ThemeBrush", "h") ThemeColor = Type("ThemeColor", "h") ThemeTextColor = Type("ThemeTextColor", "h") -ThemeMenuBarState = Type("ThemeMenuBarState", "h") -ThemeMenuState = Type("ThemeMenuState", "h") -ThemeMenuType = Type("ThemeMenuType", "h") -ThemeMenuItemType = Type("ThemeMenuItemType", "h") -ThemeFontID = Type("ThemeFontID", "h") -ThemeTabStyle = Type("ThemeTabStyle", "h") -ThemeTabDirection = Type("ThemeTabDirection", "h") +ThemeMenuBarState = Type("ThemeMenuBarState", "H") +ThemeMenuState = Type("ThemeMenuState", "H") +ThemeMenuType = Type("ThemeMenuType", "H") +ThemeMenuItemType = Type("ThemeMenuItemType", "H") +ThemeFontID = Type("ThemeFontID", "H") +ThemeTabStyle = Type("ThemeTabStyle", "H") +ThemeTabDirection = Type("ThemeTabDirection", "H") ThemeDrawState = Type("ThemeDrawState", "l") ThemeCursor = Type("ThemeCursor", "l") -ThemeCheckBoxStyle = Type("ThemeCheckBoxStyle", "h") -ThemeScrollBarArrowStyle = Type("ThemeScrollBarArrowStyle", "h") -ThemeScrollBarThumbStyle = Type("ThemeScrollBarThumbStyle", "h") +ThemeCheckBoxStyle = Type("ThemeCheckBoxStyle", "H") +ThemeScrollBarArrowStyle = Type("ThemeScrollBarArrowStyle", "H") +ThemeScrollBarThumbStyle = Type("ThemeScrollBarThumbStyle", "H") CTabHandle = OpaqueByValueType("CTabHandle", "ResObj") ThemeTrackEnableState = Type("ThemeTrackEnableState", "b") ThemeTrackPressState = Type("ThemeTrackPressState", "b") ThemeThumbDirection = Type("ThemeThumbDirection", "b") -ThemeTrackAttributes = Type("ThemeTrackAttributes", "h") +ThemeTrackAttributes = Type("ThemeTrackAttributes", "H") ControlPartCode = Type("ControlPartCode", "h") ThemeWindowAttributes = Type("ThemeWindowAttributes", "l") -ThemeWindowType = Type("ThemeWindowType", "h") -ThemeTitleBarWidget = Type("ThemeTitleBarWidget", "h") -ThemeArrowOrientation = Type("ThemeArrowOrientation", "h") -ThemePopupArrowSize = Type("ThemePopupArrowSize", "h") -ThemeGrowDirection = Type("ThemeGrowDirection", "h") +ThemeWindowType = Type("ThemeWindowType", "H") +ThemeTitleBarWidget = Type("ThemeTitleBarWidget", "H") +ThemeArrowOrientation = Type("ThemeArrowOrientation", "H") +ThemePopupArrowSize = Type("ThemePopupArrowSize", "H") +ThemeGrowDirection = Type("ThemeGrowDirection", "H") ThemeSoundKind = OSTypeType("ThemeSoundKind") ThemeDragSoundKind = OSTypeType("ThemeDragSoundKind") ThemeBackgroundKind = Type("ThemeBackgroundKind", "l") |