Added.

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

	* gtk/gdk.override (_wrap_gdk_color_parse): Added.

	* gtk/gtk.override (_wrap_gtk_label_get_selection_bounds):
	(_wrap_gtk_label_get_layout_offsets):
	(_wrap_gtk_button_box_get_child_size):
	(_wrap_gtk_button_box_get_child_ipadding): Added.

	* gtk/gtk.defs
	GtkAccelGroup.activate, attach, detach, groups_activate, add,
	remove:
	s/GtkObject/GObject/
	(gtk_adjustment_new) (GtkAdjustment.clamp_page): s/gfloat/gdouble/
	(GtkAdjustment.get_value): Added
	(GtkBin.get_child): Added
	(GtkBox.get_homogeneous): Added
	(GtkCellRenderer.event): Removed
	(GtkCellRenderer.activate): Added
	(GtkCellRenderer.start_editing): Added
	(GtkCellRenderer.set_fixed_size): Added
	(GtkCellRenderer.get_fixed_size): Added
	(GtkCheckMenuItem.get_activate): Added
	(gtk_color_selection_get_type): Added
	(gtk_color_selection_new): Added
	Removed old functions from gtkbindings.h.

4 files changed, 246 insertions, 67 deletions

diff --git a/ChangeLog b/ChangeLog
index cb1c4e3c..e5f5815c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2001-10-02  Johan Dahlin  <zilch.am@home.se>
+
+	* gtk/gdk.override (_wrap_gdk_color_parse): Added.
+
+	* gtk/gtk.override (_wrap_gtk_label_get_selection_bounds): 
+	(_wrap_gtk_label_get_layout_offsets): 
+	(_wrap_gtk_button_box_get_child_size): 
+	(_wrap_gtk_button_box_get_child_ipadding): Added.
+
+	* gtk/gtk.defs 
+	GtkAccelGroup.activate, attach, detach, groups_activate, add,
+	remove: 
+	s/GtkObject/GObject/
+	(gtk_adjustment_new) (GtkAdjustment.clamp_page): s/gfloat/gdouble/
+	(GtkAdjustment.get_value): Added
+	(GtkBin.get_child): Added
+	(GtkBox.get_homogeneous): Added
+	(GtkCellRenderer.event): Removed
+	(GtkCellRenderer.activate): Added
+	(GtkCellRenderer.start_editing): Added
+	(GtkCellRenderer.set_fixed_size): Added
+	(GtkCellRenderer.get_fixed_size): Added	
+	(GtkCheckMenuItem.get_activate): Added
+	(gtk_color_selection_get_type): Added
+	(gtk_color_selection_new): Added
+	Removed old functions from gtkbindings.h.
+
 2001-10-02  Matt Wilson  <msw@redhat.com>
 
 	* gtk/gdk.defs (gdk.screen_width): bound
diff --git a/gtk/gdk.override b/gtk/gdk.override
index 45d67625..220b2044 100644
--- a/gtk/gdk.override
+++ b/gtk/gdk.override
@@ -253,7 +253,27 @@ _wrap_gdk_draw_lines(PyGObject *self, PyObject *args, PyObject *kwargs)
 ignore
   gdk_color_copy gdk_color_free
   gdk_color_hash gdk_color_equal
-  gdk_color_parse
+%%
+override gdk_color_parse kwargs
+static PyObject *
+_wrap_gdk_color_parse(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+    static char *kwlist[] = { "spec", NULL };
+    const char *spec;
+    GdkColor color;
+    GdkColor *new_color;
+    
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:color_parse", kwlist,
+				     &spec))
+        return NULL;
+
+    gdk_color_parse (spec, &color);
+    
+    new_color = gdk_color_copy (&color);
+    
+    /* pyg_boxed_new handles NULL checking */    
+    return pyg_boxed_new (GDK_TYPE_COLOR, new_color, FALSE, TRUE);
+}
 %%
 override gdk_fontset_load kwargs
 static PyObject *
diff --git a/gtk/gtk.defs b/gtk/gtk.defs
index 92e816be..8a76026f 100644
--- a/gtk/gtk.defs
+++ b/gtk/gtk.defs
@@ -2042,11 +2042,11 @@
   (return-type "none")
 )
 
