AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

hmm, someone changed GLib without fixing GTK

Browse Source 
2001-02-19  Havoc Pennington  <hp@redhat.com>

	* gtk/gtktreemodel.c (gtk_tree_model_get_valist): hmm, someone
	changed GLib without fixing GTK

	* gtk/gtkrange.h: Rename all the stupid implementation detail
	functions to have an underscore in front. Most of them should
	probably just go away, but for starters don't export them.
	Bug #50482

2001-02-19  Havoc Pennington  <hp@redhat.com>

	* gdk-pixbuf-io.c (gdk_pixbuf_load_module): const fix
This commit is contained in:
Havoc Pennington 2001-02-19 22:51:15 +00:00 committed by Havoc Pennington
parent f4fa22da55
commit 027c315499
16 changed files with 190 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2001-02-19 Havoc Pennington <hp@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_model_get_valist): hmm, someone
changed GLib without fixing GTK
* gtk/gtkrange.h: Rename all the stupid implementation detail
functions to have an underscore in front. Most of them should
probably just go away, but for starters don't export them.
Bug #50482
2001-02-19 Havoc Pennington <hp@redhat.com> 2001-02-19 Havoc Pennington <hp@redhat.com>
* gdk/gdkcolor.h: test was backward, so deprecated functions were * gdk/gdkcolor.h: test was backward, so deprecated functions were

10
ChangeLog.pre-2-0
View File

@ -1,3 +1,13 @@
2001-02-19 Havoc Pennington <hp@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_model_get_valist): hmm, someone
changed GLib without fixing GTK
* gtk/gtkrange.h: Rename all the stupid implementation detail
functions to have an underscore in front. Most of them should
probably just go away, but for starters don't export them.
Bug #50482
2001-02-19 Havoc Pennington <hp@redhat.com> 2001-02-19 Havoc Pennington <hp@redhat.com>
* gdk/gdkcolor.h: test was backward, so deprecated functions were * gdk/gdkcolor.h: test was backward, so deprecated functions were

10
ChangeLog.pre-2-10
View File

@ -1,3 +1,13 @@
2001-02-19 Havoc Pennington <hp@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_model_get_valist): hmm, someone
changed GLib without fixing GTK
* gtk/gtkrange.h: Rename all the stupid implementation detail
functions to have an underscore in front. Most of them should
probably just go away, but for starters don't export them.
Bug #50482
2001-02-19 Havoc Pennington <hp@redhat.com> 2001-02-19 Havoc Pennington <hp@redhat.com>
* gdk/gdkcolor.h: test was backward, so deprecated functions were * gdk/gdkcolor.h: test was backward, so deprecated functions were

10
ChangeLog.pre-2-2
View File

@ -1,3 +1,13 @@
2001-02-19 Havoc Pennington <hp@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_model_get_valist): hmm, someone
changed GLib without fixing GTK
* gtk/gtkrange.h: Rename all the stupid implementation detail
functions to have an underscore in front. Most of them should
probably just go away, but for starters don't export them.
Bug #50482
2001-02-19 Havoc Pennington <hp@redhat.com> 2001-02-19 Havoc Pennington <hp@redhat.com>
* gdk/gdkcolor.h: test was backward, so deprecated functions were * gdk/gdkcolor.h: test was backward, so deprecated functions were

10
ChangeLog.pre-2-4
View File

@ -1,3 +1,13 @@
2001-02-19 Havoc Pennington <hp@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_model_get_valist): hmm, someone
changed GLib without fixing GTK
* gtk/gtkrange.h: Rename all the stupid implementation detail
functions to have an underscore in front. Most of them should
probably just go away, but for starters don't export them.
Bug #50482
2001-02-19 Havoc Pennington <hp@redhat.com> 2001-02-19 Havoc Pennington <hp@redhat.com>
* gdk/gdkcolor.h: test was backward, so deprecated functions were * gdk/gdkcolor.h: test was backward, so deprecated functions were

10
ChangeLog.pre-2-6
View File

@ -1,3 +1,13 @@
2001-02-19 Havoc Pennington <hp@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_model_get_valist): hmm, someone
changed GLib without fixing GTK
* gtk/gtkrange.h: Rename all the stupid implementation detail
functions to have an underscore in front. Most of them should
probably just go away, but for starters don't export them.
Bug #50482
2001-02-19 Havoc Pennington <hp@redhat.com> 2001-02-19 Havoc Pennington <hp@redhat.com>
* gdk/gdkcolor.h: test was backward, so deprecated functions were * gdk/gdkcolor.h: test was backward, so deprecated functions were

