summaryrefslogtreecommitdiffstats
path: root/Mac/Modules/menu
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>1995-12-12 15:02:03 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>1995-12-12 15:02:03 (GMT)
commit425e9eb6cb269dda231a617a28252f5232ccc624 (patch)
tree60f26b3caca10b60bfdaec558c7938cb8fbd3081 /Mac/Modules/menu
parent72b56e831fdc35f06b5e3aa7d071879d3b6df762 (diff)
downloadcpython-425e9eb6cb269dda231a617a28252f5232ccc624.zip
cpython-425e9eb6cb269dda231a617a28252f5232ccc624.tar.gz
cpython-425e9eb6cb269dda231a617a28252f5232ccc624.tar.bz2
- Added color window/pixmap support
- Added support for obtaining pixmap data - Added OptResObj_* routines for optional handles
Diffstat (limited to 'Mac/Modules/menu')
-rw-r--r--Mac/Modules/menu/Menumodule.c11
-rw-r--r--Mac/Modules/menu/menugen.py2
2 files changed, 11 insertions, 2 deletions
diff --git a/Mac/Modules/menu/Menumodule.c b/Mac/Modules/menu/Menumodule.c
index 6c855cd..07e1b88 100644
--- a/Mac/Modules/menu/Menumodule.c
+++ b/Mac/Modules/menu/Menumodule.c
@@ -14,11 +14,14 @@
#include <Controls.h>
extern PyObject *ResObj_New(Handle);
-extern PyObject *ResObj_OptNew(Handle);
extern int ResObj_Convert(PyObject *, Handle *);
+extern PyObject *OptResObj_New(Handle);
+extern int OptResObj_Convert(PyObject *, Handle *);
extern PyObject *WinObj_New(WindowPtr);
extern int WinObj_Convert(PyObject *, WindowPtr *);
+extern PyTypeObject Window_Type;
+#define WinObj_Check(x) ((x)->ob_type == &Window_Type)
extern PyObject *DlgObj_New(DialogPtr);
extern int DlgObj_Convert(PyObject *, DialogPtr *);
@@ -31,6 +34,12 @@ extern int MenuObj_Convert(PyObject *, MenuHandle *);
extern PyObject *CtlObj_New(ControlHandle);
extern int CtlObj_Convert(PyObject *, ControlHandle *);
+extern PyObject *GrafObj_New(GrafPtr);
+extern int GrafObj_Convert(PyObject *, GrafPtr *);
+
+extern PyObject *BMObj_New(BitMapPtr);
+extern int BMObj_Convert(PyObject *, BitMapPtr *);
+
extern PyObject *WinObj_WhichWindow(WindowPtr);
#include <Devices.h> /* Defines OpenDeskAcc in universal headers */
diff --git a/Mac/Modules/menu/menugen.py b/Mac/Modules/menu/menugen.py
index 30e43e2..7e27d5c 100644
--- a/Mac/Modules/menu/menugen.py
+++ b/Mac/Modules/menu/menugen.py
@@ -1,4 +1,4 @@
-# Generated from 'Sap:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:Menus.h'
+# Generated from 'Sap:CodeWarrior7:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Menus.h'
f = Function(short, 'GetMBarHeight',
)