-(define-function accel_groups_activate
+(define-function groups_activate
   (c-name "gtk_accel_groups_activate")
   (return-type "gboolean")
   (parameters
-    '("GtkObject*" "object")
+    '("GObject*" "object")
     '("guint" "accel_key")
     '("GdkModifierType" "accel_mods")
   )
@@ -2067,7 +2067,7 @@
   (c-name "gtk_accel_group_attach")
   (return-type "none")
   (parameters
-    '("GtkObject*" "object")
+    '("GObject*" "object")
   )
 )
 
@@ -2076,7 +2076,7 @@
   (c-name "gtk_accel_group_detach")
   (return-type "none")
   (parameters
-    '("GtkObject*" "object")
+    '("GObject*" "object")
   )
 )
 
@@ -2118,7 +2118,7 @@
     '("guint" "accel_key")
     '("GdkModifierType" "accel_mods")
     '("GtkAccelFlags" "accel_flags")
-    '("GtkObject*" "object")
+    '("GObject*" "object")
     '("const-gchar*" "accel_signal")
   )
 )
@@ -2130,7 +2130,7 @@
   (parameters
     '("guint" "accel_key")
     '("GdkModifierType" "accel_mods")
-    '("GtkObject*" "object")
+    '("GObject*" "object")
   )
 )
 
@@ -2138,7 +2138,7 @@
   (c-name "gtk_accel_group_handle_add")
   (return-type "none")
   (parameters
-    '("GtkObject*" "object")
+    '("GObject*" "object")
     '("guint" "accel_signal_id")
     '("GtkAccelGroup*" "accel_group")
     '("guint" "accel_key")
@@ -2182,7 +2182,7 @@
   (c-name "gtk_accel_groups_from_object")
   (return-type "GSList*")
   (parameters
-    '("GtkObject*" "object")
+    '("GObject*" "object")
   )
 )
 
@@ -2190,7 +2190,7 @@
   (c-name "gtk_accel_group_entries_from_object")
   (return-type "GSList*")
   (parameters
-    '("GtkObject*" "object")
+    '("GObject*" "object")
   )
 )
 
@@ -2263,12 +2263,12 @@
   (is-constructor-of GtkAdjustment)
   (return-type "GtkObject*")
   (parameters
-    '("gfloat" "value" (default "0"))
-    '("gfloat" "lower" (default "0"))
-    '("gfloat" "upper" (default "0"))
-    '("gfloat" "step_incr" (default "0"))
-    '("gfloat" "page_incr" (default "0"))
-    '("gfloat" "page_size" (default "0"))
+    '("gdouble" "value" (default "0"))
+    '("gdouble" "lower" (default "0"))
+    '("gdouble" "upper" (default "0"))
+    '("gdouble" "step_incr" (default "0"))
+    '("gdouble" "page_incr" (default "0"))
+    '("gdouble" "page_size" (default "0"))
   )
 )
 
@@ -2289,17 +2289,23 @@
   (c-name "gtk_adjustment_clamp_page")
   (return-type "none")
   (parameters
-    '("gfloat" "lower")
-    '("gfloat" "upper")
+    '("gdouble" "lower")
+    '("gdouble" "upper")
   )
 )
 
+(define-method get_value
+  (of-object "GtkAdjustment")
+  (c-name "gtk_adjustment_get_value")
+  (return-type "gdouble")
+)
+
 (define-method set_value
   (of-object "GtkAdjustment")
   (c-name "gtk_adjustment_set_value")
   (return-type "none")
   (parameters
-    '("gfloat" "value")
+    '("gdouble" "value")
   )
 )
 
@@ -2423,62 +2429,73 @@
   )
 )
 
-
-;; From /opt/gtk2/include/gtk-2.0/gtk/gtkbin.h
-
-(define-function gtk_bin_get_type
-  (c-name "gtk_bin_get_type")
-  (return-type "GtkType")
-)
-
-
-
-;; From /opt/gtk2/include/gtk-2.0/gtk/gtkbindings.h
-
-(define-method init
-  (of-object "GtkPatternSpec")
-  (c-name "gtk_pattern_spec_init")
+(define-method set_child_secondary
+  (of-object "GtkButtonBox")
+  (c-name "gtk_button_box_set_child_secondary")
   (return-type "none")
   (parameters
-    '("const-gchar*" "pattern")
+    '("GtkWidget" "child")
+    '("gboolean" "is_secondary")
   )
 )
 
-(define-method free_segs
-  (of-object "GtkPatternSpec")
-  (c-name "gtk_pattern_spec_free_segs")
+(define-method set_child_size
+  (of-object "GtkButtonBox")
+  (c-name "gtk_button_box_set_child_size")
   (return-type "none")
+  (parameters
+    '("gint" "min_width")
+    '("gint" "min_height")
+  )
 )
 
-(define-function gtk_pattern_match
-  (c-name "gtk_pattern_match")
-  (return-type "gboolean")
+(define-method set_child_ipadding
+  (of-object "GtkButtonBox")
+  (c-name "gtk_button_box_set_child_ipadding")
+  (return-type "none")
   (parameters
-    '("GtkPatternSpec*" "pspec")
-    '("guint" "string_length")
-    '("const-gchar*" "string")
-    '("const-gchar*" "string_reversed")
+    '("gint" "ipad_x")
+    '("gint" "ipad_y")
   )
 )
 
-(define-function gtk_pattern_match_string
-  (c-name "gtk_pattern_match_string")
-  (return-type "gboolean")
+(define-method get_child_size
+  (of-object "GtkButtonBox")
+  (c-name "gtk_button_box_get_child_size")
+  (return-type "none")
   (parameters
-    '("GtkPatternSpec*" "pspec")
-    '("const-gchar*" "string")
+    '("gint*" "min_width")
+    '("gint*" "min_height")
   )
 )
 
-(define-function gtk_pattern_match_simple
-  (c-name "gtk_pattern_match_simple")
-  (return-type "gboolean")
+(define-method get_child_ipadding
+  (of-object "GtkButtonBox")
+  (c-name "gtk_button_box_get_child_ipadding")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "pattern")
-    '("const-gchar*" "string")
+    '("gint*" "ipad_x")
+    '("gint*" "ipad_y")
   )
 )
 
+
+;; From /opt/gtk2/include/gtk-2.0/gtk/gtkbin.h
+
+(define-function gtk_bin_get_type
+  (c-name "gtk_bin_get_type")
+  (return-type "GtkType")
+)
+
+(define-method get_child
+  (of-object "GtkBin")
+  (c-name "gtk_bin_get_child")
+  (return-type "GtkWidget*")
+)
+
+
+;; From /opt/gtk2/include/gtk-2.0/gtk/gtkbindings.h
+
 (define-function gtk_binding_set_new
   (c-name "gtk_binding_set_new")
   (return-type "GtkBindingSet*")
@@ -2617,6 +2634,12 @@
   )
 )
 
+(define-method get_homogeneous
+  (of-object "GtkBox")
+  (c-name "gtk_box_get_homogeneous")
+  (return-type "gboolean")
+)
+
 (define-method set_spacing
   (of-object "GtkBox")
   (c-name "gtk_box_set_spacing")
@@ -2921,10 +2944,10 @@
   )
 )
 
-(define-method event
+(define-method activate
   (of-object "GtkCellRenderer")
-  (c-name "gtk_cell_renderer_event")
-  (return-type "gint")
+  (c-name "gtk_cell_renderer_activate")
+  (return-type "gboolean")
   (parameters
     '("GdkEvent*" "event")
     '("GtkWidget*" "widget")
@@ -2935,6 +2958,39 @@
   )
 )
 
+(define-method start_editing
+  (of-object "GtkCellRenderer")
+  (c-name "gtk_cell_renderer_start_editing")
+  (return-type "gboolean")
+  (parameters
+    '("GdkEvent*" "event")
+    '("GtkWidget*" "widget")
+    '("gchar*" "path")
+    '("GdkRectangle*" "background_area")
+    '("GdkRectangle*" "cell_area")
+    '("guint" "flags")
+  )
+)
+
+(define-method set_fixed_size
+  (of-object "GtkCellRenderer")
+  (c-name "gtk_cell_renderer_set_fixed_size")
+  (return-type "none")
+  (parameters
+    '("gint" "width")
+    '("gint" "height")
+  )
+)
+
+(define-method get_fixed_size
+  (of-object "GtkCellRenderer")
+  (c-name "gtk_cell_renderer_get_fixed_size")
+  (return-type "none")
+  (parameters
+    '("gint*" "width")
+    '("gint*" "height")
+  )
+)
 
 
 ;; From /opt/gtk2/include/gtk-2.0/gtk/gtkcellrendererpixbuf.h
@@ -3075,6 +3131,12 @@
   )
 )
 
