[pygtk/gtk-3.0: 22/55] Deprecated: Remove GtkItemFactory

[John Stowers <jstowers src gnome org>]

commit 42af8b64d53ad4aaf4d5ac4c7478b16c42d387ee
Author: John Stowers <john stowers gmail com>
Date:   Sat Jul 10 20:08:01 2010 +1200

    Deprecated: Remove GtkItemFactory

 gtk/gtk-base-types.defs |    7 --
 gtk/gtk-base.defs       |  240 -----------------------------------------------
 gtk/gtk.override        |  115 ----------------------
 3 files changed, 0 insertions(+), 362 deletions(-)
---
diff --git a/gtk/gtk-base-types.defs b/gtk/gtk-base-types.defs
index 3c44d83..01f0902 100644
--- a/gtk/gtk-base-types.defs
+++ b/gtk/gtk-base-types.defs
@@ -1906,13 +1906,6 @@
   (gtype-id "GTK_TYPE_ITEM")
 )
 
-(define-object ItemFactory
-  (in-module "Gtk")
-  (parent "GtkObject")
-  (c-name "GtkItemFactory")
-  (gtype-id "GTK_TYPE_ITEM_FACTORY")
-)
-
 (define-object Label
   (in-module "Gtk")
   (parent "GtkMisc")
diff --git a/gtk/gtk-base.defs b/gtk/gtk-base.defs
index 88d4c1c..3de4949 100644
--- a/gtk/gtk-base.defs
+++ b/gtk/gtk-base.defs
@@ -9040,246 +9040,6 @@
   (return-type "none")
 )
 
