callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add "clicked" signal back to columns.

Browse Source 
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.
This commit is contained in:
Jonathan Blandford
2001-03-06 22:23:05 +00:00
committed by Jonathan Blandford
parent 71aa1161b3
commit e83dca5093
8 changed files with 57 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,10 @@
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:

8
ChangeLog.pre-2-0
View File

@ -1,3 +1,10 @@
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:

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,10 @@
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:

8
ChangeLog.pre-2-2
View File

@ -1,3 +1,10 @@
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:

8
ChangeLog.pre-2-4
View File

@ -1,3 +1,10 @@
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:

8
ChangeLog.pre-2-6
View File

@ -1,3 +1,10 @@
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:

8
ChangeLog.pre-2-8
View File

@ -1,3 +1,10 @@
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:

12
gtk/gtktreeviewcolumn.c
View File

@ -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);