+(define-method get_active
+  (of-object "GtkCheckMenuItem")
+  (c-name "gtk_check_menu_item_get_active")
+  (return-type "gboolean")
+)
+
 (define-method toggled
   (of-object "GtkCheckMenuItem")
   (c-name "gtk_check_menu_item_toggled")
@@ -3898,15 +3960,6 @@
   (return-type "GtkWidget*")
 )
 
-(define-method set_update_policy
-  (of-object "GtkColorSelection")
-  (c-name "gtk_color_selection_set_update_policy")
-  (return-type "none")
-  (parameters
-    '("GtkUpdateType" "policy")
-  )
-)
-
 (define-method get_has_opacity_control
   (of-object "GtkColorSelection")
   (c-name "gtk_color_selection_get_has_opacity_control")
@@ -4009,6 +4062,33 @@
   (return-type "gboolean")
 )
 
+(define-method set_update_policy
+  (of-object "GtkColorSelection")
+  (c-name "gtk_color_selection_set_update_policy")
+  (return-type "none")
+  (parameters
+    '("GtkUpdateType" "policy")
+  )
+)
+
+(define-function gtk_color_selection_palette_from_string
+  (c-name "gtk_color_selection_palette_from_string")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "str")
+    '("GdkColor**" "colors")
+    '("gint" "n_colors")
+  )
+)
+
+(define-function gtk_color_selection_palette_to_string
+  (c-name "gtk_color_selection_palette_to_string")
+  (return-type "gchar*")
+  (parameters
+    '("const-GdkColor*" "colors")
+    '("gint" "n_colors")
+  )
+)
 
 
 ;; From /opt/gtk2/include/gtk-2.0/gtk/gtkcolorseldialog.h
diff --git a/gtk/gtk.override b/gtk/gtk.override
index fd673841..fb22c63a 100644
--- a/gtk/gtk.override
+++ b/gtk/gtk.override
@@ -245,6 +245,32 @@ _wrap_gtk_label_get(PyGObject *self, PyObject *args)
     return Py_None;
 }
 %%
+override gtk_label_get_selection_bounds
+static PyObject *
+_wrap_gtk_label_get_selection_bounds(PyGObject *self, PyObject *args)
+{
+    gint start;
+    gint end;
+
+    if (!PyArg_ParseTuple(args,":GtkLabel.get_selection_bounds"))
+        return NULL;
+    gtk_label_get_selection_bounds(GTK_LABEL(self->obj), &start, &end);
+    return Py_BuildValue("(ii)", start, end);
+}
+%%
+override gtk_label_get_layout_offsets
+static PyObject *
+_wrap_gtk_label_get_layout_offsets(PyGObject *self, PyObject *args)
+{
+    gint x;
+    gint y;
+
+    if (!PyArg_ParseTuple(args,":GtkLabel.get_layout_offsets"))
+        return NULL;
+    gtk_label_get_layout_offsets(GTK_LABEL(self->obj), &x, &y);
+    return Py_BuildValue("(ii)", x, y);
+}
+%%
 override gtk_window_set_geometry_hints kwargs
 static PyObject *
 _wrap_gtk_window_set_geometry_hints(PyGObject *self, PyObject *args,
@@ -1920,6 +1946,32 @@ _wrap_gtk_button_new(PyGObject *self, PyObject *args, PyObject *kwargs)
     return 0;
 }
 %%
+override gtk_button_box_get_child_size
+static PyObject *
+_wrap_gtk_button_box_get_child_size(PyGObject *self, PyObject *args)
+{
+    gint min_width;
+    gint min_height;
+
+    if (!PyArg_ParseTuple(args,":GtkButtonBox.get_child_size"))
+        return NULL;
+    gtk_button_box_get_child_size(GTK_BUTTON_BOX(self->obj), &min_width, &min_height);
+    return Py_BuildValue("(ii)", min_width, min_height);
+}
+%%
+override gtk_button_box_get_child_ipadding
+static PyObject *
+_wrap_gtk_button_box_get_child_ipadding(PyGObject *self, PyObject *args)
+{
+    gint ipad_x;
+    gint ipad_y;
+
+    if (!PyArg_ParseTuple(args,":GtkButtonBox.get_child_ipadding"))
+        return NULL;
+    gtk_button_box_get_child_ipadding(GTK_BUTTON_BOX(self->obj), &ipad_x, &ipad_y);
+    return Py_BuildValue("(ii)", ipad_x, ipad_y);
+}
+%%
 ignore gtk_toggle_button_new_with_label gtk_toggle_button_new_with_mnemonic
 %%
 override gtk_toggle_button_new kwargs