Commit e83dca50 authored by Jonathan Blandford's avatar Jonathan Blandford Committed by Jonathan Blandford

Add "clicked" signal back to columns.

Tue Mar  6 17:25:07 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_clicked):
	Add "clicked" signal back to columns.

	* ChangeLog: remove conflict markers.
parent 71aa1161
Tue Mar 6 17:25:07 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_clicked):
Add "clicked" signal back to columns.
* ChangeLog: remove conflict markers.
Tue Mar 6 10:45:45 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkbutton.c: Add animation of activation by, on
......@@ -88,7 +95,6 @@ Mon Mar 5 14:38:54 2001 Jonathan Blandford <jrb@redhat.com>
parent_class pointer in pixbuf_style_class_init().
(Will commit the fix to the pixbuf-engine too).
>>>>>>> 1.1779
2001-03-05 Alexander Larsson <alexl@redhat.com>
* gdk/gdkwindow.h:
......
Tue Mar 6 17:25:07 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_clicked):
Add "clicked" signal back to columns.
* ChangeLog: remove conflict markers.
Tue Mar 6 10:45:45 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkbutton.c: Add animation of activation by, on
......@@ -88,7 +95,6 @@ Mon Mar 5 14:38:54 2001 Jonathan Blandford <jrb@redhat.com>
parent_class pointer in pixbuf_style_class_init().
(Will commit the fix to the pixbuf-engine too).
>>>>>>> 1.1779
2001-03-05 Alexander Larsson <alexl@redhat.com>
* gdk/gdkwindow.h:
......
Tue Mar 6 17:25:07 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_clicked):
Add "clicked" signal back to columns.
* ChangeLog: remove conflict markers.
Tue Mar 6 10:45:45 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkbutton.c: Add animation of activation by, on
......@@ -88,7 +95,6 @@ Mon Mar 5 14:38:54 2001 Jonathan Blandford <jrb@redhat.com>
parent_class pointer in pixbuf_style_class_init().
(Will commit the fix to the pixbuf-engine too).
>>>>>>> 1.1779
2001-03-05 Alexander Larsson <alexl@redhat.com>
* gdk/gdkwindow.h:
......
Tue Mar 6 17:25:07 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_clicked):
Add "clicked" signal back to columns.
* ChangeLog: remove conflict markers.
Tue Mar 6 10:45:45 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkbutton.c: Add animation of activation by, on
......@@ -88,7 +95,6 @@ Mon Mar 5 14:38:54 2001 Jonathan Blandford <jrb@redhat.com>
parent_class pointer in pixbuf_style_class_init().
(Will commit the fix to the pixbuf-engine too).
>>>>>>> 1.1779
2001-03-05 Alexander Larsson <alexl@redhat.com>
* gdk/gdkwindow.h:
......
Tue Mar 6 17:25:07 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_clicked):
Add "clicked" signal back to columns.
* ChangeLog: remove conflict markers.
Tue Mar 6 10:45:45 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkbutton.c: Add animation of activation by, on
......@@ -88,7 +95,6 @@ Mon Mar 5 14:38:54 2001 Jonathan Blandford <jrb@redhat.com>
parent_class pointer in pixbuf_style_class_init().
(Will commit the fix to the pixbuf-engine too).
>>>>>>> 1.1779
2001-03-05 Alexander Larsson <alexl@redhat.com>
* gdk/gdkwindow.h:
......
Tue Mar 6 17:25:07 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_clicked):
Add "clicked" signal back to columns.
* ChangeLog: remove conflict markers.
Tue Mar 6 10:45:45 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkbutton.c: Add animation of activation by, on
......@@ -88,7 +95,6 @@ Mon Mar 5 14:38:54 2001 Jonathan Blandford <jrb@redhat.com>
parent_class pointer in pixbuf_style_class_init().
(Will commit the fix to the pixbuf-engine too).
>>>>>>> 1.1779
2001-03-05 Alexander Larsson <alexl@redhat.com>
* gdk/gdkwindow.h:
......
Tue Mar 6 17:25:07 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_clicked):
Add "clicked" signal back to columns.
* ChangeLog: remove conflict markers.
Tue Mar 6 10:45:45 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkbutton.c: Add animation of activation by, on
......@@ -88,7 +95,6 @@ Mon Mar 5 14:38:54 2001 Jonathan Blandford <jrb@redhat.com>
parent_class pointer in pixbuf_style_class_init().
(Will commit the fix to the pixbuf-engine too).
>>>>>>> 1.1779
2001-03-05 Alexander Larsson <alexl@redhat.com>
* gdk/gdkwindow.h:
......
......@@ -461,7 +461,11 @@ gtk_real_tree_column_clicked (GtkTreeViewColumn *tree_column)
}
static void
gtk_tree_view_column_button_clicked (GtkWidget *widget, gpointer data)
{
g_signal_emit_by_name (G_OBJECT (data), "clicked");
}
void
_gtk_tree_view_column_create_button (GtkTreeViewColumn *column)
......@@ -483,9 +487,9 @@ _gtk_tree_view_column_create_button (GtkTreeViewColumn *column)
/* make sure we own a reference to it as well. */
gtk_widget_set_parent (column->button, GTK_WIDGET (tree_view));
/* gtk_signal_connect (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) gtk_tree_view_button_clicked,
(gpointer) tree_view);*/
gtk_signal_connect (GTK_OBJECT (column->button), "clicked",
(GtkSignalFunc) gtk_tree_view_column_button_clicked,
(gpointer) column);
column->alignment = gtk_alignment_new (column->xalign, 0.5, 0.0, 0.0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment