gimp r26018 - in trunk: . plug-ins/color-rotate plug-ins/gfig plug-ins/gimpressionist plug-ins/ifs-compose plug-ins/imagemap plug-ins/jpeg plug-ins/print plug-ins/win-snap
- From: mitch svn gnome org
- To: svn-commits-list gnome org
- Subject: gimp r26018 - in trunk: . plug-ins/color-rotate plug-ins/gfig plug-ins/gimpressionist plug-ins/ifs-compose plug-ins/imagemap plug-ins/jpeg plug-ins/print plug-ins/win-snap
- Date: Sun, 29 Jun 2008 13:34:05 +0000 (UTC)
Author: mitch
Date: Sun Jun 29 13:34:05 2008
New Revision: 26018
URL: http://svn.gnome.org/viewvc/gimp?rev=26018&view=rev
Log:
2008-06-29 Michael Natterer <mitch gimp org>
* plug-ins/color-rotate/color-rotate-callbacks.c
* plug-ins/gfig/gfig-grid.c
* plug-ins/gimpressionist/general.c
* plug-ins/gimpressionist/orientmap.c
* plug-ins/gimpressionist/paper.c
* plug-ins/gimpressionist/placement.c
* plug-ins/gimpressionist/sizemap.c
* plug-ins/gimpressionist/utils.c
* plug-ins/ifs-compose/ifs-compose.c
* plug-ins/imagemap/imap_grid.c
* plug-ins/jpeg/jpeg-save.c
* plug-ins/print/print-preview.c
* plug-ins/win-snap/winsnap.c: use accessors instead of accessing
members of GTK+ widgets directly.
Modified:
trunk/ChangeLog
trunk/plug-ins/color-rotate/color-rotate-callbacks.c
trunk/plug-ins/gfig/gfig-grid.c
trunk/plug-ins/gimpressionist/general.c
trunk/plug-ins/gimpressionist/orientmap.c
trunk/plug-ins/gimpressionist/paper.c
trunk/plug-ins/gimpressionist/placement.c
trunk/plug-ins/gimpressionist/sizemap.c
trunk/plug-ins/gimpressionist/utils.c
trunk/plug-ins/ifs-compose/ifs-compose.c
trunk/plug-ins/imagemap/imap_grid.c
trunk/plug-ins/jpeg/jpeg-save.c
trunk/plug-ins/print/print-preview.c
trunk/plug-ins/win-snap/winsnap.c
Modified: trunk/plug-ins/color-rotate/color-rotate-callbacks.c
==============================================================================
--- trunk/plug-ins/color-rotate/color-rotate-callbacks.c (original)
+++ trunk/plug-ins/color-rotate/color-rotate-callbacks.c Sun Jun 29 13:34:05 2008
@@ -84,11 +84,13 @@
rcm_360_degrees (GtkWidget *button,
RcmCircle *circle)
{
+ GtkStyle *style = gtk_widget_get_style (circle->preview);
+
circle->action_flag = DO_NOTHING;
gtk_widget_queue_draw (circle->preview);
circle->angle->beta = circle->angle->alpha-circle->angle->cw_ccw * 0.001;
color_rotate_draw_arrows (circle->preview->window,
- circle->preview->style->black_gc,
+ style->black_gc,
circle->angle);
circle->action_flag = VIRGIN;
rcm_render_preview (Current.Bna->after);
@@ -115,13 +117,15 @@
rcm_a_to_b (GtkWidget *button,
RcmCircle *circle)
{
+ GtkStyle *style = gtk_widget_get_style (circle->preview);
+
circle->action_flag = DO_NOTHING;
gtk_widget_queue_draw (circle->preview);
SWAP (circle->angle->alpha, circle->angle->beta);
color_rotate_draw_arrows (circle->preview->window,
- circle->preview->style->black_gc,
+ style->black_gc,
circle->angle);
circle->action_flag = VIRGIN;
@@ -152,7 +156,7 @@
rcm_switch_to_degrees (GtkWidget *button,
gpointer *value)
{
- if (GTK_TOGGLE_BUTTON (button)->active)
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)))
{
Current.Units = DEGREES;
@@ -203,7 +207,7 @@
rcm_switch_to_radians (GtkWidget *button,
gpointer *value)
{
- if (GTK_TOGGLE_BUTTON (button)->active)
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)))
{
Current.Units = RADIANS;
@@ -254,7 +258,7 @@
rcm_switch_to_radians_over_PI (GtkWidget *button,
gpointer *value)
{
- if (GTK_TOGGLE_BUTTON (button)->active)
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)))
{
Current.Units = RADIANS_OVER_PI;
@@ -291,22 +295,24 @@
rcm_switch_to_gray_to (GtkWidget *button,
gpointer *value)
{
- if (! GTK_TOGGLE_BUTTON (button)->active)
- return;
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)))
+ {
+ Current.Gray_to_from = GRAY_TO;
- Current.Gray_to_from = GRAY_TO;
- rcm_render_preview (Current.Bna->after);
+ rcm_render_preview (Current.Bna->after);
+ }
}
void
rcm_switch_to_gray_from (GtkWidget *button,
gpointer *value)
{
- if (! GTK_TOGGLE_BUTTON (button)->active)
- return;
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)))
+ {
+ Current.Gray_to_from = GRAY_FROM;
- Current.Gray_to_from = GRAY_FROM;
- rcm_render_preview (Current.Bna->after);
+ rcm_render_preview (Current.Bna->after);
+ }
}
@@ -316,7 +322,7 @@
rcm_preview_as_you_drag (GtkWidget *button,
gpointer *value)
{
- Current.RealTime = GTK_TOGGLE_BUTTON (button)->active;
+ Current.RealTime = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
}
void
@@ -348,8 +354,10 @@
{
if (circle->action_flag == VIRGIN)
{
+ GtkStyle *style = gtk_widget_get_style (widget);
+
color_rotate_draw_arrows (widget->window,
- widget->style->black_gc,
+ style->black_gc,
circle->angle);
}
@@ -383,10 +391,12 @@
if (*(circle->target) != clicked_angle)
{
+ GtkStyle *style = gtk_widget_get_style (widget);
+
*(circle->target) = clicked_angle;
gtk_widget_queue_draw (circle->preview);
color_rotate_draw_arrows (widget->window,
- widget->style->black_gc,
+ style->black_gc,
circle->angle);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (circle->alpha_entry),
@@ -414,9 +424,11 @@
{
if (circle->action_flag == DRAGING)
{
+ GtkStyle *style = gtk_widget_get_style (widget);
+
gtk_widget_queue_draw (circle->preview);
color_rotate_draw_arrows (widget->window,
- widget->style->black_gc,
+ style->black_gc,
circle->angle);
}
@@ -505,11 +517,15 @@
{
if (circle->action_flag == VIRGIN)
{
- color_rotate_draw_little_circle (widget->window, widget->style->black_gc,
+ GtkStyle *style = gtk_widget_get_style (widget);
+
+ color_rotate_draw_little_circle (widget->window,
+ style->black_gc,
circle->hue, circle->satur);
color_rotate_draw_large_circle (widget->window,
- widget->style->black_gc, circle->gray_sat);
+ style->black_gc,
+ circle->gray_sat);
}
return TRUE;
@@ -520,6 +536,7 @@
GdkEvent *event,
RcmGray *circle)
{
+ GtkStyle *style = gtk_widget_get_style (widget);
GdkEventButton *bevent;
int x, y;
@@ -535,11 +552,12 @@
circle->satur = 1;
gtk_widget_queue_draw (circle->preview);
- color_rotate_draw_little_circle (widget->window, widget->style->black_gc,
+ color_rotate_draw_little_circle (widget->window,
+ style->black_gc,
circle->hue, circle->satur);
color_rotate_draw_large_circle (circle->preview->window,
- circle->preview->style->black_gc,
+ gtk_widget_get_style (circle->preview)->black_gc,
circle->gray_sat);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (circle->hue_entry),
@@ -560,10 +578,14 @@
RcmGray *circle)
{
if (circle->action_flag == DRAGING)
- color_rotate_draw_little_circle (widget->window,
- widget->style->black_gc,
- circle->hue,
- circle->satur);
+ {
+ GtkStyle *style = gtk_widget_get_style (widget);
+
+ color_rotate_draw_little_circle (widget->window,
+ style->black_gc,
+ circle->hue,
+ circle->satur);
+ }
circle->action_flag = VIRGIN;
@@ -587,9 +609,11 @@
if (circle->action_flag == DRAG_START)
{
+ GtkStyle *style = gtk_widget_get_style (circle->preview);
+
gtk_widget_queue_draw (circle->preview);
color_rotate_draw_large_circle (circle->preview->window,
- circle->preview->style->black_gc,
+ style->black_gc,
circle->gray_sat);
circle->action_flag = DRAGING;
@@ -634,6 +658,7 @@
gpointer data)
{
RcmCircle *circle = data;
+ GtkStyle *style = gtk_widget_get_style (circle->preview);
if (circle->action_flag != VIRGIN)
return;
@@ -644,7 +669,7 @@
gtk_widget_queue_draw (circle->preview);
color_rotate_draw_arrows (circle->preview->window,
- circle->preview->style->black_gc,
+ style->black_gc,
circle->angle);
rcm_render_preview (Current.Bna->after);
@@ -655,6 +680,7 @@
gpointer data)
{
RcmCircle *circle = data;
+ GtkStyle *style = gtk_widget_get_style (circle->preview);
if (circle->action_flag != VIRGIN)
return;
@@ -665,7 +691,7 @@
gtk_widget_queue_draw (circle->preview);
color_rotate_draw_arrows (circle->preview->window,
- circle->preview->style->black_gc,
+ style->black_gc,
circle->angle);
rcm_render_preview (Current.Bna->after);
@@ -675,10 +701,11 @@
rcm_set_hue (GtkWidget *entry,
gpointer data)
{
- RcmGray *circle = data;
+ RcmGray *circle = data;
+ GtkStyle *style = gtk_widget_get_style (circle->preview);
- if (circle->action_flag != VIRGIN
- ) return;
+ if (circle->action_flag != VIRGIN)
+ return;
circle->hue = (gtk_spin_button_get_value (GTK_SPIN_BUTTON (entry)) /
rcm_units_factor(Current.Units));
@@ -686,11 +713,11 @@
gtk_widget_queue_draw (circle->preview);
color_rotate_draw_little_circle (circle->preview->window,
- circle->preview->style->black_gc,
+ style->black_gc,
circle->hue, circle->satur);
color_rotate_draw_large_circle (circle->preview->window,
- circle->preview->style->black_gc,
+ style->black_gc,
circle->gray_sat);
rcm_render_preview (Current.Bna->after);
@@ -700,7 +727,8 @@
rcm_set_satur (GtkWidget *entry,
gpointer data)
{
- RcmGray *circle = data;
+ RcmGray *circle = data;
+ GtkStyle *style = gtk_widget_get_style (circle->preview);
if (circle->action_flag != VIRGIN)
return;
@@ -710,11 +738,11 @@
gtk_widget_queue_draw (circle->preview);
color_rotate_draw_little_circle (circle->preview->window,
- circle->preview->style->black_gc,
+ style->black_gc,
circle->hue, circle->satur);
color_rotate_draw_large_circle (circle->preview->window,
- circle->preview->style->black_gc,
+ style->black_gc,
circle->gray_sat);
rcm_render_preview (Current.Bna->after);
@@ -724,14 +752,15 @@
rcm_set_gray_sat (GtkWidget *entry,
gpointer data)
{
- RcmGray *circle = data;
+ RcmGray *circle = data;
+ GtkStyle *style = gtk_widget_get_style (circle->preview);
circle->gray_sat = gtk_spin_button_get_value (GTK_SPIN_BUTTON (entry));
gtk_widget_queue_draw (circle->preview);
color_rotate_draw_large_circle (circle->preview->window,
- circle->preview->style->black_gc,
+ style->black_gc,
circle->gray_sat);
rcm_render_preview (Current.Bna->after);
Modified: trunk/plug-ins/gfig/gfig-grid.c
==============================================================================
--- trunk/plug-ins/gfig/gfig-grid.c (original)
+++ trunk/plug-ins/gfig/gfig-grid.c Sun Jun 29 13:34:05 2008
@@ -534,27 +534,28 @@
static GdkGC *
gfig_get_grid_gc (GtkWidget *w, gint gctype)
{
+ GtkStyle *style = gtk_widget_get_style (w);
switch (gctype)
{
case GFIG_BLACK_GC:
- return (w->style->black_gc);
+ return style->black_gc;
case GFIG_WHITE_GC:
- return (w->style->white_gc);
+ return style->white_gc;
case GFIG_GREY_GC:
- return (grid_hightlight_drawgc);
+ return grid_hightlight_drawgc;
case GTK_STATE_NORMAL:
- return (w->style->bg_gc[GTK_STATE_NORMAL]);
+ return style->bg_gc[GTK_STATE_NORMAL];
case GTK_STATE_ACTIVE:
- return (w->style->bg_gc[GTK_STATE_ACTIVE]);
+ return style->bg_gc[GTK_STATE_ACTIVE];
case GTK_STATE_PRELIGHT:
- return (w->style->bg_gc[GTK_STATE_PRELIGHT]);
+ return style->bg_gc[GTK_STATE_PRELIGHT];
case GTK_STATE_SELECTED:
- return (w->style->bg_gc[GTK_STATE_SELECTED]);
+ return style->bg_gc[GTK_STATE_SELECTED];
case GTK_STATE_INSENSITIVE:
- return (w->style->bg_gc[GTK_STATE_INSENSITIVE]);
+ return style->bg_gc[GTK_STATE_INSENSITIVE];
default:
g_warning ("Unknown type for grid colouring\n");
- return (w->style->bg_gc[GTK_STATE_PRELIGHT]);
+ return style->bg_gc[GTK_STATE_PRELIGHT];
}
}
Modified: trunk/plug-ins/gimpressionist/general.c
==============================================================================
--- trunk/plug-ins/gimpressionist/general.c (original)
+++ trunk/plug-ins/gimpressionist/general.c Sun Jun 29 13:34:05 2008
@@ -62,10 +62,10 @@
void
general_store (void)
{
- pcvals.general_paint_edges = GTK_TOGGLE_BUTTON (general_paint_edges)->active;
+ pcvals.general_paint_edges = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (general_paint_edges));
pcvals.general_dark_edge = GTK_ADJUSTMENT (general_dark_edge_adjust)->value;
- pcvals.general_tileable = GTK_TOGGLE_BUTTON (general_tileable)->active;
- pcvals.general_drop_shadow = GTK_TOGGLE_BUTTON (general_drop_shadow)->active;
+ pcvals.general_tileable = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (general_tileable));
+ pcvals.general_drop_shadow = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (general_drop_shadow));
pcvals.general_shadow_darkness = GTK_ADJUSTMENT (general_shadow_adjust)->value;
pcvals.general_shadow_depth = GTK_ADJUSTMENT (general_shadow_depth)->value;
pcvals.general_shadow_blur = GTK_ADJUSTMENT (general_shadow_blur)->value;
Modified: trunk/plug-ins/gimpressionist/orientmap.c
==============================================================================
--- trunk/plug-ins/gimpressionist/orientmap.c (original)
+++ trunk/plug-ins/gimpressionist/orientmap.c Sun Jun 29 13:34:05 2008
@@ -83,7 +83,7 @@
vec = vector;
angoff = GTK_ADJUSTMENT (angle_offset_adjust)->value;
strexp = GTK_ADJUSTMENT (orient_map_str_exp_adjust)->value;
- voronoi = GTK_TOGGLE_BUTTON (orient_voronoi)->active;
+ voronoi = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (orient_voronoi));
}
else
{
@@ -458,7 +458,7 @@
pcvals.num_orient_vectors = num_vectors;
pcvals.orient_strength_exponent = GTK_ADJUSTMENT (orient_map_str_exp_adjust)->value;
pcvals.orient_angle_offset = GTK_ADJUSTMENT (angle_offset_adjust)->value;
- pcvals.orient_voronoi = GTK_TOGGLE_BUTTON (orient_voronoi)->active;
+ pcvals.orient_voronoi = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (orient_voronoi));
}
};
Modified: trunk/plug-ins/gimpressionist/paper.c
==============================================================================
--- trunk/plug-ins/gimpressionist/paper.c (original)
+++ trunk/plug-ins/gimpressionist/paper.c Sun Jun 29 13:34:05 2008
@@ -61,7 +61,7 @@
{
for (j = 0; j < p.width; j++)
buf[j] = p.col[k + j * 3];
- if (GTK_TOGGLE_BUTTON (paper_invert)->active)
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (paper_invert)))
for (j = 0; j < p.width; j++)
buf[j] = 255 - buf[j];
}
@@ -119,9 +119,9 @@
void
paper_store (void)
{
- pcvals.paper_invert = GTK_TOGGLE_BUTTON (paper_invert)->active;
- pcvals.paper_invert = GTK_TOGGLE_BUTTON (paper_invert)->active;
- pcvals.paper_overlay = GTK_TOGGLE_BUTTON (paper_overlay)->active;
+ pcvals.paper_invert = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (paper_invert));
+ pcvals.paper_invert = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (paper_invert));
+ pcvals.paper_overlay = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (paper_overlay));
}
void
Modified: trunk/plug-ins/gimpressionist/placement.c
==============================================================================
--- trunk/plug-ins/gimpressionist/placement.c (original)
+++ trunk/plug-ins/gimpressionist/placement.c Sun Jun 29 13:34:05 2008
@@ -55,7 +55,7 @@
void
place_store (void)
{
- pcvals.placement_center = GTK_TOGGLE_BUTTON (placement_center)->active;
+ pcvals.placement_center = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (placement_center));
}
void
Modified: trunk/plug-ins/gimpressionist/sizemap.c
==============================================================================
--- trunk/plug-ins/gimpressionist/sizemap.c (original)
+++ trunk/plug-ins/gimpressionist/sizemap.c Sun Jun 29 13:34:05 2008
@@ -63,7 +63,7 @@
{
return getsiz_proto (x,y, numsmvect, smvector,
GTK_ADJUSTMENT (smstrexpadjust)->value,
- GTK_TOGGLE_BUTTON (size_voronoi)->active);
+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (size_voronoi)));
}
static void
@@ -324,8 +324,8 @@
pcvals.size_vectors[i] = smvector[i];
pcvals.num_size_vectors = numsmvect;
- pcvals.size_strength_exponent = GTK_ADJUSTMENT (smstrexpadjust)->value;
- pcvals.size_voronoi = GTK_TOGGLE_BUTTON (size_voronoi)->active;
+ pcvals.size_strength_exponent = gtk_adjustment_get_value (GTK_ADJUSTMENT (smstrexpadjust));
+ pcvals.size_voronoi = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (size_voronoi));
}
break;
}
Modified: trunk/plug-ins/gimpressionist/utils.c
==============================================================================
--- trunk/plug-ins/gimpressionist/utils.c (original)
+++ trunk/plug-ins/gimpressionist/utils.c Sun Jun 29 13:34:05 2008
@@ -61,8 +61,8 @@
{
n = numsmvect;
vec = smvector;
- smstrexp = GTK_ADJUSTMENT(smstrexpadjust)->value;
- voronoi = GTK_TOGGLE_BUTTON(size_voronoi)->active;
+ smstrexp = gtk_adjustment_get_value (GTK_ADJUSTMENT (smstrexpadjust));
+ voronoi = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (size_voronoi));
}
else
{
Modified: trunk/plug-ins/ifs-compose/ifs-compose.c
==============================================================================
--- trunk/plug-ins/ifs-compose/ifs-compose.c (original)
+++ trunk/plug-ins/ifs-compose/ifs-compose.c Sun Jun 29 13:34:05 2008
@@ -1497,6 +1497,7 @@
design_area_expose (GtkWidget *widget,
GdkEventExpose *event)
{
+ GtkStyle *style = gtk_widget_get_style (widget);
PangoLayout *layout;
gint i;
gint cx, cy;
@@ -1510,21 +1511,21 @@
}
gdk_draw_rectangle (ifsDesign->pixmap,
- widget->style->bg_gc[widget->state],
- TRUE,
- event->area.x,
- event->area.y,
- event->area.width, event->area.height);
+ style->bg_gc[widget->state],
+ TRUE,
+ event->area.x,
+ event->area.y,
+ event->area.width, event->area.height);
/* draw an indicator for the center */
cx = ifsvals.center_x * widget->allocation.width;
cy = ifsvals.center_y * widget->allocation.width;
gdk_draw_line (ifsDesign->pixmap,
- widget->style->fg_gc[widget->state],
+ style->fg_gc[widget->state],
cx - 10, cy, cx + 10, cy);
gdk_draw_line (ifsDesign->pixmap,
- widget->style->fg_gc[widget->state],
+ style->fg_gc[widget->state],
cx, cy - 10, cx, cy + 10);
layout = gtk_widget_create_pango_layout (widget, NULL);
@@ -1535,7 +1536,7 @@
widget->allocation.width,
widget->allocation.height,
ifsDesign->pixmap,
- widget->style->fg_gc[widget->state],
+ style->fg_gc[widget->state],
ifsDesign->selected_gc,
layout);
}
@@ -1543,7 +1544,7 @@
g_object_unref (layout);
gdk_draw_drawable (widget->window,
- widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
+ style->fg_gc[GTK_WIDGET_STATE (widget)],
ifsDesign->pixmap,
event->area.x, event->area.y,
event->area.x, event->area.y,
@@ -2085,8 +2086,10 @@
{
AffElement *cur = elements[ifsD->current_element];
- cur->v.simple_color = GTK_TOGGLE_BUTTON (widget)->active;
+ cur->v.simple_color = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
+
ifsD->current_vals.simple_color = cur->v.simple_color;
+
if (cur->v.simple_color)
aff_element_compute_color_trans (cur);
Modified: trunk/plug-ins/imagemap/imap_grid.c
==============================================================================
--- trunk/plug-ins/imagemap/imap_grid.c (original)
+++ trunk/plug-ins/imagemap/imap_grid.c Sun Jun 29 13:34:05 2008
@@ -352,22 +352,31 @@
void
draw_grid(GtkWidget *preview)
{
- if (grid_snap && grid_type != GRID_HIDDEN) {
+ if (grid_snap && grid_type != GRID_HIDDEN)
+ {
gint width = preview_get_width(preview);
gint height = preview_get_height(preview);
- if (!grid_gc) {
- grid_gc = gdk_gc_new(preview->window);
+ if (!grid_gc)
+ {
+ grid_gc = gdk_gc_new(preview->window);
+
+ gdk_gc_set_line_attributes(grid_gc, 1, GDK_LINE_ON_OFF_DASH,
+ GDK_CAP_BUTT, GDK_JOIN_BEVEL);
+ }
- gdk_gc_set_line_attributes(grid_gc, 1, GDK_LINE_ON_OFF_DASH,
- GDK_CAP_BUTT, GDK_JOIN_BEVEL);
- }
if (grid_type == GRID_LINES)
- draw_lines(preview->window, grid_gc, width, height);
+ {
+ draw_lines(preview->window, grid_gc, width, height);
+ }
else
- draw_crosses(preview->window, preview->style->black_gc, width,
- height);
- }
+ {
+ GtkStyle *style = gtk_widget_get_style (preview);
+
+ draw_crosses(preview->window, style->black_gc, width,
+ height);
+ }
+ }
}
void
Modified: trunk/plug-ins/jpeg/jpeg-save.c
==============================================================================
--- trunk/plug-ins/jpeg/jpeg-save.c (original)
+++ trunk/plug-ins/jpeg/jpeg-save.c Sun Jun 29 13:34:05 2008
@@ -1353,7 +1353,10 @@
save_restart_update (GtkAdjustment *adjustment,
GtkWidget *toggle)
{
- jsvals.restart = GTK_TOGGLE_BUTTON (toggle)->active ? adjustment->value : 0;
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle)))
+ jsvals.restart = adjustment->value;
+ else
+ jsvals.restart = 0;
gtk_widget_set_sensitive (restart_markers_label, jsvals.restart);
gtk_widget_set_sensitive (restart_markers_scale, jsvals.restart);
Modified: trunk/plug-ins/print/print-preview.c
==============================================================================
--- trunk/plug-ins/print/print-preview.c (original)
+++ trunk/plug-ins/print/print-preview.c Sun Jun 29 13:34:05 2008
@@ -407,6 +407,7 @@
GdkEventExpose *event)
{
PrintPreview *preview = PRINT_PREVIEW (widget);
+ GtkStyle *style = gtk_widget_get_style (widget);
cairo_t *cr;
gdouble paper_width;
gdouble paper_height;
@@ -442,10 +443,10 @@
/* draw page background */
cairo_rectangle (cr, 0, 0, scale * paper_width, scale * paper_height);
- gdk_cairo_set_source_color (cr, &widget->style->black);
+ gdk_cairo_set_source_color (cr, &style->black);
cairo_stroke_preserve (cr);
- gdk_cairo_set_source_color (cr, &widget->style->white);
+ gdk_cairo_set_source_color (cr, &style->white);
cairo_fill (cr);
/* draw page_margins */
@@ -455,7 +456,7 @@
scale * (paper_width - left_margin - right_margin),
scale * (paper_height - top_margin - bottom_margin));
- gdk_cairo_set_source_color (cr, &widget->style->mid[widget->state]);
+ gdk_cairo_set_source_color (cr, &style->mid[widget->state]);
cairo_stroke (cr);
cairo_translate (cr,
@@ -469,7 +470,7 @@
scale * preview->image_width,
scale * preview->image_height);
- gdk_cairo_set_source_color (cr, &widget->style->black);
+ gdk_cairo_set_source_color (cr, &style->black);
cairo_stroke (cr);
}
Modified: trunk/plug-ins/win-snap/winsnap.c
==============================================================================
--- trunk/plug-ins/win-snap/winsnap.c (original)
+++ trunk/plug-ins/win-snap/winsnap.c Sun Jun 29 13:34:05 2008
@@ -817,7 +817,7 @@
{
gint *toggle_val = (gint *) radio_button;
- if (GTK_TOGGLE_BUTTON (widget)->active)
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
*toggle_val = TRUE;
else
*toggle_val = FALSE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
