a wrapper for the new function.

1999-07-19  James Henstridge  <james@daa.com.au>

	* gtk.py (GtkAdjustment.set_all): a wrapper for the new function.

	* gtkmodule.c (_wrap_gtk_adjustment_set_all): simple wrapper for
	setting values on an adjustment.

	* gtk.py (GtkCList.get_column_width): a wrapper for this new function.

	* gtkmodule.c (_wrap_gtk_clist_get_column_width): a function to get
	the column width for a column in a clist.

	* gtk.py (_filtprops): convert GtkAccelGroup and GdkImlibImage types
	back to the C equivalents.  This makes adding GnomeCanvasImage items
	to the GnomeCanvas easier.
	(GtkCTree.node_get_selectable): added wrapper function.

1999-07-18  James Henstridge  <james@daa.com.au>

	* gtkmodule.c (_wrap_gdk_threads_enter): don't use PyGTK_BLOCK_THREADS,
	since it should only be called outside the gtk main loop.  Instead
	use Py_BEGIN_ALLOW_THREADS.

3 files changed, 67 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index ee9d2d3f..bcec725c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,26 @@
+1999-07-19  James Henstridge  <james@daa.com.au>
+
+	* gtk.py (GtkAdjustment.set_all): a wrapper for the new function.
+
+	* gtkmodule.c (_wrap_gtk_adjustment_set_all): simple wrapper for
+	setting values on an adjustment.
+
+	* gtk.py (GtkCList.get_column_width): a wrapper for this new function.
+
+	* gtkmodule.c (_wrap_gtk_clist_get_column_width): a function to get
+	the column width for a column in a clist.
+
+	* gtk.py (_filtprops): convert GtkAccelGroup and GdkImlibImage types
+	back to the C equivalents.  This makes adding GnomeCanvasImage items
+	to the GnomeCanvas easier.
+	(GtkCTree.node_get_selectable): added wrapper function.
+
 1999-07-18  James Henstridge  <james@daa.com.au>
 
