[Xfce4-commits] <pyxfce:master> remove 'xfce-panel-enums.h'.
Danny Milosavljevic
noreply at xfce.org
Sun Dec 26 20:04:01 CET 2010
Updating branch refs/heads/master
to f85ff6131fd35e2d759e221aa01572db37d62c9d (commit)
from c090ae95fcf375a6c176a992c5d461d27c81bbf0 (commit)
commit f85ff6131fd35e2d759e221aa01572db37d62c9d
Author: Danny Milosavljevic <dannym at xfce.org>
Date: Sun Dec 26 19:59:49 2010 +0100
remove 'xfce-panel-enums.h'.
panel/arrow_button.c | 112 +++++++++++-----------
panel/enums.c | 7 +-
panel/external_plugin.c | 90 +++++++++----------
panel/itembar.c | 236 +++++++++++++++++++++++++++++++----------------
panel/plugin_iface.c | 15 +++-
5 files changed, 274 insertions(+), 186 deletions(-)
diff --git a/panel/arrow_button.c b/panel/arrow_button.c
index 9ba7e65..e6ee685 100644
--- a/panel/arrow_button.c
+++ b/panel/arrow_button.c
@@ -24,7 +24,7 @@ static PyTypeObject *_PyGtkToggleButton_Type;
/* ---------- forward type declarations ---------- */
-PyTypeObject PyXfceArrowButton_Type;
+PyTypeObject G_GNUC_INTERNAL PyXfceArrowButton_Type;
#line 30 "arrow_button.c"
@@ -39,9 +39,9 @@ _wrap_xfce_arrow_button_new(PyGObject *self, PyObject *args, PyObject *kwargs)
PyObject *py_type = NULL;
GtkArrowType type;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:XfceArrowButton.__init__", kwlist, &py_type))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O:XfceArrowButton.__init__", kwlist, &py_type))
return -1;
- if (pyg_enum_get_value(GTK_TYPE_ARROW_TYPE, py_type, (gint *)&type))
+ if (pyg_enum_get_value(GTK_TYPE_ARROW_TYPE, py_type, (gpointer)&type))
return -1;
self->obj = (GObject *)xfce_arrow_button_new(type);
@@ -60,11 +60,13 @@ _wrap_xfce_arrow_button_set_arrow_type(PyGObject *self, PyObject *args, PyObject
PyObject *py_type = NULL;
GtkArrowType type;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:XfceArrowButton.set_arrow_type", kwlist, &py_type))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O:XfceArrowButton.set_arrow_type", kwlist, &py_type))
return NULL;
- if (pyg_enum_get_value(GTK_TYPE_ARROW_TYPE, py_type, (gint *)&type))
+ if (pyg_enum_get_value(GTK_TYPE_ARROW_TYPE, py_type, (gpointer)&type))
return NULL;
+
xfce_arrow_button_set_arrow_type(XFCE_ARROW_BUTTON(self->obj), type);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -74,55 +76,59 @@ _wrap_xfce_arrow_button_get_arrow_type(PyGObject *self)
{
gint ret;
+
ret = xfce_arrow_button_get_arrow_type(XFCE_ARROW_BUTTON(self->obj));
+
return pyg_enum_from_gtype(GTK_TYPE_ARROW_TYPE, ret);
}
-static PyMethodDef _PyXfceArrowButton_methods[] = {
- { "set_arrow_type", (PyCFunction)_wrap_xfce_arrow_button_set_arrow_type, METH_VARARGS|METH_KEYWORDS },
- { "get_arrow_type", (PyCFunction)_wrap_xfce_arrow_button_get_arrow_type, METH_NOARGS },
- { NULL, NULL, 0 }
+static const PyMethodDef _PyXfceArrowButton_methods[] = {
+ { "set_arrow_type", (PyCFunction)_wrap_xfce_arrow_button_set_arrow_type, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "get_arrow_type", (PyCFunction)_wrap_xfce_arrow_button_get_arrow_type, METH_NOARGS,
+ NULL },
+ { NULL, NULL, 0, NULL }
};
-PyTypeObject PyXfceArrowButton_Type = {
+PyTypeObject G_GNUC_INTERNAL PyXfceArrowButton_Type = {
PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "arrowbutton.ArrowButton", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
+ 0, /* ob_size */
+ "arrowbutton.ArrowButton", /* tp_name */
+ sizeof(PyGObject), /* tp_basicsize */
+ 0, /* tp_itemsize */
/* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
+ (destructor)0, /* tp_dealloc */
+ (printfunc)0, /* tp_print */
+ (getattrfunc)0, /* tp_getattr */
+ (setattrfunc)0, /* tp_setattr */
+ (cmpfunc)0, /* tp_compare */
+ (reprfunc)0, /* tp_repr */
(PyNumberMethods*)0, /* tp_as_number */
(PySequenceMethods*)0, /* tp_as_sequence */
(PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
+ (hashfunc)0, /* tp_hash */
+ (ternaryfunc)0, /* tp_call */
+ (reprfunc)0, /* tp_str */
+ (getattrofunc)0, /* tp_getattro */
+ (setattrofunc)0, /* tp_setattro */
+ (PyBufferProcs*)0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
+ NULL, /* Documentation string */
+ (traverseproc)0, /* tp_traverse */
+ (inquiry)0, /* tp_clear */
+ (richcmpfunc)0, /* tp_richcompare */
offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- _PyXfceArrowButton_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
+ (getiterfunc)0, /* tp_iter */
+ (iternextfunc)0, /* tp_iternext */
+ (struct PyMethodDef*)_PyXfceArrowButton_methods, /* tp_methods */
+ (struct PyMemberDef*)0, /* tp_members */
+ (struct PyGetSetDef*)0, /* tp_getset */
+ NULL, /* tp_base */
+ NULL, /* tp_dict */
+ (descrgetfunc)0, /* tp_descr_get */
+ (descrsetfunc)0, /* tp_descr_set */
offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_xfce_arrow_button_new, /* tp_init */
+ (initproc)_wrap_xfce_arrow_button_new, /* tp_init */
(allocfunc)0, /* tp_alloc */
(newfunc)0, /* tp_new */
(freefunc)0, /* tp_free */
@@ -133,8 +139,8 @@ PyTypeObject PyXfceArrowButton_Type = {
/* ----------- functions ----------- */
-PyMethodDef pyarrow_button_functions[] = {
- { NULL, NULL, 0 }
+const PyMethodDef pyarrow_button_functions[] = {
+ { NULL, NULL, 0, NULL }
};
/* initialise stuff extension classes */
@@ -144,41 +150,37 @@ pyarrow_button_register_classes(PyObject *d)
PyObject *module;
if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
+ _PyGObject_Type = (PyTypeObject *)PyObject_GetAttrString(module, "GObject");
if (_PyGObject_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name GObject from gobject");
- return;
+ return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gobject");
- return;
+ return ;
}
if ((module = PyImport_ImportModule("gtk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkWidget_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Widget");
+ _PyGtkWidget_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Widget");
if (_PyGtkWidget_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name Widget from gtk");
- return;
+ return ;
}
- _PyGtkToggleButton_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "ToggleButton");
+ _PyGtkToggleButton_Type = (PyTypeObject *)PyObject_GetAttrString(module, "ToggleButton");
if (_PyGtkToggleButton_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name ToggleButton from gtk");
- return;
+ return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gtk");
- return;
+ return ;
}
-#line 183 "arrow_button.c"
+#line 185 "arrow_button.c"
pygobject_register_class(d, "XfceArrowButton", XFCE_TYPE_ARROW_BUTTON, &PyXfceArrowButton_Type, Py_BuildValue("(O)", &PyGtkToggleButton_Type));
}
diff --git a/panel/enums.c b/panel/enums.c
index 8985b9a..5665b76 100644
--- a/panel/enums.c
+++ b/panel/enums.c
@@ -7,12 +7,11 @@
#line 6 "enums.override"
#include "pygobject.h"
#include <gtk/gtk.h>
-#include <libxfce4panel/xfce-panel-enums.h>
#include <libxfce4panel/libxfce4panel-enum-types.h>
extern PyTypeObject PyGtkWidget_Type;
-#line 16 "enums.c"
+#line 15 "enums.c"
/* ---------- types from other modules ---------- */
@@ -24,7 +23,7 @@ static PyTypeObject *_PyGtkWidget_Type;
/* ---------- forward type declarations ---------- */
-#line 28 "enums.c"
+#line 27 "enums.c"
@@ -81,5 +80,5 @@ pyenums_register_classes(PyObject *d)
}
-#line 85 "enums.c"
+#line 84 "enums.c"
}
diff --git a/panel/external_plugin.c b/panel/external_plugin.c
index 0fcafe2..a6f7f84 100644
--- a/panel/external_plugin.c
+++ b/panel/external_plugin.c
@@ -77,7 +77,7 @@ static PyTypeObject *_PyGtkPlug_Type;
/* ---------- forward type declarations ---------- */
-PyTypeObject PyXfceExternalPanelPlugin_Type;
+PyTypeObject G_GNUC_INTERNAL PyXfceExternalPanelPlugin_Type;
#line 83 "external_plugin.c"
@@ -111,45 +111,45 @@ _wrap_xfce_external_panel_plugin_new(PyGObject *self, PyObject *args, PyObject *
#line 112 "external_plugin.c"
-PyTypeObject PyXfceExternalPanelPlugin_Type = {
+PyTypeObject G_GNUC_INTERNAL PyXfceExternalPanelPlugin_Type = {
PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "external.ExternalPanelPlugin", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
+ 0, /* ob_size */
+ "external.ExternalPanelPlugin", /* tp_name */
+ sizeof(PyGObject), /* tp_basicsize */
+ 0, /* tp_itemsize */
/* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
+ (destructor)0, /* tp_dealloc */
+ (printfunc)0, /* tp_print */
+ (getattrfunc)0, /* tp_getattr */
+ (setattrfunc)0, /* tp_setattr */
+ (cmpfunc)0, /* tp_compare */
+ (reprfunc)0, /* tp_repr */
(PyNumberMethods*)0, /* tp_as_number */
(PySequenceMethods*)0, /* tp_as_sequence */
(PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
+ (hashfunc)0, /* tp_hash */
+ (ternaryfunc)0, /* tp_call */
+ (reprfunc)0, /* tp_str */
+ (getattrofunc)0, /* tp_getattro */
+ (setattrofunc)0, /* tp_setattro */
+ (PyBufferProcs*)0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
+ NULL, /* Documentation string */
+ (traverseproc)0, /* tp_traverse */
+ (inquiry)0, /* tp_clear */
+ (richcmpfunc)0, /* tp_richcompare */
offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- NULL, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
+ (getiterfunc)0, /* tp_iter */
+ (iternextfunc)0, /* tp_iternext */
+ (struct PyMethodDef*)NULL, /* tp_methods */
+ (struct PyMemberDef*)0, /* tp_members */
+ (struct PyGetSetDef*)0, /* tp_getset */
+ NULL, /* tp_base */
+ NULL, /* tp_dict */
+ (descrgetfunc)0, /* tp_descr_get */
+ (descrsetfunc)0, /* tp_descr_set */
offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_xfce_external_panel_plugin_new, /* tp_init */
+ (initproc)_wrap_xfce_external_panel_plugin_new, /* tp_init */
(allocfunc)0, /* tp_alloc */
(newfunc)0, /* tp_new */
(freefunc)0, /* tp_free */
@@ -160,8 +160,8 @@ PyTypeObject PyXfceExternalPanelPlugin_Type = {
/* ----------- functions ----------- */
-PyMethodDef pyexternal_plugin_functions[] = {
- { NULL, NULL, 0 }
+const PyMethodDef pyexternal_plugin_functions[] = {
+ { NULL, NULL, 0, NULL }
};
/* initialise stuff extension classes */
@@ -171,41 +171,37 @@ pyexternal_plugin_register_classes(PyObject *d)
PyObject *module;
if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
+ _PyGObject_Type = (PyTypeObject *)PyObject_GetAttrString(module, "GObject");
if (_PyGObject_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name GObject from gobject");
- return;
+ return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gobject");
- return;
+ return ;
}
if ((module = PyImport_ImportModule("gtk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkWidget_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Widget");
+ _PyGtkWidget_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Widget");
if (_PyGtkWidget_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name Widget from gtk");
- return;
+ return ;
}
- _PyGtkPlug_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Plug");
+ _PyGtkPlug_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Plug");
if (_PyGtkPlug_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name Plug from gtk");
- return;
+ return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gtk");
- return;
+ return ;
}
-#line 210 "external_plugin.c"
+#line 206 "external_plugin.c"
pygobject_register_class(d, "XfceExternalPanelPlugin", XFCE_TYPE_EXTERNAL_PANEL_PLUGIN, &PyXfceExternalPanelPlugin_Type, Py_BuildValue("(OO)", &PyGtkPlug_Type, &PyXfcePanelPlugin_Type));
}
diff --git a/panel/itembar.c b/panel/itembar.c
index b3ba291..82d2e7a 100644
--- a/panel/itembar.c
+++ b/panel/itembar.c
@@ -24,7 +24,7 @@ static PyTypeObject *_PyGtkContainer_Type;
/* ---------- forward type declarations ---------- */
-PyTypeObject PyXfceItembar_Type;
+PyTypeObject G_GNUC_INTERNAL PyXfceItembar_Type;
#line 30 "itembar.c"
@@ -39,9 +39,9 @@ _wrap_xfce_itembar_new(PyGObject *self, PyObject *args, PyObject *kwargs)
GtkOrientation orientation;
PyObject *py_orientation = NULL;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:XfceItembar.__init__", kwlist, &py_orientation))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O:XfceItembar.__init__", kwlist, &py_orientation))
return -1;
- if (pyg_enum_get_value(GTK_TYPE_ORIENTATION, py_orientation, (gint *)&orientation))
+ if (pyg_enum_get_value(GTK_TYPE_ORIENTATION, py_orientation, (gpointer)&orientation))
return -1;
self->obj = (GObject *)xfce_itembar_new(orientation);
@@ -54,17 +54,49 @@ _wrap_xfce_itembar_new(PyGObject *self, PyObject *args, PyObject *kwargs)
}
static PyObject *
+_wrap_xfce_itembar_set_maximum_size(PyGObject *self, PyObject *args, PyObject *kwargs)
+{
+ static char *kwlist[] = { "size", NULL };
+ int size;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:XfceItembar.set_maximum_size", kwlist, &size))
+ return NULL;
+
+ xfce_itembar_set_maximum_size(XFCE_ITEMBAR(self->obj), size);
+
+ Py_INCREF(Py_None);
+ return Py_None;
+}
+
+static PyObject *
+_wrap_xfce_itembar_set_allow_expand(PyGObject *self, PyObject *args, PyObject *kwargs)
+{
+ static char *kwlist[] = { "allow", NULL };
+ int allow;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:XfceItembar.set_allow_expand", kwlist, &allow))
+ return NULL;
+
+ xfce_itembar_set_allow_expand(XFCE_ITEMBAR(self->obj), allow);
+
+ Py_INCREF(Py_None);
+ return Py_None;
+}
+
+static PyObject *
_wrap_xfce_itembar_set_orientation(PyGObject *self, PyObject *args, PyObject *kwargs)
{
static char *kwlist[] = { "orientation", NULL };
GtkOrientation orientation;
PyObject *py_orientation = NULL;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:XfceItembar.set_orientation", kwlist, &py_orientation))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O:XfceItembar.set_orientation", kwlist, &py_orientation))
return NULL;
- if (pyg_enum_get_value(GTK_TYPE_ORIENTATION, py_orientation, (gint *)&orientation))
+ if (pyg_enum_get_value(GTK_TYPE_ORIENTATION, py_orientation, (gpointer)&orientation))
return NULL;
+
xfce_itembar_set_orientation(XFCE_ITEMBAR(self->obj), orientation);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -74,7 +106,9 @@ _wrap_xfce_itembar_get_orientation(PyGObject *self)
{
gint ret;
+
ret = xfce_itembar_get_orientation(XFCE_ITEMBAR(self->obj));
+
return pyg_enum_from_gtype(GTK_TYPE_ORIENTATION, ret);
}
@@ -85,9 +119,11 @@ _wrap_xfce_itembar_insert(PyGObject *self, PyObject *args, PyObject *kwargs)
PyGObject *item;
int position;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!i:XfceItembar.insert", kwlist, &PyGtkWidget_Type, &item, &position))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!i:XfceItembar.insert", kwlist, &PyGtkWidget_Type, &item, &position))
return NULL;
+
xfce_itembar_insert(XFCE_ITEMBAR(self->obj), GTK_WIDGET(item->obj), position);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -98,9 +134,11 @@ _wrap_xfce_itembar_append(PyGObject *self, PyObject *args, PyObject *kwargs)
static char *kwlist[] = { "item", NULL };
PyGObject *item;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:XfceItembar.append", kwlist, &PyGtkWidget_Type, &item))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:XfceItembar.append", kwlist, &PyGtkWidget_Type, &item))
return NULL;
+
xfce_itembar_append(XFCE_ITEMBAR(self->obj), GTK_WIDGET(item->obj));
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -111,9 +149,11 @@ _wrap_xfce_itembar_prepend(PyGObject *self, PyObject *args, PyObject *kwargs)
static char *kwlist[] = { "item", NULL };
PyGObject *item;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:XfceItembar.prepend", kwlist, &PyGtkWidget_Type, &item))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:XfceItembar.prepend", kwlist, &PyGtkWidget_Type, &item))
return NULL;
+
xfce_itembar_prepend(XFCE_ITEMBAR(self->obj), GTK_WIDGET(item->obj));
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -125,9 +165,11 @@ _wrap_xfce_itembar_reorder_child(PyGObject *self, PyObject *args, PyObject *kwar
PyGObject *item;
int position;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!i:XfceItembar.reorder_child", kwlist, &PyGtkWidget_Type, &item, &position))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!i:XfceItembar.reorder_child", kwlist, &PyGtkWidget_Type, &item, &position))
return NULL;
+
xfce_itembar_reorder_child(XFCE_ITEMBAR(self->obj), GTK_WIDGET(item->obj), position);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -139,9 +181,11 @@ _wrap_xfce_itembar_set_child_expand(PyGObject *self, PyObject *args, PyObject *k
PyGObject *item;
int expand;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!i:XfceItembar.set_child_expand", kwlist, &PyGtkWidget_Type, &item, &expand))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!i:XfceItembar.set_child_expand", kwlist, &PyGtkWidget_Type, &item, &expand))
return NULL;
+
xfce_itembar_set_child_expand(XFCE_ITEMBAR(self->obj), GTK_WIDGET(item->obj), expand);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -153,9 +197,11 @@ _wrap_xfce_itembar_get_child_expand(PyGObject *self, PyObject *args, PyObject *k
PyGObject *item;
int ret;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:XfceItembar.get_child_expand", kwlist, &PyGtkWidget_Type, &item))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:XfceItembar.get_child_expand", kwlist, &PyGtkWidget_Type, &item))
return NULL;
+
ret = xfce_itembar_get_child_expand(XFCE_ITEMBAR(self->obj), GTK_WIDGET(item->obj));
+
return PyBool_FromLong(ret);
}
@@ -165,7 +211,9 @@ _wrap_xfce_itembar_get_n_items(PyGObject *self)
{
int ret;
+
ret = xfce_itembar_get_n_items(XFCE_ITEMBAR(self->obj));
+
return PyInt_FromLong(ret);
}
@@ -176,9 +224,11 @@ _wrap_xfce_itembar_get_item_index(PyGObject *self, PyObject *args, PyObject *kwa
PyGObject *item;
int ret;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:XfceItembar.get_item_index", kwlist, &PyGtkWidget_Type, &item))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:XfceItembar.get_item_index", kwlist, &PyGtkWidget_Type, &item))
return NULL;
+
ret = xfce_itembar_get_item_index(XFCE_ITEMBAR(self->obj), GTK_WIDGET(item->obj));
+
return PyInt_FromLong(ret);
}
@@ -189,9 +239,11 @@ _wrap_xfce_itembar_get_nth_item(PyGObject *self, PyObject *args, PyObject *kwarg
int n;
GtkWidget *ret;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:XfceItembar.get_nth_item", kwlist, &n))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:XfceItembar.get_nth_item", kwlist, &n))
return NULL;
+
ret = xfce_itembar_get_nth_item(XFCE_ITEMBAR(self->obj), n);
+
/* pygobject_new handles NULL checking */
return pygobject_new((GObject *)ret);
}
@@ -199,7 +251,9 @@ _wrap_xfce_itembar_get_nth_item(PyGObject *self, PyObject *args, PyObject *kwarg
static PyObject *
_wrap_xfce_itembar_raise_event_window(PyGObject *self)
{
+
xfce_itembar_raise_event_window(XFCE_ITEMBAR(self->obj));
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -207,7 +261,9 @@ _wrap_xfce_itembar_raise_event_window(PyGObject *self)
static PyObject *
_wrap_xfce_itembar_lower_event_window(PyGObject *self)
{
+
xfce_itembar_lower_event_window(XFCE_ITEMBAR(self->obj));
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -217,7 +273,9 @@ _wrap_xfce_itembar_event_window_is_raised(PyGObject *self)
{
int ret;
+
ret = xfce_itembar_event_window_is_raised(XFCE_ITEMBAR(self->obj));
+
return PyBool_FromLong(ret);
}
@@ -229,9 +287,11 @@ _wrap_xfce_itembar_get_item_at_point(PyGObject *self, PyObject *args, PyObject *
int x, y;
GtkWidget *ret;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ii:XfceItembar.get_item_at_point", kwlist, &x, &y))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"ii:XfceItembar.get_item_at_point", kwlist, &x, &y))
return NULL;
+
ret = xfce_itembar_get_item_at_point(XFCE_ITEMBAR(self->obj), x, y);
+
/* pygobject_new handles NULL checking */
return pygobject_new((GObject *)ret);
}
@@ -242,71 +302,93 @@ _wrap_xfce_itembar_get_drop_index(PyGObject *self, PyObject *args, PyObject *kwa
static char *kwlist[] = { "x", "y", NULL };
int x, y, ret;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ii:XfceItembar.get_drop_index", kwlist, &x, &y))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"ii:XfceItembar.get_drop_index", kwlist, &x, &y))
return NULL;
+
ret = xfce_itembar_get_drop_index(XFCE_ITEMBAR(self->obj), x, y);
+
return PyInt_FromLong(ret);
}
-static PyMethodDef _PyXfceItembar_methods[] = {
- { "set_orientation", (PyCFunction)_wrap_xfce_itembar_set_orientation, METH_VARARGS|METH_KEYWORDS },
- { "get_orientation", (PyCFunction)_wrap_xfce_itembar_get_orientation, METH_NOARGS },
- { "insert", (PyCFunction)_wrap_xfce_itembar_insert, METH_VARARGS|METH_KEYWORDS },
- { "append", (PyCFunction)_wrap_xfce_itembar_append, METH_VARARGS|METH_KEYWORDS },
- { "prepend", (PyCFunction)_wrap_xfce_itembar_prepend, METH_VARARGS|METH_KEYWORDS },
- { "reorder_child", (PyCFunction)_wrap_xfce_itembar_reorder_child, METH_VARARGS|METH_KEYWORDS },
- { "set_child_expand", (PyCFunction)_wrap_xfce_itembar_set_child_expand, METH_VARARGS|METH_KEYWORDS },
- { "get_child_expand", (PyCFunction)_wrap_xfce_itembar_get_child_expand, METH_VARARGS|METH_KEYWORDS },
- { "get_n_items", (PyCFunction)_wrap_xfce_itembar_get_n_items, METH_NOARGS },
- { "get_item_index", (PyCFunction)_wrap_xfce_itembar_get_item_index, METH_VARARGS|METH_KEYWORDS },
- { "get_nth_item", (PyCFunction)_wrap_xfce_itembar_get_nth_item, METH_VARARGS|METH_KEYWORDS },
- { "raise_event_window", (PyCFunction)_wrap_xfce_itembar_raise_event_window, METH_NOARGS },
- { "lower_event_window", (PyCFunction)_wrap_xfce_itembar_lower_event_window, METH_NOARGS },
- { "event_window_is_raised", (PyCFunction)_wrap_xfce_itembar_event_window_is_raised, METH_NOARGS },
- { "get_item_at_point", (PyCFunction)_wrap_xfce_itembar_get_item_at_point, METH_VARARGS|METH_KEYWORDS },
- { "get_drop_index", (PyCFunction)_wrap_xfce_itembar_get_drop_index, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
+static const PyMethodDef _PyXfceItembar_methods[] = {
+ { "set_maximum_size", (PyCFunction)_wrap_xfce_itembar_set_maximum_size, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "set_allow_expand", (PyCFunction)_wrap_xfce_itembar_set_allow_expand, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "set_orientation", (PyCFunction)_wrap_xfce_itembar_set_orientation, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "get_orientation", (PyCFunction)_wrap_xfce_itembar_get_orientation, METH_NOARGS,
+ NULL },
+ { "insert", (PyCFunction)_wrap_xfce_itembar_insert, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "append", (PyCFunction)_wrap_xfce_itembar_append, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "prepend", (PyCFunction)_wrap_xfce_itembar_prepend, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "reorder_child", (PyCFunction)_wrap_xfce_itembar_reorder_child, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "set_child_expand", (PyCFunction)_wrap_xfce_itembar_set_child_expand, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "get_child_expand", (PyCFunction)_wrap_xfce_itembar_get_child_expand, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "get_n_items", (PyCFunction)_wrap_xfce_itembar_get_n_items, METH_NOARGS,
+ NULL },
+ { "get_item_index", (PyCFunction)_wrap_xfce_itembar_get_item_index, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "get_nth_item", (PyCFunction)_wrap_xfce_itembar_get_nth_item, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "raise_event_window", (PyCFunction)_wrap_xfce_itembar_raise_event_window, METH_NOARGS,
+ NULL },
+ { "lower_event_window", (PyCFunction)_wrap_xfce_itembar_lower_event_window, METH_NOARGS,
+ NULL },
+ { "event_window_is_raised", (PyCFunction)_wrap_xfce_itembar_event_window_is_raised, METH_NOARGS,
+ NULL },
+ { "get_item_at_point", (PyCFunction)_wrap_xfce_itembar_get_item_at_point, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "get_drop_index", (PyCFunction)_wrap_xfce_itembar_get_drop_index, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { NULL, NULL, 0, NULL }
};
-PyTypeObject PyXfceItembar_Type = {
+PyTypeObject G_GNUC_INTERNAL PyXfceItembar_Type = {
PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "itembar.Itembar", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
+ 0, /* ob_size */
+ "itembar.Itembar", /* tp_name */
+ sizeof(PyGObject), /* tp_basicsize */
+ 0, /* tp_itemsize */
/* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
+ (destructor)0, /* tp_dealloc */
+ (printfunc)0, /* tp_print */
+ (getattrfunc)0, /* tp_getattr */
+ (setattrfunc)0, /* tp_setattr */
+ (cmpfunc)0, /* tp_compare */
+ (reprfunc)0, /* tp_repr */
(PyNumberMethods*)0, /* tp_as_number */
(PySequenceMethods*)0, /* tp_as_sequence */
(PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
+ (hashfunc)0, /* tp_hash */
+ (ternaryfunc)0, /* tp_call */
+ (reprfunc)0, /* tp_str */
+ (getattrofunc)0, /* tp_getattro */
+ (setattrofunc)0, /* tp_setattro */
+ (PyBufferProcs*)0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
+ NULL, /* Documentation string */
+ (traverseproc)0, /* tp_traverse */
+ (inquiry)0, /* tp_clear */
+ (richcmpfunc)0, /* tp_richcompare */
offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- _PyXfceItembar_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
+ (getiterfunc)0, /* tp_iter */
+ (iternextfunc)0, /* tp_iternext */
+ (struct PyMethodDef*)_PyXfceItembar_methods, /* tp_methods */
+ (struct PyMemberDef*)0, /* tp_members */
+ (struct PyGetSetDef*)0, /* tp_getset */
+ NULL, /* tp_base */
+ NULL, /* tp_dict */
+ (descrgetfunc)0, /* tp_descr_get */
+ (descrsetfunc)0, /* tp_descr_set */
offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_xfce_itembar_new, /* tp_init */
+ (initproc)_wrap_xfce_itembar_new, /* tp_init */
(allocfunc)0, /* tp_alloc */
(newfunc)0, /* tp_new */
(freefunc)0, /* tp_free */
@@ -317,8 +399,8 @@ PyTypeObject PyXfceItembar_Type = {
/* ----------- functions ----------- */
-PyMethodDef pyitembar_functions[] = {
- { NULL, NULL, 0 }
+const PyMethodDef pyitembar_functions[] = {
+ { NULL, NULL, 0, NULL }
};
/* initialise stuff extension classes */
@@ -328,41 +410,37 @@ pyitembar_register_classes(PyObject *d)
PyObject *module;
if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
+ _PyGObject_Type = (PyTypeObject *)PyObject_GetAttrString(module, "GObject");
if (_PyGObject_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name GObject from gobject");
- return;
+ return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gobject");
- return;
+ return ;
}
if ((module = PyImport_ImportModule("gtk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkWidget_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Widget");
+ _PyGtkWidget_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Widget");
if (_PyGtkWidget_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name Widget from gtk");
- return;
+ return ;
}
- _PyGtkContainer_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Container");
+ _PyGtkContainer_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Container");
if (_PyGtkContainer_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name Container from gtk");
- return;
+ return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gtk");
- return;
+ return ;
}
-#line 367 "itembar.c"
+#line 445 "itembar.c"
pygobject_register_class(d, "XfceItembar", XFCE_TYPE_ITEMBAR, &PyXfceItembar_Type, Py_BuildValue("(O)", &PyGtkContainer_Type));
}
diff --git a/panel/plugin_iface.c b/panel/plugin_iface.c
index ae89147..9198560 100644
--- a/panel/plugin_iface.c
+++ b/panel/plugin_iface.c
@@ -232,6 +232,17 @@ _wrap_xfce_panel_plugin_register_menu(PyGObject *self, PyObject *args, PyObject
}
static PyObject *
+_wrap_xfce_panel_plugin_arrow_type(PyGObject *self)
+{
+ gint ret;
+
+
+ ret = xfce_panel_plugin_arrow_type(XFCE_PANEL_PLUGIN(self->obj));
+
+ return pyg_enum_from_gtype(GTK_TYPE_ARROW_TYPE, ret);
+}
+
+static PyObject *
_wrap_xfce_panel_plugin_lookup_rc_file(PyGObject *self)
{
gchar *ret;
@@ -330,6 +341,8 @@ static const PyMethodDef _PyXfcePanelPlugin_methods[] = {
NULL },
{ "register_menu", (PyCFunction)_wrap_xfce_panel_plugin_register_menu, METH_VARARGS|METH_KEYWORDS,
NULL },
+ { "arrow_type", (PyCFunction)_wrap_xfce_panel_plugin_arrow_type, METH_NOARGS,
+ NULL },
{ "lookup_rc_file", (PyCFunction)_wrap_xfce_panel_plugin_lookup_rc_file, METH_NOARGS,
NULL },
{ "save_location", (PyCFunction)_wrap_xfce_panel_plugin_save_location, METH_VARARGS|METH_KEYWORDS,
@@ -438,6 +451,6 @@ pyplugin_iface_register_classes(PyObject *d)
}
-#line 442 "plugin_iface.c"
+#line 455 "plugin_iface.c"
pyg_register_interface(d, "PanelPlugin", XFCE_TYPE_PANEL_PLUGIN, &PyXfcePanelPlugin_Type);
}
More information about the Xfce4-commits
mailing list