10
ChangeLog.pre-2-8
View File

@ -1,3 +1,13 @@
2001-02-19 Havoc Pennington <hp@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_model_get_valist): hmm, someone
changed GLib without fixing GTK
* gtk/gtkrange.h: Rename all the stupid implementation detail
functions to have an underscore in front. Most of them should
probably just go away, but for starters don't export them.
Bug #50482
2001-02-19 Havoc Pennington <hp@redhat.com> 2001-02-19 Havoc Pennington <hp@redhat.com>
* gdk/gdkcolor.h: test was backward, so deprecated functions were * gdk/gdkcolor.h: test was backward, so deprecated functions were

4
gdk-pixbuf/ChangeLog
View File

@ -1,3 +1,7 @@
2001-02-19 Havoc Pennington <hp@redhat.com>
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): const fix
2001-02-17 Havoc Pennington <hp@pobox.com> 2001-02-17 Havoc Pennington <hp@pobox.com>
* gdk-pixbuf-loader.c (gdk_pixbuf_loader_new_with_type): docs * gdk-pixbuf-loader.c (gdk_pixbuf_loader_new_with_type): docs

2
gdk-pixbuf/gdk-pixbuf-io.c
View File

@ -263,7 +263,7 @@ gdk_pixbuf_load_module (GdkPixbufModule *image_module,
gpointer sym; gpointer sym;
char *name; char *name;
gboolean retval; gboolean retval;
char *dir; const char *dir;
g_return_val_if_fail (image_module->module == NULL, FALSE); g_return_val_if_fail (image_module->module == NULL, FALSE);

10
gtk/gtkhscale.c
View File

@ -118,9 +118,9 @@ gtk_hscale_class_init (GtkHScaleClass *class)
widget_class->size_request = gtk_hscale_size_request; widget_class->size_request = gtk_hscale_size_request;
widget_class->size_allocate = gtk_hscale_size_allocate; widget_class->size_allocate = gtk_hscale_size_allocate;
range_class->slider_update = gtk_range_default_hslider_update; range_class->slider_update = _gtk_range_default_hslider_update;
range_class->trough_click = gtk_range_default_htrough_click; range_class->trough_click = _gtk_range_default_htrough_click;
range_class->motion = gtk_range_default_hmotion; range_class->motion = _gtk_range_default_hmotion;
range_class->draw_slider = gtk_hscale_draw_slider; range_class->draw_slider = gtk_hscale_draw_slider;
range_class->trough_keys = gtk_hscale_trough_keys; range_class->trough_keys = gtk_hscale_trough_keys;
range_class->clear_background = gtk_hscale_clear_background; range_class->clear_background = gtk_hscale_clear_background;
@ -242,7 +242,7 @@ gtk_hscale_realize (GtkWidget *widget)
gtk_style_set_background (widget->style, range->trough, GTK_STATE_ACTIVE); gtk_style_set_background (widget->style, range->trough, GTK_STATE_ACTIVE);
gtk_style_set_background (widget->style, range->slider, GTK_STATE_NORMAL); gtk_style_set_background (widget->style, range->slider, GTK_STATE_NORMAL);
gtk_range_slider_update (GTK_RANGE (widget)); _gtk_range_slider_update (GTK_RANGE (widget));
gdk_window_show (range->slider); gdk_window_show (range->slider);
} }
@ -325,7 +325,7 @@ gtk_hscale_size_allocate (GtkWidget *widget,
gdk_window_move_resize (range->trough, gdk_window_move_resize (range->trough,
x, y, width, height); x, y, width, height);
gtk_range_slider_update (GTK_RANGE (widget)); _gtk_range_slider_update (GTK_RANGE (widget));
} }
} }

10
gtk/gtkhscrollbar.c
View File

