[pygtk/gtk-3.0: 33/55] Deprecated: Remove GtkToolbarChild

[John Stowers <jstowers src gnome org>]

commit d29a6e139f6d4c676ac33a41152e6bc10422a174
Author: John Stowers <john stowers gmail com>
Date:   Sat Jul 10 21:49:51 2010 +1200

    Deprecated: Remove GtkToolbarChild

 gtk/gtk-base-types.defs |   13 ----
 gtk/gtk-base.defs       |   52 --------------
 gtk/gtktoolbar.override |  175 -----------------------------------------------
 3 files changed, 0 insertions(+), 240 deletions(-)
---
diff --git a/gtk/gtk-base-types.defs b/gtk/gtk-base-types.defs
index 8dbfffa..8209281 100644
--- a/gtk/gtk-base-types.defs
+++ b/gtk/gtk-base-types.defs
@@ -861,19 +861,6 @@
   )
 )
 
-(define-enum ToolbarChildType
-  (in-module "Gtk")
-  (c-name "GtkToolbarChildType")
-  (gtype-id "GTK_TYPE_TOOLBAR_CHILD_TYPE")
-  (values
-    '("space" "GTK_TOOLBAR_CHILD_SPACE")
-    '("button" "GTK_TOOLBAR_CHILD_BUTTON")
-    '("togglebutton" "GTK_TOOLBAR_CHILD_TOGGLEBUTTON")
-    '("radiobutton" "GTK_TOOLBAR_CHILD_RADIOBUTTON")
-    '("widget" "GTK_TOOLBAR_CHILD_WIDGET")
-  )
-)
-
 (define-enum ToolbarSpaceStyle
   (in-module "Gtk")
   (c-name "GtkToolbarSpaceStyle")
diff --git a/gtk/gtk-base.defs b/gtk/gtk-base.defs
index 038c788..9243cff 100644
--- a/gtk/gtk-base.defs
+++ b/gtk/gtk-base.defs
@@ -18344,58 +18344,6 @@
   (deprecated "")
 )
 
