Add.

	* gtk/gdk.defs (set_urgency_hint): Add.

	* gtk/gtktreeview.override (_wrap_gtk_tree_view_get_visible_range):
	Add.

	* gtk/gtk.defs (set_drag_dest_item): Allow path to be None.
	(get_visible_range): Add.

	* gtk/gtk.defs (set_cursor): Allow cell to be None

	* gtk/gtkwidget.override (_wrap_gtk_drag_source_set_icon_name1): Add.

	* gtk/gtk.defs (gtk_drag_source_set_icon_name): Add as a widget method
	and deprecate function gtk.drag_source_set_icon_name.

	* gtk/gdk.defs (set_icon_name): Add.

	* gtk/gtktextview.override (_wrap_gtk_text_view_get_iter_at_position):
	Add.

	* gtk/gtk.override (_wrap_gtk_clipboard_request_image): Add.

	* gtk/gtk.defs (gtk_alternative_dialog_button_order)
	(gtk_clipboard_request_image, gtk_clipboard_wait_for_image)
	(gtk_clipboard_set_image, gtk_clipboard_wait_is_image_available)
	(drag_source_add_iamge_targets, drag_source_add_uri_targets):
	Add defs.

7 files changed, 243 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 537766a0..a41b2be4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+2005-09-06  John Finlay  <finlay@moeraki.com>
+
+	* gtk/gdk.defs (set_urgency_hint): Add.
+
+	* gtk/gtktreeview.override (_wrap_gtk_tree_view_get_visible_range):
+	Add.
+
+	* gtk/gtk.defs (set_drag_dest_item): Allow path to be None.
+	(get_visible_range): Add.
+
+2005-09-05  John Finlay  <finlay@moeraki.com>
+
+	* gtk/gtk.defs (set_cursor): Allow cell to be None
+
+	* gtk/gtkwidget.override (_wrap_gtk_drag_source_set_icon_name1): Add.
+
+	* gtk/gtk.defs (gtk_drag_source_set_icon_name): Add as a widget method
+	and deprecate function gtk.drag_source_set_icon_name.
+
+	* gtk/gdk.defs (set_icon_name): Add.
+
+	* gtk/gtktextview.override (_wrap_gtk_text_view_get_iter_at_position):
+	Add.
+
+	* gtk/gtk.override (_wrap_gtk_clipboard_request_image): Add.
+
+	* gtk/gtk.defs (gtk_alternative_dialog_button_order)
+	(gtk_clipboard_request_image, gtk_clipboard_wait_for_image)
+	(gtk_clipboard_set_image, gtk_clipboard_wait_is_image_available)
+	(drag_source_add_iamge_targets, drag_source_add_uri_targets):
+	Add defs.
+
 2005-09-02  Johan Dahlin  <jdahlin@async.com.br>
 
 	* gobject/pygparamspec.c (pyg_param_spec_getattr): Sort all attributes
diff --git a/gtk/gdk.defs b/gtk/gdk.defs
index 6df92994..c9d055d6 100644
--- a/gtk/gdk.defs
+++ b/gtk/gdk.defs
@@ -3940,6 +3940,15 @@
     '("const-GdkPointerHooks*" "new_hooks")
   )
 )
+(define-method set_urgency_hint
+  (of-object "GdkWindow")
+  (c-name "gdk_window_set_urgency_hint")
+  (return-type "none")
+  (parameters
+    '("gboolean" "urgent")
+  )
+)
+
 
 
 ;;; XXXX functions from GTK that extend GDK types.
@@ -4012,6 +4021,17 @@
   (return-type "none")
 )
 
+(define-method set_icon_name
+  (of-object "GdkDragContext")
+  (c-name "gtk_drag_set_icon_name")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "icon_name")
+    '("gint" "hot_x")
+    '("gint" "hot_y")
+  )
+)
+
 
 ;; From /opt/gtk2/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h
 
diff --git a/gtk/gtk.defs b/gtk/gtk.defs
index 133ee5d2..88866b52 100644
--- a/gtk/gtk.defs
+++ b/gtk/gtk.defs
@@ -2844,6 +2844,37 @@
   )
 )
 
+(define-method request_image
+  (of-object "GtkClipboard")
+  (c-name "gtk_clipboard_request_image")
+  (return-type "none")
+  (parameters
+    '("GtkClipboardImageReceivedFunc" "callback")
+    '("gpointer" "user_data")
+  )
+)
+
+(define-method wait_for_image
+  (of-object "GtkClipboard")
+  (c-name "gtk_clipboard_wait_for_image")
+  (return-type "GdkPixbuf*")
+)
+
+(define-method set_image
+  (of-object "GtkClipboard")
+  (c-name "gtk_clipboard_set_image")
+  (return-type "none")
+  (parameters
+    '("GdkPixbuf*" "pixbuf")
+  )
+)
+
+(define-method wait_is_image_available
+  (of-object "GtkClipboard")
+  (c-name "gtk_clipboard_wait_is_image_available")
+  (return-type "gboolean")
+)
+
 
 
 ;; From /opt/gtk2/include/gtk-2.0/gtk/gtkclist.h
