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

app/widgets/gimpblobeditor.c app/widgets/gimpbrushselect.c

Browse Source 
2009-03-22  Michael Natterer  <mitch@gimp.org>

	* app/widgets/gimpblobeditor.c
	* app/widgets/gimpbrushselect.c
	* app/widgets/gimpcolorbar.c
	* app/widgets/gimpcolordialog.c
	* app/widgets/gimpcolorframe.c
	* app/widgets/gimpcontainergridview.c
	* app/widgets/gimpcontainerpopup.c
	* app/widgets/gimpcontainertreeview.c
	* app/widgets/gimpcontrollereditor.c
	* app/widgets/gimpcontrollerlist.c
	* app/widgets/gimpcursor.c
	* app/widgets/gimpcurveview.c
	* app/widgets/gimpdasheditor.c
	* app/widgets/gimpdialogfactory.c
	* app/widgets/gimpdnd-xds.c
	* app/widgets/gimpdockable.c
	* app/widgets/gimperrordialog.c
	* app/widgets/gimpfgbgeditor.c
	* app/widgets/gimpfgbgview.c
	* app/widgets/gimpfiledialog.c
	* app/widgets/gimpfontselect.c
	* app/widgets/gimpgradienteditor.c
	* app/widgets/gimpgradientselect.c
	* app/widgets/gimphandlebar.c
	* app/widgets/gimphistogrambox.c
	* app/widgets/gimphistogramview.c
	* app/widgets/gimpmessagedialog.c
	* app/widgets/gimpnavigationview.c
	* app/widgets/gimppaletteselect.c
	* app/widgets/gimppaletteview.c
	* app/widgets/gimppatternselect.c
	* app/widgets/gimpprogressbox.c
	* app/widgets/gimpprogressdialog.c
	* app/widgets/gimpscalebutton.c
	* app/widgets/gimpselectiondata.c
	* app/widgets/gimpsessioninfo.c
	* app/widgets/gimpsettingsbox.c
	* app/widgets/gimpstrokeeditor.c
	* app/widgets/gimptexteditor.c
	* app/widgets/gimptoolbox.c
	* app/widgets/gimpuimanager.c
	* app/widgets/gimpview-popup.c
	* app/widgets/gimpview.c
	* app/widgets/gimpviewabledialog.c
	* app/widgets/gimpwidgets-utils.c: use accessors for various
	members of GTK+ structures that don't exist any longer when
	GSEAL_ENABLE is defined.


svn path=/trunk/; revision=28193
This commit is contained in:
Michael Natterer
2009-03-22 16:35:53 +00:00
committed by Michael Natterer
parent d3dcff66f7
commit d85fb156b5
46 changed files with 269 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/widgets/gimpgradienteditor.c
View File

@ -777,7 +777,7 @@ gradient_editor_scrollbar_update (GtkAdjustment *adjustment,
str2 = g_strdup_printf (_("Displaying [%0.4f, %0.4f]"),
gtk_adjustment_get_value (adjustment),
gtk_adjustment_get_value (adjustment) +
adjustment->page_size);
gtk_adjustment_get_page_size (adjustment));
gradient_editor_set_hint (editor, str1, str2, NULL, NULL);
@ -789,7 +789,7 @@ gradient_editor_scrollbar_update (GtkAdjustment *adjustment,
gimp_view_renderer_gradient_set_offsets (renderer,
gtk_adjustment_get_value (adjustment),
gtk_adjustment_get_value (adjustment) +
adjustment->page_size,
gtk_adjustment_get_page_size (adjustment),
editor->instant_update);
gimp_gradient_editor_update (editor);
}
@ -1223,11 +1223,11 @@ control_expose (GtkWidget *widget,
GimpGradientEditor *editor)
{
GtkAdjustment *adj = GTK_ADJUSTMENT (editor->scroll_data);
cairo_t *cr = gdk_cairo_create (widget->window);
cairo_t *cr = gdk_cairo_create (gtk_widget_get_window (widget));
gint width;
gint height;
gdk_drawable_get_size (widget->window, &width, &height);
gdk_drawable_get_size (gtk_widget_get_window (widget), &width, &height);
control_draw (editor,
GIMP_GRADIENT (GIMP_DATA_EDITOR (editor)->data),
@ -1235,7 +1235,7 @@ control_expose (GtkWidget *widget,
width, height,
gtk_adjustment_get_value (adj),
gtk_adjustment_get_value (adj) +
adj->page_size);
gtk_adjustment_get_page_size (adj));
cairo_destroy (cr);
@ -1894,7 +1894,8 @@ control_calc_p_pos (GimpGradientEditor *editor,
* and the gradient control's handles.
*/
return RINT ((pwidth - 1) * (pos - adjustment->value) / adjustment->page_size);
return RINT ((pwidth - 1) * (pos - gtk_adjustment_get_value (adjustment)) /
gtk_adjustment_get_page_size (adjustment));
}
static gdouble
@ -1906,7 +1907,8 @@ control_calc_g_pos (GimpGradientEditor *editor,
/* Calculate the gradient position that corresponds to widget's coordinates */
return adjustment->page_size * pos / (pwidth - 1) + adjustment->value;
return (gtk_adjustment_get_page_size (adjustment) * pos / (pwidth - 1) +
gtk_adjustment_get_value (adjustment));
}
/***** Segment functions *****/