-(define-method append_element
-  (of-object "GtkToolbar")
-  (c-name "gtk_toolbar_append_element")
-  (return-type "GtkWidget*")
-  (parameters
-    '("GtkToolbarChildType" "type")
-    '("GtkWidget*" "widget")
-    '("const-char*" "text")
-    '("const-char*" "tooltip_text")
-    '("const-char*" "tooltip_private_text")
-    '("GtkWidget*" "icon")
-    '("GtkSignalFunc" "callback")
-    '("gpointer" "user_data")
-  )
-  (deprecated "")
-)
-
-(define-method prepend_element
-  (of-object "GtkToolbar")
-  (c-name "gtk_toolbar_prepend_element")
-  (return-type "GtkWidget*")
-  (parameters
-    '("GtkToolbarChildType" "type")
-    '("GtkWidget*" "widget")
-    '("const-char*" "text")
-    '("const-char*" "tooltip_text")
-    '("const-char*" "tooltip_private_text")
-    '("GtkWidget*" "icon")
-    '("GtkSignalFunc" "callback")
-    '("gpointer" "user_data")
-  )
-  (deprecated "")
-)
-
-(define-method insert_element
-  (of-object "GtkToolbar")
-  (c-name "gtk_toolbar_insert_element")
-  (return-type "GtkWidget*")
-  (parameters
-    '("GtkToolbarChildType" "type")
-    '("GtkWidget*" "widget")
-    '("const-char*" "text")
-    '("const-char*" "tooltip_text")
-    '("const-char*" "tooltip_private_text")
-    '("GtkWidget*" "icon")
-    '("GtkSignalFunc" "callback")
-    '("gpointer" "user_data")
-    '("gint" "position")
-  )
-  (deprecated "")
-)
-
 (define-method append_widget
   (of-object "GtkToolbar")
   (c-name "gtk_toolbar_append_widget")
diff --git a/gtk/gtktoolbar.override b/gtk/gtktoolbar.override
index fddab8e..9cdd371 100644
--- a/gtk/gtktoolbar.override
+++ b/gtk/gtktoolbar.override
@@ -166,181 +166,6 @@ _wrap_gtk_toolbar_insert_stock(PyGObject *self, PyObject *args,
     return py_ret;
 }
 %%
-override gtk_toolbar_append_element kwargs
-static PyObject *
-_wrap_gtk_toolbar_append_element(PyGObject *self, PyObject *args,
-                                 PyObject *kwargs)
-{
-    static char *kwlist[] = { "type", "widget", "text", "tooltip_text",
-                              "tooltip_private_text", "icon", "callback",
-                              "user_data", NULL };
-    char *text, *tooltip_text, *tooltip_private_text;
-    PyObject *py_type, *callback, *param, *py_ret;
-    PyGObject *py_widget, *py_icon;
-    GtkWidget *widget = NULL, *icon = NULL, *ret;
-    GtkToolbarChildType type;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-                                     "OOzzzOOO:GtkToolbar.append_element",
-                                     kwlist,
-                                     &py_type, &py_widget,
-                                     &text, &tooltip_text,
-                                     &tooltip_private_text, &py_icon,
-                                     &callback, &param))
-        return NULL;
-    if (PyErr_Warn(PyExc_DeprecationWarning, "") < 0)
-        return NULL;
-    if (pyg_enum_get_value(GTK_TYPE_TOOLBAR_CHILD_TYPE,
-                           py_type, (gint *)&type))
-        return NULL;
-    if (pygobject_check(py_widget, &PyGtkWidget_Type))
-        widget = GTK_WIDGET(py_widget->obj);
-    else if ((PyObject *)py_widget != Py_None) {
-        PyErr_SetString(PyExc_TypeError,
-                        "second argument must be a GtkWidget or None");
-        return NULL;
-    }
-    if (pygobject_check(py_icon, &PyGtkWidget_Type))
-        icon = GTK_WIDGET(py_icon->obj);
-    else if ((PyObject *)py_icon != Py_None) {
-        PyErr_SetString(PyExc_TypeError,
-                        "sixth argument must be a GtkWidget or None");
-        return NULL;
-    }
-    ret = gtk_toolbar_append_element(GTK_TOOLBAR(self->obj), type, widget,
-                                     text, tooltip_text, tooltip_private_text,
-                                     icon, NULL, NULL);
-    py_ret = pygobject_new((GObject *)ret);
-    if (ret && PyCallable_Check(callback) &&
-        (type == GTK_TOOLBAR_CHILD_BUTTON ||
-         type == GTK_TOOLBAR_CHILD_TOGGLEBUTTON ||
-         type == GTK_TOOLBAR_CHILD_RADIOBUTTON)) {
-        GClosure *closure;
-
-        closure = pyg_closure_new(callback, param, NULL);
-        g_signal_connect_closure(ret, "clicked", closure, FALSE);
-        pygobject_watch_closure(py_ret, closure);
-    }
-    return py_ret;
-}
-%%
-override gtk_toolbar_prepend_element kwargs
-static PyObject *
-_wrap_gtk_toolbar_prepend_element(PyGObject *self, PyObject *args,
-                                  PyObject *kwargs)
-{
-    static char *kwlist[] = { "type", "widget", "text", "tooltip_text",
-                              "tooltip_private_text", "icon", "callback",
-                              "user_data", NULL };
-    char *text, *tooltip_text, *tooltip_private_text;
-    PyObject *py_type, *callback, *param, *py_ret;
-    PyGObject *py_widget, *py_icon;
-    GtkWidget *widget = NULL, *icon = NULL, *ret;
-    GtkToolbarChildType type;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-                                     "OOzzzOOO:GtkToolbar.prepend_element",
-                                     kwlist,
-                                     &py_type, &py_widget,
-                                     &text, &tooltip_text,
-                                     &tooltip_private_text, &py_icon,
-                                     &callback, &param))
-        return NULL;
-    if (PyErr_Warn(PyExc_DeprecationWarning, "") < 0)
-        return NULL;
-    if (pyg_enum_get_value(GTK_TYPE_TOOLBAR_CHILD_TYPE,
-                           py_type, (gint *)&type))
-        return NULL;
-    if (pygobject_check(py_widget, &PyGtkWidget_Type))
-        widget = GTK_WIDGET(py_widget->obj);
-    else if ((PyObject *)py_widget != Py_None) {
-        PyErr_SetString(PyExc_TypeError,
-                        "second argument must be a GtkWidget or None");
-        return NULL;
-    }
-    if (pygobject_check(py_icon, &PyGtkWidget_Type))
-        icon = GTK_WIDGET(py_icon->obj);
-    else if ((PyObject *)py_icon != Py_None) {
-        PyErr_SetString(PyExc_TypeError,
-                        "sixth argument must be a GtkWidget or None");
-        return NULL;
-    }
-    ret = gtk_toolbar_prepend_element(GTK_TOOLBAR(self->obj), type, widget,
-                                      text, tooltip_text, tooltip_private_text,
-                                      icon, NULL, NULL);
-    py_ret = pygobject_new((GObject *)ret);
-    if (ret && PyCallable_Check(callback) &&
-        (type == GTK_TOOLBAR_CHILD_BUTTON ||
-         type == GTK_TOOLBAR_CHILD_TOGGLEBUTTON ||
-         type == GTK_TOOLBAR_CHILD_RADIOBUTTON)) {
-        GClosure *closure;
-
-        closure = pyg_closure_new(callback, param, NULL);
-        g_signal_connect_closure(ret, "clicked", closure, FALSE);
-        pygobject_watch_closure(py_ret, closure);
-    }
-    return py_ret;
-}
-%%
-override gtk_toolbar_insert_element kwargs
-static PyObject *
-_wrap_gtk_toolbar_insert_element(PyGObject *self, PyObject *args,
-                                 PyObject *kwargs)
-{
-    static char *kwlist[] = { "type", "widget", "text", "tooltip_text",
-                              "tooltip_private_text", "icon", "callback",
-                              "user_data", "position", NULL };
-    char *text, *tooltip_text, *tooltip_private_text;
-    PyObject *py_type, *callback, *param, *py_ret;
-    PyGObject *py_widget, *py_icon;
-    GtkWidget *widget = NULL, *icon = NULL, *ret;
-    GtkToolbarChildType type;
-    int position;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-                                     "OOzzzOOOi:GtkToolbar.insert_element",
-                                     kwlist,
-                                     &py_type, &py_widget,
-                                     &text, &tooltip_text,
-                                     &tooltip_private_text, &py_icon,
-                                     &callback, &param, &position))
-        return NULL;
-    if (PyErr_Warn(PyExc_DeprecationWarning, "") < 0)
-        return NULL;
-    if (pyg_enum_get_value(GTK_TYPE_TOOLBAR_CHILD_TYPE,
-                           py_type, (gint *)&type))
-        return NULL;
-    if (pygobject_check(py_widget, &PyGtkWidget_Type))
-        widget = GTK_WIDGET(py_widget->obj);
-    else if ((PyObject *)py_widget != Py_None) {
-        PyErr_SetString(PyExc_TypeError,
-                        "second argument must be a GtkWidget or None");
-        return NULL;
-    }
-    if (pygobject_check(py_icon, &PyGtkWidget_Type))
-        icon = GTK_WIDGET(py_icon->obj);
-    else if ((PyObject *)py_icon != Py_None) {
-        PyErr_SetString(PyExc_TypeError,
-                        "sixth argument must be a GtkWidget or None");
-        return NULL;
-    }
-    ret = gtk_toolbar_insert_element(GTK_TOOLBAR(self->obj), type, widget,
-                                     text, tooltip_text, tooltip_private_text,
-                                     icon, NULL, NULL, position);
-    py_ret = pygobject_new((GObject *)ret);
-    if (ret && PyCallable_Check(callback) &&
-        (type == GTK_TOOLBAR_CHILD_BUTTON ||
-         type == GTK_TOOLBAR_CHILD_TOGGLEBUTTON ||
-         type == GTK_TOOLBAR_CHILD_RADIOBUTTON)) {
-        GClosure *closure;
-
-        closure = pyg_closure_new(callback, param, NULL);
-        g_signal_connect_closure(ret, "clicked", closure, FALSE);
-        pygobject_watch_closure(py_ret, closure);
-    }
-    return py_ret;
-}
-%%
 override gtk_toggle_tool_button_new kwargs
 static int
 _wrap_gtk_toggle_tool_button_new(PyGObject *self, PyObject *args,