@ -109,9 +109,9 @@ gtk_hscrollbar_class_init (GtkHScrollbarClass *class)
range_class->draw_step_forw = gtk_hscrollbar_draw_step_forw; range_class->draw_step_forw = gtk_hscrollbar_draw_step_forw;
range_class->draw_step_back = gtk_hscrollbar_draw_step_back; range_class->draw_step_back = gtk_hscrollbar_draw_step_back;
range_class->slider_update = gtk_hscrollbar_slider_update; range_class->slider_update = gtk_hscrollbar_slider_update;
range_class->trough_click = gtk_range_default_htrough_click; range_class->trough_click = _gtk_range_default_htrough_click;
range_class->trough_keys = gtk_hscrollbar_trough_keys; range_class->trough_keys = gtk_hscrollbar_trough_keys;
range_class->motion = gtk_range_default_hmotion; range_class->motion = _gtk_range_default_hmotion;
} }
static void static void
@ -240,7 +240,7 @@ gtk_hscrollbar_realize (GtkWidget *widget)
range->slider = gdk_window_new (range->trough, &attributes, attributes_mask); range->slider = gdk_window_new (range->trough, &attributes, attributes_mask);
gtk_hscrollbar_calc_slider_size (GTK_HSCROLLBAR (widget)); gtk_hscrollbar_calc_slider_size (GTK_HSCROLLBAR (widget));
gtk_range_slider_update (GTK_RANGE (widget)); _gtk_range_slider_update (GTK_RANGE (widget));
widget->style = gtk_style_attach (widget->style, widget->window); widget->style = gtk_style_attach (widget->style, widget->window);
@ -290,7 +290,7 @@ gtk_hscrollbar_size_allocate (GtkWidget *widget,
RANGE_CLASS (widget)->stepper_size, RANGE_CLASS (widget)->stepper_size,
widget->requisition.height - widget->style->ythickness * 2); widget->requisition.height - widget->style->ythickness * 2);
gtk_range_slider_update (GTK_RANGE (widget)); _gtk_range_slider_update (GTK_RANGE (widget));
} }
} }
@ -369,7 +369,7 @@ gtk_hscrollbar_slider_update (GtkRange *range)
g_return_if_fail (GTK_IS_HSCROLLBAR (range)); g_return_if_fail (GTK_IS_HSCROLLBAR (range));
gtk_hscrollbar_calc_slider_size (GTK_HSCROLLBAR (range)); gtk_hscrollbar_calc_slider_size (GTK_HSCROLLBAR (range));
gtk_range_default_hslider_update (range); _gtk_range_default_hslider_update (range);
} }
static void static void

134
gtk/gtkrange.c
View File