@@ -5464,6 +5495,14 @@
   )
 )
 
+(define-function alternative_dialog_button_order
+  (c-name "gtk_alternative_dialog_button_order")
+  (return-type "gboolean")
+  (parameters
+    '("GdkScreen*" "screen" (null-ok) (default "NULL"))
+  )
+)
+
 
 ;; From /opt/gtk2/include/gtk-2.0/gtk/gtkdnd.h
 
@@ -5605,6 +5644,15 @@
   )
 )
 
+(define-method drag_source_set_icon_name
+  (of-object "GtkWidget")
+  (c-name "gtk_drag_source_set_icon_name")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "icon_name")
+  )
+)
+
 (define-method drag_source_get_target_list
   (of-object "GtkWidget")
   (c-name "gtk_drag_source_get_target_list")
@@ -5669,6 +5717,18 @@
   (return-type "none")
 )
 
+(define-method drag_source_add_image_targets
+  (of-object "GtkWidget")
+  (c-name "gtk_drag_source_add_image_targets")
+  (return-type "none")
+)
+
+(define-method drag_source_add_uri_targets
+  (of-object "GtkWidget")
+  (c-name "gtk_drag_source_add_uri_targets")
+  (return-type "none")
+)
+
 (define-function target_list_add_text_targets
   (c-name "gtk_target_list_add_text_targets")
   (return-type "none")
@@ -5706,12 +5766,13 @@
 )
 
 (define-function drag_source_set_icon_name
-  (c-name "gtk_drag_source_set_icon_name")
+  (c-name "gtk_drag_source_set_icon_name1")
   (return-type "none")
   (parameters
     '("GtkWidget*" "widget")
     '("const-gchar*" "icon_name")
   )
+  (deprecated "use GtkWidget.drag_source_set_icon_name")
 )
 
 ;; From /opt/gtk2/include/gtk-2.0/gtk/gtkdrawingarea.h
@@ -8580,7 +8641,7 @@
   (c-name "gtk_icon_source_set_icon_name")
   (return-type "none")
   (parameters
-    '("const-gchar*" "icon_name")
+    '("const-gchar*" "icon_name" (null-ok))
   )
 )
 
@@ -9297,7 +9358,7 @@
   (return-type "none")
   (parameters
     '("GtkTreePath*" "path")
-    '("GtkCellRenderer*" "cell")
+    '("GtkCellRenderer*" "cell" (null-ok))
     '("gboolean" "start_editing")
   )
 )
@@ -9379,7 +9440,7 @@
   (c-name "gtk_icon_view_set_drag_dest_item")
   (return-type "none")
   (parameters
-    '("GtkTreePath*" "path")
+    '("GtkTreePath*" "path" (null-ok))
     '("GtkIconViewDropPosition" "pos")
   )
 )
@@ -19780,7 +19841,7 @@
   (c-name "gtk_tool_button_set_icon_name")
   (return-type "none")
   (parameters
-    '("const-gchar*" "icon_name")
+    '("const-gchar*" "icon_name" (null-ok))
   )
 )
 
@@ -22155,6 +22216,16 @@
   )
 )
 
+(define-method get_visible_range
+  (of-object "GtkTreeView")
+  (c-name "gtk_tree_view_get_visible_range")
+  (return-type "gboolean")
+  (parameters
+    '("GtkTreePath**" "start_path")
+    '("GtkTreePath**" "end_path")
+  )
+)
+
 (define-virtual set_scroll_adjustments
   (of-object "GtkTreeView")
   (return-type "none")
diff --git a/gtk/gtk.override b/gtk/gtk.override
index 5edf2f14..3e5a735d 100644
--- a/gtk/gtk.override
+++ b/gtk/gtk.override
@@ -7025,3 +7025,55 @@ _wrap_gtk_border_free(PyObject *self)
     Py_INCREF(Py_None);
     return Py_None;
 }
