Commit a7f29c4e authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Apply patch from Nils Barth fixing event return values. (#51041)

Tue Mar 27 22:36:07 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkwidget.h gtk/gtkrange.h: Apply patch from
	Nils Barth fixing event return values. (#51041)

	* gtk/gtkwidget.c: Fix some return values for default
	functions.

	* gtk/gtk[vh]scrollbar.c gtk/gtk[vh]range.c: Fix
	return values for trough_keys functions.

	* gtk/gtkwidget.h (struct _GtkWidgetClass): Fix return
	value for add_accelerator (shoudl have been a void
	return.)

	* gtk/gtkcellrenderer.[ch]: gtkcellrenderertoggle.h:
	Fix return type of EVENT.

	* gtk/gtkmarshal.list gtk/gtktexttag.c: Make EVENT
	signal return a boolean.
parent 6e7b8a67
Tue Mar 27 22:36:07 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.h gtk/gtkrange.h: Apply patch from
Nils Barth fixing event return values. (#51041)
* gtk/gtkwidget.c: Fix some return values for default
functions.
* gtk/gtk[vh]scrollbar.c gtk/gtk[vh]range.c: Fix
return values for trough_keys functions.
* gtk/gtkwidget.h (struct _GtkWidgetClass): Fix return
value for add_accelerator (shoudl have been a void
return.)
* gtk/gtkcellrenderer.[ch]: gtkcellrenderertoggle.h:
Fix return type of EVENT.
* gtk/gtkmarshal.list gtk/gtktexttag.c: Make EVENT
signal return a boolean.
Tue Mar 27 22:07:44 2001 Jonathan Blandford <jrb@webwynk.net>
* gtk/gtkliststore.c (gtk_list_store_sort): Fix arguments to
......
Tue Mar 27 22:36:07 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.h gtk/gtkrange.h: Apply patch from
Nils Barth fixing event return values. (#51041)
* gtk/gtkwidget.c: Fix some return values for default
functions.
* gtk/gtk[vh]scrollbar.c gtk/gtk[vh]range.c: Fix
return values for trough_keys functions.
* gtk/gtkwidget.h (struct _GtkWidgetClass): Fix return
value for add_accelerator (shoudl have been a void
return.)
* gtk/gtkcellrenderer.[ch]: gtkcellrenderertoggle.h:
Fix return type of EVENT.
* gtk/gtkmarshal.list gtk/gtktexttag.c: Make EVENT
signal return a boolean.
Tue Mar 27 22:07:44 2001 Jonathan Blandford <jrb@webwynk.net>
* gtk/gtkliststore.c (gtk_list_store_sort): Fix arguments to
......
Tue Mar 27 22:36:07 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.h gtk/gtkrange.h: Apply patch from
Nils Barth fixing event return values. (#51041)
* gtk/gtkwidget.c: Fix some return values for default
functions.
* gtk/gtk[vh]scrollbar.c gtk/gtk[vh]range.c: Fix
return values for trough_keys functions.
* gtk/gtkwidget.h (struct _GtkWidgetClass): Fix return
value for add_accelerator (shoudl have been a void
return.)
* gtk/gtkcellrenderer.[ch]: gtkcellrenderertoggle.h:
Fix return type of EVENT.
* gtk/gtkmarshal.list gtk/gtktexttag.c: Make EVENT
signal return a boolean.
Tue Mar 27 22:07:44 2001 Jonathan Blandford <jrb@webwynk.net>
* gtk/gtkliststore.c (gtk_list_store_sort): Fix arguments to
......
Tue Mar 27 22:36:07 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.h gtk/gtkrange.h: Apply patch from
Nils Barth fixing event return values. (#51041)
* gtk/gtkwidget.c: Fix some return values for default
functions.
* gtk/gtk[vh]scrollbar.c gtk/gtk[vh]range.c: Fix
return values for trough_keys functions.
* gtk/gtkwidget.h (struct _GtkWidgetClass): Fix return
value for add_accelerator (shoudl have been a void
return.)
* gtk/gtkcellrenderer.[ch]: gtkcellrenderertoggle.h:
Fix return type of EVENT.
* gtk/gtkmarshal.list gtk/gtktexttag.c: Make EVENT
signal return a boolean.
Tue Mar 27 22:07:44 2001 Jonathan Blandford <jrb@webwynk.net>
* gtk/gtkliststore.c (gtk_list_store_sort): Fix arguments to
......
Tue Mar 27 22:36:07 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.h gtk/gtkrange.h: Apply patch from
Nils Barth fixing event return values. (#51041)
* gtk/gtkwidget.c: Fix some return values for default
functions.
* gtk/gtk[vh]scrollbar.c gtk/gtk[vh]range.c: Fix
return values for trough_keys functions.
* gtk/gtkwidget.h (struct _GtkWidgetClass): Fix return
value for add_accelerator (shoudl have been a void
return.)
* gtk/gtkcellrenderer.[ch]: gtkcellrenderertoggle.h:
Fix return type of EVENT.
* gtk/gtkmarshal.list gtk/gtktexttag.c: Make EVENT
signal return a boolean.
Tue Mar 27 22:07:44 2001 Jonathan Blandford <jrb@webwynk.net>
* gtk/gtkliststore.c (gtk_list_store_sort): Fix arguments to
......
Tue Mar 27 22:36:07 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.h gtk/gtkrange.h: Apply patch from
Nils Barth fixing event return values. (#51041)
* gtk/gtkwidget.c: Fix some return values for default
functions.
* gtk/gtk[vh]scrollbar.c gtk/gtk[vh]range.c: Fix
return values for trough_keys functions.
* gtk/gtkwidget.h (struct _GtkWidgetClass): Fix return
value for add_accelerator (shoudl have been a void
return.)
* gtk/gtkcellrenderer.[ch]: gtkcellrenderertoggle.h:
Fix return type of EVENT.
* gtk/gtkmarshal.list gtk/gtktexttag.c: Make EVENT
signal return a boolean.
Tue Mar 27 22:07:44 2001 Jonathan Blandford <jrb@webwynk.net>
* gtk/gtkliststore.c (gtk_list_store_sort): Fix arguments to
......
Tue Mar 27 22:36:07 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.h gtk/gtkrange.h: Apply patch from
Nils Barth fixing event return values. (#51041)
* gtk/gtkwidget.c: Fix some return values for default
functions.
* gtk/gtk[vh]scrollbar.c gtk/gtk[vh]range.c: Fix
return values for trough_keys functions.
* gtk/gtkwidget.h (struct _GtkWidgetClass): Fix return
value for add_accelerator (shoudl have been a void
return.)
* gtk/gtkcellrenderer.[ch]: gtkcellrenderertoggle.h:
Fix return type of EVENT.
* gtk/gtkmarshal.list gtk/gtktexttag.c: Make EVENT
signal return a boolean.
Tue Mar 27 22:07:44 2001 Jonathan Blandford <jrb@webwynk.net>
* gtk/gtkliststore.c (gtk_list_store_sort): Fix arguments to
......
......@@ -326,7 +326,7 @@ gtk_cell_renderer_render (GtkCellRenderer *cell,
*
* Return value: %TRUE if the event was consumed/handled
**/
gint
gboolean
gtk_cell_renderer_event (GtkCellRenderer *cell,
GdkEvent *event,
GtkWidget *widget,
......
......@@ -66,53 +66,53 @@ struct _GtkCellRendererClass
GtkObjectClass parent_class;
/* vtable - not signals */
void (* get_size) (GtkCellRenderer *cell,
GtkWidget *widget,
GdkRectangle *cell_area,
gint *x_offset,
gint *y_offset,
gint *width,
gint *height);
void (* render) (GtkCellRenderer *cell,
GdkWindow *window,
GtkWidget *widget,
GdkRectangle *background_area,
GdkRectangle *cell_area,
GdkRectangle *expose_area,
GtkCellRendererState flags);
gint (* event) (GtkCellRenderer *cell,
GdkEvent *event,
GtkWidget *widget,
gchar *path,
GdkRectangle *background_area,
GdkRectangle *cell_area,
GtkCellRendererState flags);
void (* get_size) (GtkCellRenderer *cell,
GtkWidget *widget,
GdkRectangle *cell_area,
gint *x_offset,
gint *y_offset,
gint *width,
gint *height);
void (* render) (GtkCellRenderer *cell,
GdkWindow *window,
GtkWidget *widget,
GdkRectangle *background_area,
GdkRectangle *cell_area,
GdkRectangle *expose_area,
GtkCellRendererState flags);
gboolean (* event) (GtkCellRenderer *cell,
GdkEvent *event,
GtkWidget *widget,
gchar *path,
GdkRectangle *background_area,
GdkRectangle *cell_area,
GtkCellRendererState flags);
};
GtkType gtk_cell_renderer_get_type (void);
void gtk_cell_renderer_get_size (GtkCellRenderer *cell,
GtkWidget *widget,
GdkRectangle *cell_area,
gint *x_offset,
gint *y_offset,
gint *width,
gint *height);
void gtk_cell_renderer_render (GtkCellRenderer *cell,
GdkWindow *window,
GtkWidget *widget,
GdkRectangle *background_area,
GdkRectangle *cell_area,
GdkRectangle *expose_area,
GtkCellRendererState flags);
gint gtk_cell_renderer_event (GtkCellRenderer *cell,
GdkEvent *event,
GtkWidget *widget,
gchar *path,
GdkRectangle *background_area,
GdkRectangle *cell_area,
GtkCellRendererState flags);
GtkType gtk_cell_renderer_get_type (void);
void gtk_cell_renderer_get_size (GtkCellRenderer *cell,
GtkWidget *widget,
GdkRectangle *cell_area,
gint *x_offset,
gint *y_offset,
gint *width,
gint *height);
void gtk_cell_renderer_render (GtkCellRenderer *cell,
GdkWindow *window,
GtkWidget *widget,
GdkRectangle *background_area,
GdkRectangle *cell_area,
GdkRectangle *expose_area,
GtkCellRendererState flags);
gboolean gtk_cell_renderer_event (GtkCellRenderer *cell,
GdkEvent *event,
GtkWidget *widget,
gchar *path,
GdkRectangle *background_area,
GdkRectangle *cell_area,
GtkCellRendererState flags);
#ifdef __cplusplus
}
......
......@@ -46,7 +46,7 @@ static void gtk_cell_renderer_toggle_render (GtkCellRenderer *cel
GdkRectangle *cell_area,
GdkRectangle *expose_area,
guint flags);
static gint gtk_cell_renderer_toggle_event (GtkCellRenderer *cell,
static gboolean gtk_cell_renderer_toggle_event (GtkCellRenderer *cell,
GdkEvent *event,
GtkWidget *widget,
gchar *path,
......
......@@ -37,36 +37,37 @@ enum {
ARG_ADJUSTMENT
};
static void gtk_hscale_class_init (GtkHScaleClass *klass);
static void gtk_hscale_init (GtkHScale *hscale);
static void gtk_hscale_set_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void gtk_hscale_get_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void gtk_hscale_realize (GtkWidget *widget);
static void gtk_hscale_size_request (GtkWidget *widget,
GtkRequisition *requisition);
static void gtk_hscale_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
static void gtk_hscale_pos_trough (GtkHScale *hscale,
gint *x,
gint *y,
gint *w,
gint *h);
static void gtk_hscale_pos_background (GtkHScale *hscale,
gint *x,
gint *y,
gint *w,
gint *h);
static void gtk_hscale_draw_slider (GtkRange *range);
static void gtk_hscale_draw_value (GtkScale *scale);
static gint gtk_hscale_trough_keys (GtkRange *range,
GdkEventKey *key,
GtkScrollType *scroll,
GtkTroughType *pos);
static void gtk_hscale_clear_background (GtkRange *range);
static void gtk_hscale_class_init (GtkHScaleClass *klass);
static void gtk_hscale_init (GtkHScale *hscale);
static void gtk_hscale_set_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void gtk_hscale_get_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void gtk_hscale_realize (GtkWidget *widget);
static void gtk_hscale_size_request (GtkWidget *widget,
GtkRequisition *requisition);
static void gtk_hscale_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
static void gtk_hscale_pos_trough (GtkHScale *hscale,
gint *x,
gint *y,
gint *w,
gint *h);
static void gtk_hscale_pos_background (GtkHScale *hscale,
gint *x,
gint *y,
gint *w,
gint *h);
static void gtk_hscale_draw_slider (GtkRange *range);
static void gtk_hscale_draw_value (GtkScale *scale);
static gboolean gtk_hscale_trough_keys (GtkRange *range,
GdkEventKey *key,
GtkScrollType *scroll,
GtkTroughType *pos);
static void gtk_hscale_clear_background (GtkRange *range);
GtkType
gtk_hscale_get_type (void)
......@@ -540,7 +541,7 @@ gtk_hscale_draw_value (GtkScale *scale)
}
}
static gint
static gboolean
gtk_hscale_trough_keys (GtkRange *range,
GdkEventKey *key,
GtkScrollType *scroll,
......
......@@ -38,25 +38,25 @@ enum {
ARG_ADJUSTMENT
};
static void gtk_hscrollbar_class_init (GtkHScrollbarClass *klass);
static void gtk_hscrollbar_init (GtkHScrollbar *hscrollbar);
static void gtk_hscrollbar_set_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void gtk_hscrollbar_get_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void gtk_hscrollbar_realize (GtkWidget *widget);
static void gtk_hscrollbar_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
static void gtk_hscrollbar_draw_step_forw (GtkRange *range);
static void gtk_hscrollbar_draw_step_back (GtkRange *range);
static void gtk_hscrollbar_slider_update (GtkRange *range);
static void gtk_hscrollbar_calc_slider_size (GtkHScrollbar *hscrollbar);
static gint gtk_hscrollbar_trough_keys (GtkRange *range,
GdkEventKey *key,
GtkScrollType *scroll,
GtkTroughType *pos);
static void gtk_hscrollbar_class_init (GtkHScrollbarClass *klass);
static void gtk_hscrollbar_init (GtkHScrollbar *hscrollbar);
static void gtk_hscrollbar_set_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void gtk_hscrollbar_get_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void gtk_hscrollbar_realize (GtkWidget *widget);
static void gtk_hscrollbar_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
static void gtk_hscrollbar_draw_step_forw (GtkRange *range);
static void gtk_hscrollbar_draw_step_back (GtkRange *range);
static void gtk_hscrollbar_slider_update (GtkRange *range);
static void gtk_hscrollbar_calc_slider_size (GtkHScrollbar *hscrollbar);
static gboolean gtk_hscrollbar_trough_keys (GtkRange *range,
GdkEventKey *key,
GtkScrollType *scroll,
GtkTroughType *pos);
GtkType
......@@ -425,7 +425,7 @@ gtk_hscrollbar_calc_slider_size (GtkHScrollbar *hscrollbar)
}
}
static gint
static gboolean
gtk_hscrollbar_trough_keys(GtkRange *range,
GdkEventKey *key,
GtkScrollType *scroll,
......
......@@ -24,10 +24,10 @@
BOOLEAN:BOXED
BOOLEAN:OBJECT,INT,INT,UINT
BOOLEAN:OBJECT,STRING,STRING,BOXED
BOOLEAN:OBJECT,BOXED,BOXED
BOOLEAN:VOID
BOOLEAN:BOOLEAN
ENUM:ENUM
INT:OBJECT,BOXED,BOXED
INT:POINTER
NONE:BOOL
NONE:INT
......
......@@ -24,10 +24,10 @@
BOOLEAN:BOXED
BOOLEAN:OBJECT,INT,INT,UINT
BOOLEAN:OBJECT,STRING,STRING,BOXED
BOOLEAN:OBJECT,BOXED,BOXED
BOOLEAN:VOID
BOOLEAN:BOOLEAN
ENUM:ENUM
INT:OBJECT,BOXED,BOXED
INT:POINTER
NONE:BOOL
NONE:INT
......
......@@ -391,7 +391,7 @@ _gtk_range_slider_update (GtkRange *range)
(* RANGE_CLASS (range)->slider_update) (range);
}
gint
gboolean
_gtk_range_trough_click (GtkRange *range,
gint x,
gint y,
......@@ -533,7 +533,7 @@ _gtk_range_default_vslider_update (GtkRange *range)
}
}
gint
gboolean
_gtk_range_default_htrough_click (GtkRange *range,
gint x,
gint y,
......@@ -582,7 +582,7 @@ _gtk_range_default_htrough_click (GtkRange *range,
return GTK_TROUGH_NONE;
}
gint
gboolean
_gtk_range_default_vtrough_click (GtkRange *range,
gint x,
gint y,
......
......@@ -97,23 +97,23 @@ struct _GtkRangeClass
void (* draw_background) (GtkRange *range);
void (* clear_background) (GtkRange *range);
void (* draw_trough) (GtkRange *range);
void (* draw_slider) (GtkRange *range);
void (* draw_step_forw) (GtkRange *range);
void (* draw_step_back) (GtkRange *range);
void (* slider_update) (GtkRange *range);
gint (* trough_click) (GtkRange *range,
gint x,
gint y,
gdouble *jump_perc);
gint (* trough_keys) (GtkRange *range,
GdkEventKey *key,
GtkScrollType *scroll,
GtkTroughType *trough);
void (* motion) (GtkRange *range,
gint xdelta,
gint ydelta);
gint (* timer) (GtkRange *range);
void (* draw_trough) (GtkRange *range);
void (* draw_slider) (GtkRange *range);
void (* draw_step_forw) (GtkRange *range);
void (* draw_step_back) (GtkRange *range);
void (* slider_update) (GtkRange *range);
gboolean (* trough_click) (GtkRange *range,
gint x,
gint y,
gdouble *jump_perc);
gboolean (* trough_keys) (GtkRange *range,
GdkEventKey *key,
GtkScrollType *scroll,
GtkTroughType *trough);
void (* motion) (GtkRange *range,
gint xdelta,
gint ydelta);
gboolean (* timer) (GtkRange *range);
};
......@@ -135,18 +135,18 @@ void _gtk_range_draw_slider (GtkRange *range);
void _gtk_range_draw_step_forw (GtkRange *range);
void _gtk_range_draw_step_back (GtkRange *range);
void _gtk_range_slider_update (GtkRange *range);
gint _gtk_range_trough_click (GtkRange *range,
gboolean _gtk_range_trough_click (GtkRange *range,
gint x,
gint y,
gdouble *jump_perc);
void _gtk_range_default_hslider_update (GtkRange *range);
void _gtk_range_default_vslider_update (GtkRange *range);
gint _gtk_range_default_htrough_click (GtkRange *range,
gboolean _gtk_range_default_htrough_click (GtkRange *range,
gint x,
gint y,
gdouble *jump_perc);
gint _gtk_range_default_vtrough_click (GtkRange *range,
gboolean _gtk_range_default_vtrough_click (GtkRange *range,
gint x,
gint y,
gdouble *jump_perc);
......
......@@ -605,7 +605,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
G_SIGNAL_RUN_LAST,
GTK_SIGNAL_OFFSET (GtkTextTagClass, event),
NULL, NULL,
gtk_marshal_INT__OBJECT_BOXED_BOXED,
gtk_marshal_BOOLEAN__OBJECT_BOXED_BOXED,
GTK_TYPE_INT,
3,
G_TYPE_OBJECT,
......@@ -1616,7 +1616,7 @@ gtk_text_tag_set_priority (GtkTextTag *tag,
*
* Return value: result of signal emission (whether the event was handled)
**/
gint
gboolean
gtk_text_tag_event (GtkTextTag *tag,
GObject *event_object,
GdkEvent *event,
......
......@@ -89,21 +89,22 @@ struct _GtkTextTag
guint pad3 : 1;
};
struct _GtkTextTagClass {
struct _GtkTextTagClass
{
GObjectClass parent_class;
gint (* event) (GtkTextTag *tag,
GObject *event_object, /* widget, canvas item, whatever */
GdkEvent *event, /* the event itself */
const GtkTextIter *iter); /* location of event in buffer */
gboolean (* event) (GtkTextTag *tag,
GObject *event_object, /* widget, canvas item, whatever */
GdkEvent *event, /* the event itself */
const GtkTextIter *iter); /* location of event in buffer */
};
GType gtk_text_tag_get_type (void) G_GNUC_CONST;
GType gtk_text_tag_get_type (void) G_GNUC_CONST;
GtkTextTag *gtk_text_tag_new (const gchar *name);
gint gtk_text_tag_get_priority (GtkTextTag *tag);
void gtk_text_tag_set_priority (GtkTextTag *tag,
gint priority);
gint gtk_text_tag_event (GtkTextTag *tag,
gboolean gtk_text_tag_event (GtkTextTag *tag,
GObject *event_object,
GdkEvent *event,
const GtkTextIter *iter);
......
......@@ -38,36 +38,36 @@ enum {
ARG_ADJUSTMENT
};
static void gtk_vscale_class_init (GtkVScaleClass *klass);
static void gtk_vscale_init (GtkVScale *vscale);
static void gtk_vscale_set_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void gtk_vscale_get_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void gtk_vscale_realize (GtkWidget *widget);
static void gtk_vscale_size_request (GtkWidget *widget,
GtkRequisition *requisition);
static void gtk_vscale_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
static void gtk_vscale_pos_trough (GtkVScale *vscale,
gint *x,
gint *y,
gint *w,
gint *h);
static void gtk_vscale_pos_background (GtkVScale *vscale,
gint *x,
gint *y,
gint *w,
gint *h);
static void gtk_vscale_draw_slider (GtkRange *range);
static void gtk_vscale_draw_value (GtkScale *scale);
static gint gtk_vscale_trough_keys (GtkRange *range,
GdkEventKey *key,
GtkScrollType *scroll,
GtkTroughType *pos);
static void gtk_vscale_clear_background (GtkRange *range);
static void gtk_vscale_class_init (GtkVScaleClass *klass);
static void gtk_vscale_init (GtkVScale *vscale);
static void gtk_vscale_set_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void gtk_vscale_get_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void gtk_vscale_realize (GtkWidget *widget);
static void gtk_vscale_size_request (GtkWidget *widget,
GtkRequisition *requisition);
static void gtk_vscale_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
static void gtk_vscale_pos_trough (GtkVScale *vscale,
gint *x,
gint *y,
gint *w,
gint *h);
static void gtk_vscale_pos_background (GtkVScale *vscale,
gint *x,
gint *y,
gint *w,
gint *h);
static void gtk_vscale_draw_slider (GtkRange *range);
static void gtk_vscale_draw_value (GtkScale *scale);
static gboolean gtk_vscale_trough_keys (GtkRange *range,
GdkEventKey *key,
GtkScrollType *scroll,
GtkTroughType *pos);
static void gtk_vscale_clear_background (GtkRange *range);
GtkType
gtk_vscale_get_type (void)
......@@ -543,7 +543,7 @@ gtk_vscale_draw_value (GtkScale *scale)
}
}
static gint
static gboolean
gtk_vscale_trough_keys (GtkRange *range,
GdkEventKey *key,
GtkScrollType *scroll,
......
......@@ -38,25 +38,25 @@ enum {
ARG_ADJUSTMENT
};
static void gtk_vscrollbar_class_init (GtkVScrollbarClass *klass);
static void gtk_vscrollbar_init (GtkVScrollbar *vscrollbar);
static void gtk_vscrollbar_set_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void gtk_vscrollbar_get_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void gtk_vscrollbar_realize (GtkWidget *widget);
static void gtk_vscrollbar_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
static void gtk_vscrollbar_draw_step_forw (GtkRange *range);
static void gtk_vscrollbar_draw_step_back (GtkRange *range);
static void gtk_vscrollbar_slider_update (GtkRange *range);
static void gtk_vscrollbar_calc_slider_size (GtkVScrollbar *vscrollbar);
static gint gtk_vscrollbar_trough_keys (GtkRange *range,
GdkEventKey *key,
GtkScrollType *scroll,
GtkTroughType *pos);
static void gtk_vscrollbar_class_init (GtkVScrollbarClass *klass);
static void gtk_vscrollbar_init (GtkVScrollbar *vscrollbar);
static void gtk_vscrollbar_set_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void gtk_vscrollbar_get_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void gtk_vscrollbar_realize (GtkWidget *widget);
static void gtk_vscrollbar_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
static void gtk_vscrollbar_draw_step_forw (GtkRange *range);
static void gtk_vscrollbar_draw_step_back (GtkRange *range);
static void gtk_vscrollbar_slider_update (GtkRange *range);
static void gtk_vscrollbar_calc_slider_size (GtkVScrollbar *vscrollbar);
static gboolean gtk_vscrollbar_trough_keys (GtkRange *range,
GdkEventKey *key,
GtkScrollType *scroll,
GtkTroughType *pos);
GtkType
......@@ -425,11 +425,11 @@ gtk_vscrollbar_calc_slider_size (GtkVScrollbar *vscrollbar)
}
}
static gint
gtk_vscrollbar_trough_keys(GtkRange *range,
GdkEventKey *key,
GtkScrollType *scroll,
GtkTroughType *pos)
static gboolean
gtk_vscrollbar_trough_keys (GtkRange *range,
GdkEventKey *key,
GtkScrollType *scroll,
GtkTroughType *pos)
{
gint return_val = FALSE;
switch (key->keyval)
......
......@@ -157,14 +157,15 @@ static void gtk_widget_real_size_request (GtkWidget *widget,
GtkRequisition *requisition);
static void gtk_widget_real_size_allocate (GtkWidget *widget,