+	* gtkmodule.c (_wrap_gdk_threads_enter): don't use PyGTK_BLOCK_THREADS,
+	since it should only be called outside the gtk main loop.  Instead
+	use Py_BEGIN_ALLOW_THREADS.
+
 	* examples/gl/*: new examples of use of gtkgl.
 	
 	* gtkgl.py: renamed from GtkGL.py.
diff --git a/gtk.py b/gtk.py
index 1a8687a2..fc540ee0 100644
--- a/gtk.py
+++ b/gtk.py
@@ -179,6 +179,11 @@ class GtkAdjustment(GtkData):
 		return GtkData.__getattr__(self, attr)
 	def set_value(self, value):
 		_gtk.gtk_adjustment_set_value(self._o, value)
+	def set_all(self, value, lower, upper, step_increment, page_increment,
+		    page_size):
+		_gtk.gtk_adjustment_set_all(self._o, value, lower, upper,
+					    step_increment, page_increment,
+					    page_size)
 	def clamp_page(self, lower, upper):
 		_gtk.gtk_adjustment_clamp_page(self._o, lower, upper)
 	def changed(self, obj=None):
@@ -1168,6 +1173,8 @@ class GtkCList(GtkContainer):
 		return _gtk.gtk_clist_get_column_title(self._o, col)
 	def get_column_widget(self, col):
 		return _obj2inst(_gtk.gtk_clist_get_column_widget(self._o,col))
+	def get_column_width(self, col):
+		return _gtk.gtk_clist_get_column_width(self._o, col)
 	def get_row_data(self, row):
 		return _gtk.gtk_clist_get_row_data(self._o, row)
 	def get_row_style(self, row):
@@ -1375,6 +1382,8 @@ class GtkCTree(GtkCList):
 					     is_leaf, expanded)
 	def node_set_shift(self, node, col, vert, horiz):
 		_gtk.gtk_ctree_node_set_shift(self._o, node, col, vert, horiz)
+	def node_get_selectable(self, node):
+		return _gtk.gtk_ctree_node_get_selectable(self._o, node)
 	def node_set_selectable(self, node, selectable):
 		_gtk.gtk_ctree_node_set_selectable(self._o, node, selectable)
 	def node_get_cell_type(self, node, col):
@@ -2449,6 +2458,10 @@ def _filtprops(props):
 		v = props[k]
 		if hasattr(v, '_o') and type(v._o) == _gtk.GtkObjectType:
 			props[k] = v._o
+		elif hasattr(v, '_ag') and type(v._ag)==_gtk.GtkAccelGroupType:
+			props[k] = v._ag
+		elif hasattr(v, '_im'):
+			props[k] = v._im
 
 def new(tp, **props):
 	if type(tp) == type(GtkObject):
diff --git a/gtkmodule.c b/gtkmodule.c
index 17bd08fc..327f576e 100644
--- a/gtkmodule.c
+++ b/gtkmodule.c
@@ -3403,6 +3403,25 @@ static PyObject *_wrap_gtk_object_remove_data(PyObject *self, PyObject *args) {
     return Py_None;
 }
 
+static PyObject *_wrap_gtk_adjustment_set_all(PyObject *self, PyObject *args) {
+    PyObject *obj;
+    double value, lower, upper, step_increment, page_increment, page_size;
+    GtkAdjustment *adj;
+    if (!PyArg_ParseTuple(args, "O!:gtk_adjustment_set_all", &PyGtk_Type,
+			  &obj, &value, &lower, &upper, &step_increment,
+			  &page_increment, &page_size))
+	return NULL;
+    adj = GTK_ADJUSTMENT(PyGtk_Get(obj));
+    adj->value = value;
+    adj->lower = lower;
+    adj->upper = upper;
+    adj->step_increment = step_increment;
+    adj->page_increment = page_increment;
+    adj->page_size = page_size;
+    Py_INCREF(Py_None);
+    return Py_None;
+}
+
 static PyObject *_wrap_gtk_widget_get_window(PyObject *self, PyObject *args) {
     GdkWindow *win;
     PyObject *obj;
@@ -4009,6 +4028,18 @@ static PyObject *_wrap_gtk_clist_get_selection_info(PyObject *s, PyObject *args)
   }
 }   
 
+static PyObject *_wrap_gtk_clist_get_column_width(PyObject *self, PyObject *args) {
+    PyObject *obj;
+    gint col;
+    if (!PyArg_ParseTuple(args, "O!i:gtk_clist_get_column_width", &PyGtk_Type,
+			  &obj, &col))
+	return NULL;
+    if (col >= 0 && col < GTK_CLIST(PyGtk_Get(obj))->columns)
+	return PyInt_FromLong(GTK_CLIST(PyGtk_Get(obj))->column[col].width);
+    else
+	return PyInt_FromLong(-1);
+}
+
 static PyObject *
 _wrap_gtk_combo_set_popdown_strings(PyObject *self, PyObject *args) {
   PyObject *obj, *list, *item;
@@ -5503,6 +5534,7 @@ static PyMethodDef _gtkmoduleMethods[] = {
     { "gtk_object_set_data", _wrap_gtk_object_set_data, 1 },
     { "gtk_object_get_data", _wrap_gtk_object_get_data, 1 },
     { "gtk_object_remove_data", _wrap_gtk_object_remove_data, 1 },
+    { "gtk_adjustment_set_all", _wrap_gtk_adjustment_set_all, 1 },
     { "gtk_widget_get_window", _wrap_gtk_widget_get_window, 1 },
     { "gtk_widget_get_allocation", _wrap_gtk_widget_get_allocation, 1 },
     { "gtk_widget_draw", _wrap_gtk_widget_draw, 1 },
@@ -5535,6 +5567,7 @@ static PyMethodDef _gtkmoduleMethods[] = {
     { "gtk_clist_get_row_data", _wrap_gtk_clist_get_row_data, 1 },
     { "gtk_clist_find_row_from_data", _wrap_gtk_clist_find_row_from_data, 1 },
     { "gtk_clist_get_selection_info", _wrap_gtk_clist_get_selection_info, 1 },
+    { "gtk_clist_get_column_width", _wrap_gtk_clist_get_column_width, 1 },
     { "gtk_combo_set_popdown_strings", _wrap_gtk_combo_set_popdown_strings,1 },
     { "gtk_curve_get_vector", _wrap_gtk_curve_get_vector, 1 },
     { "gtk_curve_set_vector", _wrap_gtk_curve_set_vector, 1 },