+%%
+override gtk_clipboard_request_image kwargs
+static void
+clipboard_request_image_cb(GtkClipboard *clipboard,
+			  GdkPixbuf *pixbuf,
+			  gpointer user_data)
+{
+    PyGILState_STATE state;
+    PyObject *callback, *args, *ret, *py_image;
+
+    if (pixbuf) {
+        py_image = pygobject_new((GObject *)pixbuf);
+    } else {
+        py_image = Py_None;
+        Py_INCREF(Py_None);
+    }
+
+    state = pyg_gil_state_ensure();
+    callback = PyTuple_GetItem((PyObject *)user_data, 0);
+    args = Py_BuildValue("(NNO)",
+			 pygobject_new((GObject *)clipboard),
+                         py_image,
+			 PyTuple_GetItem((PyObject *)user_data, 1));
+    ret = PyObject_CallObject(callback, args);
+    if (!ret)
+	PyErr_Print();
+    Py_XDECREF(ret);
+    pyg_gil_state_release(state);
+}
+static PyObject *
+_wrap_gtk_clipboard_request_image(PyGObject *self, PyObject *args,
+				 PyObject *kwargs)
+{
+    static char *kwlist[] = { "callback", "user_data", NULL };
+    PyObject *callback, *data, *user_data = Py_None;
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
+                                     "O|O:GtkClipboard.request_image",
+				     kwlist, &callback, &user_data))
+        return NULL;
+    if (!PyCallable_Check(callback)) {
+	PyErr_SetString(PyExc_TypeError, "callback must be callable");
+	return NULL;
+    }
+
+    data = Py_BuildValue("(OO)", callback, user_data);
+    gtk_clipboard_request_image(GTK_CLIPBOARD(self->obj),
+			       clipboard_request_image_cb,
+			       (gpointer)data);
+    Py_INCREF(Py_None);
+    return Py_None;
+}
diff --git a/gtk/gtktextview.override b/gtk/gtktextview.override
index 7901b56b..252f294b 100644
--- a/gtk/gtktextview.override
+++ b/gtk/gtktextview.override
@@ -1234,3 +1234,23 @@ _wrap_gtk_text_iter_backward_find_char(PyGObject *self, PyObject *args,
 
     return PyBool_FromLong(ret);
 }
+%%
+override gtk_text_view_get_iter_at_position kwargs
+static PyObject *
+_wrap_gtk_text_view_get_iter_at_position(PyGObject *self, PyObject *args,
+                                         PyObject *kwargs)
+{
+    static char *kwlist[] = { "x", "y", NULL };
+    GtkTextIter iter;
+    gint x, y, trailing;
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
+                                     "ii:GtkTextView.get_iter_at_position",
+                                     kwlist, &x, &y))
+        return NULL;
+    gtk_text_view_get_iter_at_position(GTK_TEXT_VIEW(self->obj),
+                                       &iter, &trailing, x, y);
+    return Py_BuildValue("Oi",
+                          pyg_boxed_new(GTK_TYPE_TEXT_ITER, &iter, TRUE, TRUE),
+                          trailing);
+}
diff --git a/gtk/gtktreeview.override b/gtk/gtktreeview.override
index 3082e3e5..19a4fa28 100644
--- a/gtk/gtktreeview.override
+++ b/gtk/gtktreeview.override
@@ -3141,3 +3141,24 @@ _wrap_gtk_tree_view_set_row_separator_func(PyGObject *self, PyObject *args,
     Py_INCREF(Py_None);
     return Py_None;
 }
+%%
+override gtk_tree_view_get_visible_range noargs
+static PyObject *
+_wrap_gtk_tree_view_get_visible_range(PyGObject *self)
+{
+    GtkTreePath *start_path, *end_path;
+    gboolean r;
+    
+    r = gtk_tree_view_get_visible_range(GTK_TREE_VIEW(self->obj),
+					&start_path, &end_path);
+    if (r) {
+        PyObject *py_start_path = pygtk_tree_path_to_pyobject(start_path);
+        PyObject *py_end_path = pygtk_tree_path_to_pyobject(end_path);
+        gtk_tree_path_free(start_path);
+        gtk_tree_path_free(end_path); 
+       return Py_BuildValue("(NN)", py_start_path, py_end_path);
+    }
+
+    Py_INCREF(Py_None);
+    return Py_None;
+}
diff --git a/gtk/gtkwidget.override b/gtk/gtkwidget.override
index 53768c04..25d2fc1f 100644
--- a/gtk/gtkwidget.override
+++ b/gtk/gtkwidget.override
@@ -446,3 +446,25 @@ _wrap_gtk_widget_set_set_scroll_adjustments_signal(PyObject *cls,
      Py_INCREF(Py_None);
      return Py_None;
 }
+%%
+override gtk_drag_source_set_icon_name1 kwargs
+static PyObject *
+_wrap_gtk_drag_source_set_icon_name1(PyGObject *self, PyObject *args, PyObject *kwargs)
+{
+    static char *kwlist[] = { "widget", "icon_name", NULL };
+    PyGObject *widget;
+    PyObject *icon_name, *ret, *nargs;
+
+    if (PyErr_Warn(PyExc_DeprecationWarning, "use gtk.Widget.drag_source_set_icon_name") < 0)
+        return NULL;
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
+				     "O!s:gtk.drag_source_set_icon_name",
+                                     kwlist, &PyGtkWidget_Type, &widget,
+                                     &icon_name))
+	return NULL;
+    nargs = Py_BuildValue("(s)", icon_name);
+    ret = _wrap_gtk_drag_source_set_icon_name(widget, nargs, NULL);
+    Py_DECREF(nargs);
+    return ret;
+}