@ -329,7 +329,7 @@ gtk_range_get_inverted (GtkRange *range)
} }
void void
gtk_range_draw_background (GtkRange *range) _gtk_range_draw_background (GtkRange *range)
{ {
g_return_if_fail (range != NULL); g_return_if_fail (range != NULL);
g_return_if_fail (GTK_IS_RANGE (range)); g_return_if_fail (GTK_IS_RANGE (range));
@ -339,7 +339,7 @@ gtk_range_draw_background (GtkRange *range)
} }
void void
gtk_range_clear_background (GtkRange *range) _gtk_range_clear_background (GtkRange *range)
{ {
g_return_if_fail (range != NULL); g_return_if_fail (range != NULL);
g_return_if_fail (GTK_IS_RANGE (range)); g_return_if_fail (GTK_IS_RANGE (range));
@ -349,7 +349,7 @@ gtk_range_clear_background (GtkRange *range)
} }
void void
gtk_range_draw_trough (GtkRange *range) _gtk_range_draw_trough (GtkRange *range)
{ {
g_return_if_fail (range != NULL); g_return_if_fail (range != NULL);
g_return_if_fail (GTK_IS_RANGE (range)); g_return_if_fail (GTK_IS_RANGE (range));
@ -359,7 +359,7 @@ gtk_range_draw_trough (GtkRange *range)
} }
void void
gtk_range_draw_slider (GtkRange *range) _gtk_range_draw_slider (GtkRange *range)
{ {
g_return_if_fail (range != NULL); g_return_if_fail (range != NULL);
g_return_if_fail (GTK_IS_RANGE (range)); g_return_if_fail (GTK_IS_RANGE (range));
@ -369,7 +369,7 @@ gtk_range_draw_slider (GtkRange *range)
} }
void void
gtk_range_draw_step_forw (GtkRange *range) _gtk_range_draw_step_forw (GtkRange *range)
{ {
g_return_if_fail (range != NULL); g_return_if_fail (range != NULL);
g_return_if_fail (GTK_IS_RANGE (range)); g_return_if_fail (GTK_IS_RANGE (range));
@ -379,7 +379,7 @@ gtk_range_draw_step_forw (GtkRange *range)
} }
void void
gtk_range_draw_step_back (GtkRange *range) _gtk_range_draw_step_back (GtkRange *range)
{ {
g_return_if_fail (range != NULL); g_return_if_fail (range != NULL);
g_return_if_fail (GTK_IS_RANGE (range)); g_return_if_fail (GTK_IS_RANGE (range));
@ -389,7 +389,7 @@ gtk_range_draw_step_back (GtkRange *range)
} }
void void
gtk_range_slider_update (GtkRange *range) _gtk_range_slider_update (GtkRange *range)
{ {
g_return_if_fail (range != NULL); g_return_if_fail (range != NULL);
g_return_if_fail (GTK_IS_RANGE (range)); g_return_if_fail (GTK_IS_RANGE (range));
@ -399,10 +399,10 @@ gtk_range_slider_update (GtkRange *range)
} }
gint gint
gtk_range_trough_click (GtkRange *range, _gtk_range_trough_click (GtkRange *range,
gint x, gint x,
gint y, gint y,
gfloat *jump_perc) gfloat *jump_perc)
{ {
g_return_val_if_fail (range != NULL, GTK_TROUGH_NONE); g_return_val_if_fail (range != NULL, GTK_TROUGH_NONE);
g_return_val_if_fail (GTK_IS_RANGE (range), GTK_TROUGH_NONE); g_return_val_if_fail (GTK_IS_RANGE (range), GTK_TROUGH_NONE);
@ -457,7 +457,7 @@ should_invert (GtkRange *range,
} }
void void
gtk_range_default_hslider_update (GtkRange *range) _gtk_range_default_hslider_update (GtkRange *range)
{ {
gint left; gint left;
gint right; gint right;
@ -499,7 +499,7 @@ gtk_range_default_hslider_update (GtkRange *range)
} }
void void
gtk_range_default_vslider_update (GtkRange *range) _gtk_range_default_vslider_update (GtkRange *range)
{ {
gint top; gint top;
gint bottom; gint bottom;
@ -541,10 +541,10 @@ gtk_range_default_vslider_update (GtkRange *range)
} }
gint gint
gtk_range_default_htrough_click (GtkRange *range, _gtk_range_default_htrough_click (GtkRange *range,
gint x, gint x,
gint y, gint y,
gfloat *jump_perc) gfloat *jump_perc)
{ {
gint ythickness; gint ythickness;
gint trough_width; gint trough_width;
@ -590,10 +590,10 @@ gtk_range_default_htrough_click (GtkRange *range,
} }
gint gint
gtk_range_default_vtrough_click (GtkRange *range, _gtk_range_default_vtrough_click (GtkRange *range,
gint x, gint x,
gint y, gint y,
gfloat *jump_perc) gfloat *jump_perc)
{ {
gint xthickness; gint xthickness;
gint trough_width; gint trough_width;
@ -640,9 +640,9 @@ gtk_range_default_vtrough_click (GtkRange *range,
} }
void void
gtk_range_default_hmotion (GtkRange *range, _gtk_range_default_hmotion (GtkRange *range,
gint xdelta, gint xdelta,
gint ydelta) gint ydelta)
{ {
gdouble old_value; gdouble old_value;
gint left, right; gint left, right;
@ -691,8 +691,8 @@ gtk_range_default_hmotion (GtkRange *range,
} }
else else
{ {
gtk_range_slider_update (range); _gtk_range_slider_update (range);
gtk_range_clear_background (range); _gtk_range_clear_background (range);
if (range->policy == GTK_UPDATE_DELAYED) if (range->policy == GTK_UPDATE_DELAYED)
{ {
@ -706,9 +706,9 @@ gtk_range_default_hmotion (GtkRange *range,
} }
void void
gtk_range_default_vmotion (GtkRange *range, _gtk_range_default_vmotion (GtkRange *range,
gint xdelta, gint xdelta,
gint ydelta) gint ydelta)
{ {
gdouble old_value; gdouble old_value;
gint top, bottom; gint top, bottom;
@ -759,8 +759,8 @@ gtk_range_default_vmotion (GtkRange *range,
} }
else else
{ {
gtk_range_slider_update (range); _gtk_range_slider_update (range);
gtk_range_clear_background (range); _gtk_range_clear_background (range);
if (range->policy == GTK_UPDATE_DELAYED) if (range->policy == GTK_UPDATE_DELAYED)
{ {
@ -804,7 +804,7 @@ gtk_range_draw_focus (GtkWidget *widget)
g_return_if_fail (GTK_IS_RANGE (widget)); g_return_if_fail (GTK_IS_RANGE (widget));
if (GTK_WIDGET_DRAWABLE (widget)) if (GTK_WIDGET_DRAWABLE (widget))
gtk_range_draw_trough (GTK_RANGE (widget)); _gtk_range_draw_trough (GTK_RANGE (widget));
} }
static void static void
@ -863,23 +863,23 @@ gtk_range_expose (GtkWidget *widget,
*/ */
if (event->window == range->trough) if (event->window == range->trough)
{ {
gtk_range_draw_trough (range); _gtk_range_draw_trough (range);
} }
else if (event->window == widget->window) else if (event->window == widget->window)
{ {
gtk_range_draw_background (range); _gtk_range_draw_background (range);
} }
else if (event->window == range->slider) else if (event->window == range->slider)
{ {
gtk_range_draw_slider (range); _gtk_range_draw_slider (range);
} }
else if (event->window == range->step_forw) else if (event->window == range->step_forw)
{ {
gtk_range_draw_step_forw (range); _gtk_range_draw_step_forw (range);
} }
else if (event->window == range->step_back) else if (event->window == range->step_back)
{ {
gtk_range_draw_step_back (range); _gtk_range_draw_step_back (range);
} }
return FALSE; return FALSE;
} }
@ -913,9 +913,9 @@ gtk_range_button_press (GtkWidget *widget,
range->click_child = RANGE_CLASS (range)->trough; range->click_child = RANGE_CLASS (range)->trough;
if (range->button == 2) if (range->button == 2)
trough_part = gtk_range_trough_click (range, event->x, event->y, &jump_perc); trough_part = _gtk_range_trough_click (range, event->x, event->y, &jump_perc);
else else
trough_part = gtk_range_trough_click (range, event->x, event->y, NULL); trough_part = _gtk_range_trough_click (range, event->x, event->y, NULL);
range->scroll_type = GTK_SCROLL_NONE; range->scroll_type = GTK_SCROLL_NONE;
if (trough_part == GTK_TROUGH_START) if (trough_part == GTK_TROUGH_START)
@ -964,9 +964,9 @@ gtk_range_button_press (GtkWidget *widget,
gtk_range_add_timer (range); gtk_range_add_timer (range);
if (back) if (back)
gtk_range_draw_step_back (range); _gtk_range_draw_step_back (range);
else else
gtk_range_draw_step_forw (range); _gtk_range_draw_step_forw (range);
} }
} }
} }
@ -1015,12 +1015,12 @@ gtk_range_button_release (GtkWidget *widget,
if (range->click_child == RANGE_CLASS (range)->step_forw) if (range->click_child == RANGE_CLASS (range)->step_forw)
{ {
range->click_child = 0; range->click_child = 0;
gtk_range_draw_step_forw (range); _gtk_range_draw_step_forw (range);
} }
else if (range->click_child == RANGE_CLASS (range)->step_back) else if (range->click_child == RANGE_CLASS (range)->step_back)
{ {
range->click_child = 0; range->click_child = 0;
gtk_range_draw_step_back (range); _gtk_range_draw_step_back (range);
} }
} }
@ -1134,38 +1134,38 @@ gtk_range_key_press (GtkWidget *widget,
{ {
case GTK_SCROLL_STEP_LEFT: case GTK_SCROLL_STEP_LEFT:
if (should_invert (range, TRUE)) if (should_invert (range, TRUE))
gtk_range_draw_step_forw (range); _gtk_range_draw_step_forw (range);
else else
gtk_range_draw_step_back (range); _gtk_range_draw_step_back (range);
break; break;
case GTK_SCROLL_STEP_UP: case GTK_SCROLL_STEP_UP:
if (should_invert (range, FALSE)) if (should_invert (range, FALSE))
gtk_range_draw_step_forw (range); _gtk_range_draw_step_forw (range);
else else
gtk_range_draw_step_back (range); _gtk_range_draw_step_back (range);
break; break;
case GTK_SCROLL_STEP_RIGHT: case GTK_SCROLL_STEP_RIGHT:
if (should_invert (range, TRUE)) if (should_invert (range, TRUE))
gtk_range_draw_step_back (range); _gtk_range_draw_step_back (range);
else else
gtk_range_draw_step_forw (range); _gtk_range_draw_step_forw (range);
break; break;
case GTK_SCROLL_STEP_DOWN: case GTK_SCROLL_STEP_DOWN:
if (should_invert (range, FALSE)) if (should_invert (range, FALSE))
gtk_range_draw_step_back (range); _gtk_range_draw_step_back (range);
else else
gtk_range_draw_step_forw (range); _gtk_range_draw_step_forw (range);
break; break;
case GTK_SCROLL_STEP_BACKWARD: case GTK_SCROLL_STEP_BACKWARD:
gtk_range_draw_step_back (range); _gtk_range_draw_step_back (range);
break; break;
case GTK_SCROLL_STEP_FORWARD: case GTK_SCROLL_STEP_FORWARD:
gtk_range_draw_step_forw (range); _gtk_range_draw_step_forw (range);
break; break;
} }
} }
@ -1183,8 +1183,8 @@ gtk_range_key_press (GtkWidget *widget,
gtk_signal_emit_by_name (GTK_OBJECT (range->adjustment), gtk_signal_emit_by_name (GTK_OBJECT (range->adjustment),
"value_changed"); "value_changed");
gtk_range_slider_update (range); _gtk_range_slider_update (range);
gtk_range_clear_background (range); _gtk_range_clear_background (range);
} }
} }
} }
@ -1212,7 +1212,7 @@ gtk_range_enter_notify (GtkWidget *widget,
if ((range->click_child == 0) || if ((range->click_child == 0) ||
(range->click_child == RANGE_CLASS (range)->trough)) (range->click_child == RANGE_CLASS (range)->trough))
gtk_range_draw_slider (range); _gtk_range_draw_slider (range);
} }
else if (event->window == range->step_forw) else if (event->window == range->step_forw)
{ {
@ -1220,7 +1220,7 @@ gtk_range_enter_notify (GtkWidget *widget,
if ((range->click_child == 0) || if ((range->click_child == 0) ||
(range->click_child == RANGE_CLASS (range)->trough)) (range->click_child == RANGE_CLASS (range)->trough))
gtk_range_draw_step_forw (range); _gtk_range_draw_step_forw (range);
} }
else if (event->window == range->step_back) else if (event->window == range->step_back)
{ {
@ -1228,7 +1228,7 @@ gtk_range_enter_notify (GtkWidget *widget,
if ((range->click_child == 0) || if ((range->click_child == 0) ||
(range->click_child == RANGE_CLASS (range)->trough)) (range->click_child == RANGE_CLASS (range)->trough))
gtk_range_draw_step_back (range); _gtk_range_draw_step_back (range);
} }
return TRUE; return TRUE;
@ -1254,19 +1254,19 @@ gtk_range_leave_notify (GtkWidget *widget,
{ {
if ((range->click_child == 0) || if ((range->click_child == 0) ||
(range->click_child == RANGE_CLASS (range)->trough)) (range->click_child == RANGE_CLASS (range)->trough))
gtk_range_draw_slider (range); _gtk_range_draw_slider (range);
} }
else if (event->window == range->step_forw) else if (event->window == range->step_forw)
{ {
if ((range->click_child == 0) || if ((range->click_child == 0) ||
(range->click_child == RANGE_CLASS (range)->trough)) (range->click_child == RANGE_CLASS (range)->trough))
gtk_range_draw_step_forw (range); _gtk_range_draw_step_forw (range);
} }
else if (event->window == range->step_back) else if (event->window == range->step_back)
{ {
if ((range->click_child == 0) || if ((range->click_child == 0) ||
(range->click_child == RANGE_CLASS (range)->trough)) (range->click_child == RANGE_CLASS (range)->trough))
gtk_range_draw_step_back (range); _gtk_range_draw_step_back (range);
} }
return TRUE; return TRUE;
@ -1554,8 +1554,8 @@ gtk_range_scroll (GtkRange *range,
} }
else else
{ {
gtk_range_slider_update (range); _gtk_range_slider_update (range);
gtk_range_clear_background (range); _gtk_range_clear_background (range);
} }
} }
@ -1619,8 +1619,8 @@ gtk_range_adjustment_changed (GtkAdjustment *adjustment,
(range->old_upper != adjustment->upper) || (range->old_upper != adjustment->upper) ||
(range->old_page_size != adjustment->page_size)) (range->old_page_size != adjustment->page_size))
{ {
gtk_range_slider_update (range); _gtk_range_slider_update (range);
gtk_range_clear_background (range); _gtk_range_clear_background (range);
range->old_value = adjustment->value; range->old_value = adjustment->value;
range->old_lower = adjustment->lower; range->old_lower = adjustment->lower;
@ -1642,8 +1642,8 @@ gtk_range_adjustment_value_changed (GtkAdjustment *adjustment,
if (range->old_value != adjustment->value) if (range->old_value != adjustment->value)
{ {
gtk_range_slider_update (range); _gtk_range_slider_update (range);
gtk_range_clear_background (range); _gtk_range_clear_background (range);
range->old_value = adjustment->value; range->old_value = adjustment->value;
} }

54
gtk/gtkrange.h
View File

@ -128,34 +128,34 @@ void gtk_range_set_inverted (GtkRange *range,
gboolean setting); gboolean setting);
gboolean gtk_range_get_inverted (GtkRange *range); gboolean gtk_range_get_inverted (GtkRange *range);
void gtk_range_draw_background (GtkRange *range); void _gtk_range_draw_background (GtkRange *range);
void gtk_range_clear_background (GtkRange *range); void _gtk_range_clear_background (GtkRange *range);
void gtk_range_draw_trough (GtkRange *range); void _gtk_range_draw_trough (GtkRange *range);
void gtk_range_draw_slider (GtkRange *range); void _gtk_range_draw_slider (GtkRange *range);
void gtk_range_draw_step_forw (GtkRange *range); void _gtk_range_draw_step_forw (GtkRange *range);
void gtk_range_draw_step_back (GtkRange *range); void _gtk_range_draw_step_back (GtkRange *range);
void gtk_range_slider_update (GtkRange *range); void _gtk_range_slider_update (GtkRange *range);
gint gtk_range_trough_click (GtkRange *range, gint _gtk_range_trough_click (GtkRange *range,
gint x, gint x,
gint y, gint y,
gfloat *jump_perc); gfloat *jump_perc);
void gtk_range_default_hslider_update (GtkRange *range); void _gtk_range_default_hslider_update (GtkRange *range);
void gtk_range_default_vslider_update (GtkRange *range); void _gtk_range_default_vslider_update (GtkRange *range);
gint gtk_range_default_htrough_click (GtkRange *range, gint _gtk_range_default_htrough_click (GtkRange *range,
gint x, gint x,
gint y, gint y,
gfloat *jump_perc); gfloat *jump_perc);
gint gtk_range_default_vtrough_click (GtkRange *range, gint _gtk_range_default_vtrough_click (GtkRange *range,
gint x, gint x,
gint y, gint y,
gfloat *jump_perc); gfloat *jump_perc);
void gtk_range_default_hmotion (GtkRange *range, void _gtk_range_default_hmotion (GtkRange *range,
gint xdelta, gint xdelta,
gint ydelta); gint ydelta);
void gtk_range_default_vmotion (GtkRange *range, void _gtk_range_default_vmotion (GtkRange *range,
gint xdelta, gint xdelta,
gint ydelta); gint ydelta);
#ifdef __cplusplus #ifdef __cplusplus

2
gtk/gtktreemodel.c
View File

@ -1199,7 +1199,7 @@ gtk_tree_model_get_valist (GtkTreeModel *tree_model,
gtk_tree_model_get_value (GTK_TREE_MODEL (tree_model), iter, column, &value); gtk_tree_model_get_value (GTK_TREE_MODEL (tree_model), iter, column, &value);
G_VALUE_LCOPY (&value, var_args, &error); G_VALUE_LCOPY (&value, var_args, 0, &error);
if (error) if (error)
{ {
g_warning ("%s: %s", G_STRLOC, error); g_warning ("%s: %s", G_STRLOC, error);

10
gtk/gtkvscale.c
View File

@ -119,9 +119,9 @@ gtk_vscale_class_init (GtkVScaleClass *class)
widget_class->size_request = gtk_vscale_size_request; widget_class->size_request = gtk_vscale_size_request;
widget_class->size_allocate = gtk_vscale_size_allocate; widget_class->size_allocate = gtk_vscale_size_allocate;
range_class->slider_update = gtk_range_default_vslider_update; range_class->slider_update = _gtk_range_default_vslider_update;
range_class->trough_click = gtk_range_default_vtrough_click; range_class->trough_click = _gtk_range_default_vtrough_click;
range_class->motion = gtk_range_default_vmotion; range_class->motion = _gtk_range_default_vmotion;
range_class->draw_slider = gtk_vscale_draw_slider; range_class->draw_slider = gtk_vscale_draw_slider;
range_class->trough_keys = gtk_vscale_trough_keys; range_class->trough_keys = gtk_vscale_trough_keys;
range_class->clear_background = gtk_vscale_clear_background; range_class->clear_background = gtk_vscale_clear_background;
@ -241,7 +241,7 @@ gtk_vscale_realize (GtkWidget *widget)
gtk_style_set_background (widget->style, range->trough, GTK_STATE_ACTIVE); gtk_style_set_background (widget->style, range->trough, GTK_STATE_ACTIVE);
gtk_style_set_background (widget->style, range->slider, GTK_STATE_NORMAL); gtk_style_set_background (widget->style, range->slider, GTK_STATE_NORMAL);
gtk_range_slider_update (GTK_RANGE (widget)); _gtk_range_slider_update (GTK_RANGE (widget));
gdk_window_show (range->slider); gdk_window_show (range->slider);
} }
@ -326,7 +326,7 @@ gtk_vscale_size_allocate (GtkWidget *widget,
gtk_vscale_pos_trough (GTK_VSCALE (widget), &x, &y, &width, &height); gtk_vscale_pos_trough (GTK_VSCALE (widget), &x, &y, &width, &height);
gdk_window_move_resize (range->trough, x, y, width, height); gdk_window_move_resize (range->trough, x, y, width, height);
gtk_range_slider_update (GTK_RANGE (widget)); _gtk_range_slider_update (GTK_RANGE (widget));
} }
} }