-
-;; From /opt/gtk2/include/gtk-2.0/gtk/gtkitemfactory.h
-
-(define-function gtk_item_factory_get_type
-  (c-name "gtk_item_factory_get_type")
-  (return-type "GType")
-)
-
-(define-function gtk_item_factory_new
-  (c-name "gtk_item_factory_new")
-  (is-constructor-of "GtkItemFactory")
-  (return-type "GtkItemFactory*")
-  (parameters
-    '("GType" "container_type")
-    '("const-gchar*" "path")
-    '("GtkAccelGroup*" "accel_group" (null-ok) (default "NULL"))
-  )
-  (deprecated "use gtk.UIManager")
-)
-
-(define-method construct
-  (of-object "GtkItemFactory")
-  (c-name "gtk_item_factory_construct")
-  (return-type "none")
-  (parameters
-    '("GType" "container_type")
-    '("const-gchar*" "path")
-    '("GtkAccelGroup*" "accel_group")
-  )
-)
-
-(define-function item_factory_add_foreign
-  (c-name "gtk_item_factory_add_foreign")
-  (return-type "none")
-  (parameters
-    '("GtkWidget*" "accel_widget")
-    '("const-gchar*" "full_path")
-    '("GtkAccelGroup*" "accel_group")
-    '("guint" "keyval")
-    '("GdkModifierType" "modifiers")
-  )
-)
-
-(define-function item_factory_from_widget
-  (c-name "gtk_item_factory_from_widget")
-  (return-type "GtkItemFactory*")
-  (parameters
-    '("GtkWidget*" "widget")
-  )
-)
-
-(define-function item_factory_path_from_widget
-  (c-name "gtk_item_factory_path_from_widget")
-  (return-type "const-gchar*")
-  (parameters
-    '("GtkWidget*" "widget")
-  )
-)
-
-(define-method get_item
-  (of-object "GtkItemFactory")
-  (c-name "gtk_item_factory_get_item")
-  (return-type "GtkWidget*")
-  (parameters
-    '("const-gchar*" "path")
-  )
-)
-
-(define-method get_widget
-  (of-object "GtkItemFactory")
-  (c-name "gtk_item_factory_get_widget")
-  (return-type "GtkWidget*")
-  (parameters
-    '("const-gchar*" "path")
-  )
-)
-
-(define-method get_widget_by_action
-  (of-object "GtkItemFactory")
-  (c-name "gtk_item_factory_get_widget_by_action")
-  (return-type "GtkWidget*")
-  (parameters
-    '("guint" "action")
-  )
-)
-
-(define-method get_item_by_action
-  (of-object "GtkItemFactory")
-  (c-name "gtk_item_factory_get_item_by_action")
-  (return-type "GtkWidget*")
-  (parameters
-    '("guint" "action")
-  )
-)
-
-(define-method create_item
-  (of-object "GtkItemFactory")
-  (c-name "gtk_item_factory_create_item")
-  (return-type "none")
-  (parameters
-    '("GtkItemFactoryEntry*" "entry")
-    '("gpointer" "callback_data")
-    '("guint" "callback_type")
-  )
-)
-
-(define-method create_items
-  (of-object "GtkItemFactory")
-  (c-name "gtk_item_factory_create_items")
-  (return-type "none")
-  (parameters
-    '("guint" "n_entries")
-    '("GtkItemFactoryEntry*" "entries")
-    '("gpointer" "callback_data")
-  )
-)
-
-(define-method delete_item
-  (of-object "GtkItemFactory")
-  (c-name "gtk_item_factory_delete_item")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "path")
-  )
-)
-
-(define-method delete_entry
-  (of-object "GtkItemFactory")
-  (c-name "gtk_item_factory_delete_entry")
-  (return-type "none")
-  (parameters
-    '("GtkItemFactoryEntry*" "entry")
-  )
-)
-
-(define-method delete_entries
-  (of-object "GtkItemFactory")
-  (c-name "gtk_item_factory_delete_entries")
-  (return-type "none")
-  (parameters
-    '("guint" "n_entries")
-    '("GtkItemFactoryEntry*" "entries")
-  )
-)
-
-(define-method popup
-  (of-object "GtkItemFactory")
-  (c-name "gtk_item_factory_popup")
-  (return-type "none")
-  (parameters
-    '("guint" "x")
-    '("guint" "y")
-    '("guint" "mouse_button")
-    '("guint32" "time" (default "GDK_CURRENT_TIME"))
-  )
-)
-
-(define-method popup_with_data
-  (of-object "GtkItemFactory")
-  (c-name "gtk_item_factory_popup_with_data")
-  (return-type "none")
-  (parameters
-    '("gpointer" "popup_data")
-    '("GtkDestroyNotify" "destroy")
-    '("guint" "x")
-    '("guint" "y")
-    '("guint" "mouse_button")
-    '("guint32" "time" (default "GDK_CURRENT_TIME"))
-  )
-)
-
-(define-method popup_data
-  (of-object "GtkItemFactory")
-  (c-name "gtk_item_factory_popup_data")
-  (return-type "gpointer")
-)
-
-(define-function item_factory_popup_data_from_widget
-  (c-name "gtk_item_factory_popup_data_from_widget")
-  (return-type "gpointer")
-  (parameters
-    '("GtkWidget*" "widget")
-  )
-)
-
-(define-method set_translate_func
-  (of-object "GtkItemFactory")
-  (c-name "gtk_item_factory_set_translate_func")
-  (return-type "none")
-  (parameters
-    '("GtkTranslateFunc" "func")
-    '("gpointer" "data")
-    '("GtkDestroyNotify" "notify")
-  )
-)
-
-(define-function item_factory_from_path
-  (c-name "gtk_item_factory_from_path")
-  (return-type "GtkItemFactory*")
-  (parameters
-    '("const-gchar*" "path")
-  )
-  (deprecated "")
-)
-
-(define-function item_factory_create_menu_entries
-  (c-name "gtk_item_factory_create_menu_entries")
-  (return-type "none")
-  (parameters
-    '("guint" "n_entries")
-    '("GtkMenuEntry*" "entries")
-  )
-  (deprecated "")
-)
-
-(define-function item_factories_path_delete
-  (c-name "gtk_item_factories_path_delete")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "ifactory_path")
-    '("const-gchar*" "path")
-  )
-  (deprecated "")
-)
-
-(define-method create_items_ac
-  (of-object "GtkItemFactory")
-  (c-name "gtk_item_factory_create_items_ac")
-  (return-type "none")
-  (parameters
-    '("guint" "n_entries")
-    '("GtkItemFactoryEntry*" "entries")
-    '("gpointer" "callback_data")
-    '("guint" "callback_type")
-  )
-  (deprecated "")
-)
-
-
-
 ;; From /opt/gtk2/include/gtk-2.0/gtk/gtklabel.h
 
 (define-function gtk_label_get_type
diff --git a/gtk/gtk.override b/gtk/gtk.override
index e31d117..ca089c6 100644
--- a/gtk/gtk.override
+++ b/gtk/gtk.override
@@ -257,14 +257,6 @@ ignore
   gtk_init_check_abi_check
   gtk_input_add_full
   gtk_input_remove
-  gtk_item_factory_create_item
-  gtk_item_factory_create_items_ac
-  gtk_item_factory_create_menu_entries
-  gtk_item_factory_delete_entries
-  gtk_item_factory_delete_entry
-  gtk_item_factory_popup_data
-  gtk_item_factory_popup_with_data
-  gtk_item_factory_set_translate_func
   gtk_key_snooper_install
   gtk_key_snooper_remove
   gtk_list_item_new_with_label
@@ -1370,113 +1362,6 @@ _wrap_gtk_entry_get_layout_offsets(PyGObject *self, PyObject *args)
     return Py_BuildValue ("(ii)", x, y);
 }
 %%
-override gtk_item_factory_create_items kwargs
-static void
-pygtk_item_factory_cb(PyGtkCustomNotify *cunote,
-                      guint action, GtkWidget *widget)
-{
-    PyGILState_STATE state;
-    PyObject *ret;
-
-    state = pyg_gil_state_ensure();
-    if (cunote->data)
-        ret = PyObject_CallFunction(cunote->func, "OiO", cunote->data, action,
-                                    pygobject_new((GObject *)widget));
-    else
-        ret = PyObject_CallFunction(cunote->func, "iO", action,
-                                    pygobject_new((GObject *)widget));
-    if (ret == NULL) {
-        PyErr_Print();
-    } else
-        Py_DECREF(ret);
-    pyg_gil_state_release(state);
-}
-static PyObject *
-_wrap_gtk_item_factory_create_items(PyGObject *self, PyObject *args,
-                                    PyObject *kwargs)
-{
-    static char *kwlist[] = { "entries", "callback_data", NULL };
-    PyObject *list, *cb, *cbdata = NULL;
-    GtkItemFactoryEntry ent;
-    PyObject *extra_data = NULL;
-    GtkItemFactory *ifact;
-    int i, len;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-                                     "O|O:GtkItemFactory.create_items", kwlist,
-                                     &list, &cbdata))
-        return NULL;
-
-    if (!PySequence_Check(list)) {
-        PyErr_SetString(PyExc_TypeError, "entries must be a sequence");
-        return NULL;
-    }
-
-    ifact = GTK_ITEM_FACTORY(self->obj);
-    len = PySequence_Size(list);
-    for (i = 0; i < len; i++) {
-        PyGtkCustomNotify *cunote = NULL;
-        PyObject *item = PySequence_GetItem(list, i);
-        Py_DECREF(item);
-
-        memset(&ent, 0, sizeof(ent));
-        cb = Py_None;
-
-        if (!PyArg_ParseTuple(item, "s|zOizO", &(ent.path), &(ent.accelerator),
-                              &cb, &(ent.callback_action), &(ent.item_type),
-                              &extra_data)) {
-            return NULL;
-        }
-
-        if (cb == Py_None) {
-            ent.callback = NULL;
-        } else {
-            ent.callback = (GtkItemFactoryCallback)pygtk_item_factory_cb;
-            cunote = g_new0(PyGtkCustomNotify, 1);
-            cunote->func = cb;
-            cunote->data = cbdata;
-            Py_XINCREF(cunote->func);
-            Py_XINCREF(cunote->data);
-        }
-
-        if (extra_data != NULL) {
-            if (PyString_Check(extra_data)) {
-                ent.extra_data = PyString_AsString(extra_data);
-            } else if (pygobject_check(extra_data, &PyGdkPixbuf_Type)) {
-		/* create_items actually expects inline image data 
-		 * so let's create it for the user from the pixbuf
-		 * it's not optimal but it's convenient
-		 */  
-		GdkPixdata pixdata; 
-		GdkPixbuf * pixbuf;
-		guint8 * serialstr;
-		guint len;
-		
-		pixbuf = GDK_PIXBUF(pygobject_get(extra_data));
-		gdk_pixdata_from_pixbuf(&pixdata, pixbuf, FALSE);
-		serialstr = gdk_pixdata_serialize(&pixdata, &len);
-                ent.extra_data = serialstr;
-            } else {
-                PyErr_SetString(PyExc_TypeError,
-                                "last argument must be a GdkPixBuf or a string");
-                return NULL;
-            }
-        }
-        if (cunote != NULL) {
-	    PyGILState_STATE state;
-	    state = pyg_gil_state_ensure();
-            g_object_weak_ref(G_OBJECT(ifact),
-                              (GWeakNotify) pygtk_custom_destroy_notify,
-                              cunote);
-	    pyg_gil_state_release(state);
-        }
-
-        gtk_item_factory_create_item(ifact, &ent, cunote, 1);
-    }
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-%%
 override gtk_menu_popup kwargs
 static void
 pygtk_menu_position(GtkMenu *menu, int *x, int *y, gboolean *push_in,