Modify ParseTuple to accept 6 argument, so we can use stock icons and

2001-10-04  Johan Dahlin  <zilch.am@home.se>

	* gtk/gtk.override (_wrap_gtk_item_factory_create_items): Modify
	ParseTuple to accept 6 argument, so we can use stock icons and gdkpixbufs.
	(_wrap_gtk_spin_button_get_range): Bound.
	(_wrap_gtk_spin_button_get_increments): Bound.

	* gtk/gtk.defs: rename gtk.gtk_* gtk.*.

3 files changed, 70 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index cf55b1b2..83cb7c9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-10-04  Johan Dahlin  <zilch.am@home.se>
+
+	* gtk/gtk.override (_wrap_gtk_item_factory_create_items): Modify
+	ParseTuple to accept 6 argument, so we can use stock icons and gdkpixbufs.
+	(_wrap_gtk_spin_button_get_range): Bound.
+	(_wrap_gtk_spin_button_get_increments): Bound.
+
+	* gtk/gtk.defs: rename gtk.gtk_* gtk.*.
+
 2001-10-04  James Henstridge  <james@daa.com.au>
 
 	* pygtk.spec: spec file changes.
diff --git a/gtk/gtk.defs b/gtk/gtk.defs
index 7d1875fd..287e772e 100644
--- a/gtk/gtk.defs
+++ b/gtk/gtk.defs
@@ -2520,7 +2520,7 @@
   )
 )
 