10
gtk/gtkvscrollbar.c
View File

@ -109,9 +109,9 @@ gtk_vscrollbar_class_init (GtkVScrollbarClass *class)
range_class->draw_step_forw = gtk_vscrollbar_draw_step_forw; range_class->draw_step_forw = gtk_vscrollbar_draw_step_forw;
range_class->draw_step_back = gtk_vscrollbar_draw_step_back; range_class->draw_step_back = gtk_vscrollbar_draw_step_back;
range_class->slider_update = gtk_vscrollbar_slider_update; range_class->slider_update = gtk_vscrollbar_slider_update;
range_class->trough_click = gtk_range_default_vtrough_click; range_class->trough_click = _gtk_range_default_vtrough_click;
range_class->trough_keys = gtk_vscrollbar_trough_keys; range_class->trough_keys = gtk_vscrollbar_trough_keys;
range_class->motion = gtk_range_default_vmotion; range_class->motion = _gtk_range_default_vmotion;
} }
static void static void
@ -240,7 +240,7 @@ gtk_vscrollbar_realize (GtkWidget *widget)
range->slider = gdk_window_new (range->trough, &attributes, attributes_mask); range->slider = gdk_window_new (range->trough, &attributes, attributes_mask);
gtk_vscrollbar_calc_slider_size (GTK_VSCROLLBAR (widget)); gtk_vscrollbar_calc_slider_size (GTK_VSCROLLBAR (widget));
gtk_range_slider_update (GTK_RANGE (widget)); _gtk_range_slider_update (GTK_RANGE (widget));
widget->style = gtk_style_attach (widget->style, widget->window); widget->style = gtk_style_attach (widget->style, widget->window);
@ -290,7 +290,7 @@ gtk_vscrollbar_size_allocate (GtkWidget *widget,
widget->requisition.width - widget->style->xthickness * 2, widget->requisition.width - widget->style->xthickness * 2,
RANGE_CLASS (widget)->stepper_size); RANGE_CLASS (widget)->stepper_size);
gtk_range_slider_update (GTK_RANGE (widget)); _gtk_range_slider_update (GTK_RANGE (widget));
} }
} }
@ -369,7 +369,7 @@ gtk_vscrollbar_slider_update (GtkRange *range)
g_return_if_fail (GTK_IS_VSCROLLBAR (range)); g_return_if_fail (GTK_IS_VSCROLLBAR (range));
gtk_vscrollbar_calc_slider_size (GTK_VSCROLLBAR (range)); gtk_vscrollbar_calc_slider_size (GTK_VSCROLLBAR (range));
gtk_range_default_vslider_update (range); _gtk_range_default_vslider_update (range);
} }
static void static void