s/(enter|leave)_button/$1/g, since pthreads.h no longer conflicts

-Yosh
This commit is contained in:
Manish Singh 1998-12-19 03:24:15 +00:00
parent 2231b92bbb
commit ee173b486f
10 changed files with 53 additions and 15 deletions

View File

@ -1,3 +1,9 @@
Fri Dec 18 19:20:45 PST 1998 Manish Singh <yosh@gimp.org>
* gtkbutton.[ch]
* gtktogglebutton.c: s/(enter|leave)_button/$1/g, since pthreads.h
no longer conflicts
Sat Dec 19 01:56:13 1998 Lars Hamann <lars@gtk.org>
* gtk/gtkclist.c (gtk_clist_button_press): fixed GDK_2BUTTON_PRESS

View File

@ -1,3 +1,9 @@
Fri Dec 18 19:20:45 PST 1998 Manish Singh <yosh@gimp.org>
* gtkbutton.[ch]
* gtktogglebutton.c: s/(enter|leave)_button/$1/g, since pthreads.h
no longer conflicts
Sat Dec 19 01:56:13 1998 Lars Hamann <lars@gtk.org>
* gtk/gtkclist.c (gtk_clist_button_press): fixed GDK_2BUTTON_PRESS

View File

@ -1,3 +1,9 @@
Fri Dec 18 19:20:45 PST 1998 Manish Singh <yosh@gimp.org>
* gtkbutton.[ch]
* gtktogglebutton.c: s/(enter|leave)_button/$1/g, since pthreads.h
no longer conflicts
Sat Dec 19 01:56:13 1998 Lars Hamann <lars@gtk.org>
* gtk/gtkclist.c (gtk_clist_button_press): fixed GDK_2BUTTON_PRESS

View File

@ -1,3 +1,9 @@
Fri Dec 18 19:20:45 PST 1998 Manish Singh <yosh@gimp.org>
* gtkbutton.[ch]
* gtktogglebutton.c: s/(enter|leave)_button/$1/g, since pthreads.h
no longer conflicts
Sat Dec 19 01:56:13 1998 Lars Hamann <lars@gtk.org>
* gtk/gtkclist.c (gtk_clist_button_press): fixed GDK_2BUTTON_PRESS

View File

@ -1,3 +1,9 @@
Fri Dec 18 19:20:45 PST 1998 Manish Singh <yosh@gimp.org>
* gtkbutton.[ch]
* gtktogglebutton.c: s/(enter|leave)_button/$1/g, since pthreads.h
no longer conflicts
Sat Dec 19 01:56:13 1998 Lars Hamann <lars@gtk.org>
* gtk/gtkclist.c (gtk_clist_button_press): fixed GDK_2BUTTON_PRESS

View File

@ -1,3 +1,9 @@
Fri Dec 18 19:20:45 PST 1998 Manish Singh <yosh@gimp.org>
* gtkbutton.[ch]
* gtktogglebutton.c: s/(enter|leave)_button/$1/g, since pthreads.h
no longer conflicts
Sat Dec 19 01:56:13 1998 Lars Hamann <lars@gtk.org>
* gtk/gtkclist.c (gtk_clist_button_press): fixed GDK_2BUTTON_PRESS

View File

@ -1,3 +1,9 @@
Fri Dec 18 19:20:45 PST 1998 Manish Singh <yosh@gimp.org>
* gtkbutton.[ch]
* gtktogglebutton.c: s/(enter|leave)_button/$1/g, since pthreads.h
no longer conflicts
Sat Dec 19 01:56:13 1998 Lars Hamann <lars@gtk.org>
* gtk/gtkclist.c (gtk_clist_button_press): fixed GDK_2BUTTON_PRESS

View File

@ -160,14 +160,14 @@ gtk_button_class_init (GtkButtonClass *klass)
gtk_signal_new ("enter",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkButtonClass, enter_button),
GTK_SIGNAL_OFFSET (GtkButtonClass, enter),
gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
button_signals[LEAVE] =
gtk_signal_new ("leave",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkButtonClass, leave_button),
GTK_SIGNAL_OFFSET (GtkButtonClass, leave),
gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
@ -198,8 +198,8 @@ gtk_button_class_init (GtkButtonClass *klass)
klass->pressed = gtk_real_button_pressed;
klass->released = gtk_real_button_released;
klass->clicked = NULL;
klass->enter_button = gtk_real_button_enter;
klass->leave_button = gtk_real_button_leave;
klass->enter = gtk_real_button_enter;
klass->leave = gtk_real_button_leave;
}
static void

View File

@ -56,15 +56,11 @@ struct _GtkButtonClass
{
GtkBinClass parent_class;
void (* pressed) (GtkButton *button);
void (* released) (GtkButton *button);
void (* clicked) (GtkButton *button);
/* these used to be enter and leave, but Digital decided they were more
important than us. They may have beaten us for now, but revenge is
a dish best served cold */
void (* enter_button) (GtkButton *button);
void (* leave_button) (GtkButton *button);
void (* pressed) (GtkButton *button);
void (* released) (GtkButton *button);
void (* clicked) (GtkButton *button);
void (* enter) (GtkButton *button);
void (* leave) (GtkButton *button);
};

View File

@ -129,8 +129,8 @@ gtk_toggle_button_class_init (GtkToggleButtonClass *class)
button_class->pressed = gtk_toggle_button_pressed;
button_class->released = gtk_toggle_button_released;
button_class->clicked = gtk_toggle_button_clicked;
button_class->enter_button = gtk_toggle_button_enter;
button_class->leave_button = gtk_toggle_button_leave;
button_class->enter = gtk_toggle_button_enter;
button_class->leave = gtk_toggle_button_leave;
class->toggled = NULL;
}