-(define-function gtk_bindings_activate
+(define-function bindings_activate
   (c-name "gtk_bindings_activate")
   (return-type "gboolean")
   (parameters
@@ -4081,7 +4081,7 @@
   )
 )
 
-(define-function gtk_color_selection_palette_to_string
+(define-function color_selection_palette_to_string
   (c-name "gtk_color_selection_palette_to_string")
   (return-type "gchar*")
   (parameters
@@ -6844,11 +6844,13 @@
 
 (define-function gtk_image_menu_item_new
   (c-name "gtk_image_menu_item_new")
+  (is-constructor-of GtkImageMenuItem)
   (return-type "GtkWidget*")
 )
 
 (define-function gtk_image_menu_item_new_with_label
   (c-name "gtk_image_menu_item_new_with_label")
+  (is-constructor-of GtkImageMenuItem)
   (return-type "GtkWidget*")
   (parameters
     '("const-gchar*" "label")
@@ -6857,6 +6859,7 @@
 
 (define-function gtk_image_menu_item_new_with_mnemonic
   (c-name "gtk_image_menu_item_new_with_mnemonic")
+  (is-constructor-of GtkImageMenuItem)
   (return-type "GtkWidget*")
   (parameters
     '("const-gchar*" "label")
@@ -6865,6 +6868,7 @@
 
 (define-function gtk_image_menu_item_new_from_stock
   (c-name "gtk_image_menu_item_new_from_stock")
+  (is-constructor-of GtkImageMenuItem)
   (return-type "GtkWidget*")
   (parameters
     '("const-gchar*" "stock_id")
@@ -7338,6 +7342,7 @@
 
 (define-function gtk_label_new_with_mnemonic
   (c-name "gtk_label_new_with_mnemonic")
+  (is-constructor-of GtkLabel)
   (return-type "GtkWidget*")
   (parameters
     '("const-char*" "str")
@@ -10589,6 +10594,7 @@
 
 (define-function gtk_separator_menu_item_new
   (c-name "gtk_separator_menu_item_new")
+  (is-constructor-of GtkSeparatorMenuItem)
   (return-type "GtkWidget*")
 )
 
@@ -10600,7 +10606,7 @@
   (return-type "GType")
 )
 
-(define-function gtk_settings_get_default
+(define-function settings_get_default
   (c-name "gtk_settings_get_default")
   (return-type "GtkSettings*")
 )
@@ -10823,6 +10829,7 @@
 
 (define-function gtk_spin_button_new_with_range
   (c-name "gtk_spin_button_new_with_range")
+  (is-constructor-of GtkSpinButton)
   (return-type "GtkWidget*")
   (parameters
     '("gdouble" "min")
@@ -12601,6 +12608,7 @@
 
 (define-function gtk_text_child_anchor_new
   (c-name "gtk_text_child_anchor_new")
+  (is-constructor-of GtkTextChildAnchor)
   (return-type "GtkTextChildAnchor*")
 )
 
@@ -14437,6 +14445,7 @@
 
 (define-function gtk_tree_row_reference_new
   (c-name "gtk_tree_row_reference_new")
+  (is-constructor-of GtkTreeRowReference)
   (return-type "GtkTreeRowReference*")
   (parameters
     '("GtkTreeModel*" "model")
@@ -14446,6 +14455,7 @@
 
 (define-function gtk_tree_row_reference_new_proxy
   (c-name "gtk_tree_row_reference_new_proxy")
+  (is-constructor-of GtkTreeRowReference)
   (return-type "GtkTreeRowReference*")
   (parameters
     '("GObject*" "proxy")
@@ -14466,7 +14476,7 @@
   (return-type "none")
 )
 
-(define-function gtk_tree_row_reference_inserted
+(define-function tree_row_reference_inserted
   (c-name "gtk_tree_row_reference_inserted")
   (return-type "none")
   (parameters
@@ -14475,7 +14485,7 @@
   )
 )
 
-(define-function gtk_tree_row_reference_deleted
+(define-function tree_row_reference_deleted
   (c-name "gtk_tree_row_reference_deleted")
   (return-type "none")
   (parameters
diff --git a/gtk/gtk.override b/gtk/gtk.override
index fb22c63a..6fbfaba5 100644
--- a/gtk/gtk.override
+++ b/gtk/gtk.override
@@ -271,6 +271,32 @@ _wrap_gtk_label_get_layout_offsets(PyGObject *self, PyObject *args)
     return Py_BuildValue("(ii)", x, y);
 }
 %%
+override gtk_spin_button_get_increments
+static PyObject *
+_wrap_gtk_spin_button_get_increments(PyGObject *self, PyObject *args)
+{
+    gdouble step;
+    gdouble page;
+
+    if (!PyArg_ParseTuple(args,":GtkSpinButton.get_increments"))
+        return NULL;
+    gtk_spin_button_get_increments(GTK_SPIN_BUTTON(self->obj), &step, &page);
+    return Py_BuildValue("(dd)", step, page);
+}
+%%
+override gtk_spin_button_get_range
+static PyObject *
+_wrap_gtk_spin_button_get_range(PyGObject *self, PyObject *args)
+{
+    gdouble min;
+    gdouble max;
+
+    if (!PyArg_ParseTuple(args,":GtkSpinButton.get_range"))
+        return NULL;
+    gtk_spin_button_get_range(GTK_SPIN_BUTTON(self->obj), &min, &max);
+    return Py_BuildValue("(dd)", min, max);
+}
+%%
 override gtk_window_set_geometry_hints kwargs
 static PyObject *
 _wrap_gtk_window_set_geometry_hints(PyGObject *self, PyObject *args,
@@ -1810,6 +1836,7 @@ _wrap_gtk_item_factory_create_items(PyGObject *self, PyObject *args,
     static char *kwlist[] = { "entries", NULL };
     PyObject *list, *cb;
     GtkItemFactoryEntry ent;
+    PyObject *extra_data = NULL;
     GtkItemFactory *ifact;
     int i, len;
 
@@ -1822,15 +1849,30 @@ _wrap_gtk_item_factory_create_items(PyGObject *self, PyObject *args,
     for (i = 0; i < len; i++) {
 	PyObject *item = PyList_GetItem(list, i);
 
-	if (!PyArg_ParseTuple(item, "zzOiz", &(ent.path), &(ent.accelerator),
-			      &cb, &(ent.callback_action), &(ent.item_type)))
+	if (!PyArg_ParseTuple(item, "zzOiz|O", &(ent.path), &(ent.accelerator),
+			      &cb, &(ent.callback_action), &(ent.item_type),
+			      ent.extra_data)) {
 	    return NULL;
-	if (cb == Py_None)
+	}
+	
+	if (cb == Py_None) {
 	    ent.callback = NULL;
-	else {
+	} else {
 	    Py_INCREF(cb);
 	    ent.callback = (GtkItemFactoryCallback)pygtk_item_factory_cb;
 	}
+	
+	if(extra_data != NULL) {
+	     if(PyString_Check(extra_data)) {
+	          ent.extra_data = PyString_AsString(extra_data);
+	     } else if(pygobject_check(dest, &PyGdkPixbuf_Type)) {
+	          ent.extra_data = GDK_PIXBUF(self->obj)
+	     } else {
+                  PyErr_SetString(PyExc_TypeError, 
+                        "last argument must be a GdkPixBuf or a string");
+		  return NULL;
+	     }
+	}
 	gtk_item_factory_create_item(ifact, &ent, cb, 1);
     }
     Py_INCREF(Py_None);