mirror of
https://gitlab.gnome.org/GNOME/gimp
synced 2024-10-22 04:22:29 +00:00
plug-ins/common/animation-play.c plug-ins/common/cml-explorer.c
2008-06-28 Michael Natterer <mitch@gimp.org> * plug-ins/common/animation-play.c * plug-ins/common/cml-explorer.c * plug-ins/common/convolution-matrix.c * plug-ins/common/curve-bend.c * plug-ins/common/despeckle.c * plug-ins/common/filter-pack.c * plug-ins/common/gee-zoom.c * plug-ins/common/gee.c * plug-ins/common/lens-flare.c * plug-ins/common/newsprint.c * plug-ins/common/nova.c * plug-ins/common/postscript.c * plug-ins/common/sample-colorize.c * plug-ins/common/sphere-designer.c * plug-ins/common/tile-small.c: use accessors instead of accessing members of GTK+ widgets directly. svn path=/trunk/; revision=26012
This commit is contained in:
parent
c3d5eeab80
commit
4a7f395eae
19
ChangeLog
19
ChangeLog
|
@ -1,3 +1,22 @@
|
|||
2008-06-28 Michael Natterer <mitch@gimp.org>
|
||||
|
||||
* plug-ins/common/animation-play.c
|
||||
* plug-ins/common/cml-explorer.c
|
||||
* plug-ins/common/convolution-matrix.c
|
||||
* plug-ins/common/curve-bend.c
|
||||
* plug-ins/common/despeckle.c
|
||||
* plug-ins/common/filter-pack.c
|
||||
* plug-ins/common/gee-zoom.c
|
||||
* plug-ins/common/gee.c
|
||||
* plug-ins/common/lens-flare.c
|
||||
* plug-ins/common/newsprint.c
|
||||
* plug-ins/common/nova.c
|
||||
* plug-ins/common/postscript.c
|
||||
* plug-ins/common/sample-colorize.c
|
||||
* plug-ins/common/sphere-designer.c
|
||||
* plug-ins/common/tile-small.c: use accessors instead of accessing
|
||||
members of GTK+ widgets directly.
|
||||
|
||||
2008-06-28 Martin Nordholts <martinn@svn.gnome.org>
|
||||
|
||||
* pygimp-pdb.c:
|
||||
|
|
|
@ -343,8 +343,10 @@ repaint_da (GtkWidget *darea,
|
|||
GdkEventExpose *event,
|
||||
gpointer data)
|
||||
{
|
||||
gdk_draw_rgb_image (drawing_area->window,
|
||||
drawing_area->style->white_gc,
|
||||
GtkStyle *style = gtk_widget_get_style (darea);
|
||||
|
||||
gdk_draw_rgb_image (darea->window,
|
||||
style->white_gc,
|
||||
0, 0, width, height,
|
||||
(total_frames == 1) ? GDK_RGB_DITHER_MAX : DITHERTYPE,
|
||||
drawing_area_data, width * 3);
|
||||
|
@ -357,8 +359,10 @@ repaint_sda (GtkWidget *darea,
|
|||
GdkEventExpose *event,
|
||||
gpointer data)
|
||||
{
|
||||
gdk_draw_rgb_image (shape_drawing_area->window,
|
||||
shape_drawing_area->style->white_gc,
|
||||
GtkStyle *style = gtk_widget_get_style (darea);
|
||||
|
||||
gdk_draw_rgb_image (darea->window,
|
||||
style->white_gc,
|
||||
0, 0, width, height,
|
||||
(total_frames == 1) ? GDK_RGB_DITHER_MAX : DITHERTYPE,
|
||||
shape_drawing_area_data, width * 3);
|
||||
|
@ -774,6 +778,8 @@ do_playback (void)
|
|||
static void
|
||||
render_frame (gint32 whichframe)
|
||||
{
|
||||
GtkStyle *shape_style = gtk_widget_get_style (shape_drawing_area);
|
||||
GtkStyle *drawing_style = gtk_widget_get_style (drawing_area);
|
||||
GimpPixelRgn pixel_rgn;
|
||||
static guchar *rawframe = NULL;
|
||||
static gint rawwidth = 0, rawheight = 0, rawbpp = 0;
|
||||
|
@ -918,7 +924,7 @@ render_frame (gint32 whichframe)
|
|||
{
|
||||
reshape_from_bitmap (shape_preview_mask);
|
||||
gdk_draw_rgb_image (shape_drawing_area->window,
|
||||
shape_drawing_area->style->white_gc,
|
||||
shape_style->white_gc,
|
||||
0, 0, width, height,
|
||||
(total_frames == 1 ?
|
||||
GDK_RGB_DITHER_MAX : DITHERTYPE),
|
||||
|
@ -928,7 +934,7 @@ render_frame (gint32 whichframe)
|
|||
{
|
||||
reshape_from_bitmap (shape_preview_mask);
|
||||
gdk_draw_rgb_image (drawing_area->window,
|
||||
drawing_area->style->white_gc,
|
||||
drawing_style->white_gc,
|
||||
0, 0, width, height,
|
||||
(total_frames == 1 ?
|
||||
GDK_RGB_DITHER_MAX : DITHERTYPE),
|
||||
|
@ -1019,7 +1025,7 @@ render_frame (gint32 whichframe)
|
|||
|
||||
reshape_from_bitmap (shape_preview_mask);
|
||||
gdk_draw_rgb_image (shape_drawing_area->window,
|
||||
shape_drawing_area->style->white_gc,
|
||||
shape_style->white_gc,
|
||||
0, top, width, bottom - top,
|
||||
(total_frames == 1 ?
|
||||
GDK_RGB_DITHER_MAX : DITHERTYPE),
|
||||
|
@ -1030,7 +1036,7 @@ render_frame (gint32 whichframe)
|
|||
{
|
||||
reshape_from_bitmap (shape_preview_mask);
|
||||
gdk_draw_rgb_image (shape_drawing_area->window,
|
||||
shape_drawing_area->style->white_gc,
|
||||
shape_style->white_gc,
|
||||
0, 0, width, height,
|
||||
(total_frames == 1 ?
|
||||
GDK_RGB_DITHER_MAX : DITHERTYPE),
|
||||
|
@ -1045,7 +1051,7 @@ render_frame (gint32 whichframe)
|
|||
gint bottom = MIN (rawy + rawheight, height);
|
||||
|
||||
gdk_draw_rgb_image (drawing_area->window,
|
||||
drawing_area->style->white_gc,
|
||||
drawing_style->white_gc,
|
||||
0, top, width, bottom - top,
|
||||
(total_frames == 1 ?
|
||||
GDK_RGB_DITHER_MAX : DITHERTYPE),
|
||||
|
@ -1055,7 +1061,7 @@ render_frame (gint32 whichframe)
|
|||
else
|
||||
{
|
||||
gdk_draw_rgb_image (drawing_area->window,
|
||||
drawing_area->style->white_gc,
|
||||
drawing_style->white_gc,
|
||||
0, 0, width, height,
|
||||
(total_frames == 1 ?
|
||||
GDK_RGB_DITHER_MAX : DITHERTYPE),
|
||||
|
@ -1147,7 +1153,7 @@ render_frame (gint32 whichframe)
|
|||
{
|
||||
reshape_from_bitmap (shape_preview_mask);
|
||||
gdk_draw_rgb_image (shape_drawing_area->window,
|
||||
shape_drawing_area->style->white_gc,
|
||||
shape_style->white_gc,
|
||||
0, 0, width, height,
|
||||
(total_frames == 1 ?
|
||||
GDK_RGB_DITHER_MAX : DITHERTYPE),
|
||||
|
@ -1156,7 +1162,7 @@ render_frame (gint32 whichframe)
|
|||
else
|
||||
{
|
||||
gdk_draw_rgb_image (drawing_area->window,
|
||||
drawing_area->style->white_gc,
|
||||
drawing_style->white_gc,
|
||||
0, 0, width, height,
|
||||
(total_frames == 1 ?
|
||||
GDK_RGB_DITHER_MAX : DITHERTYPE),
|
||||
|
@ -1252,7 +1258,7 @@ render_frame (gint32 whichframe)
|
|||
|
||||
reshape_from_bitmap (shape_preview_mask);
|
||||
gdk_draw_rgb_image (shape_drawing_area->window,
|
||||
shape_drawing_area->style->white_gc,
|
||||
shape_style->white_gc,
|
||||
0, top, width, bottom - top,
|
||||
(total_frames == 1 ?
|
||||
GDK_RGB_DITHER_MAX : DITHERTYPE),
|
||||
|
@ -1263,7 +1269,7 @@ render_frame (gint32 whichframe)
|
|||
{
|
||||
reshape_from_bitmap (shape_preview_mask);
|
||||
gdk_draw_rgb_image (shape_drawing_area->window,
|
||||
shape_drawing_area->style->white_gc,
|
||||
shape_style->white_gc,
|
||||
0, 0, width, height,
|
||||
(total_frames == 1 ?
|
||||
GDK_RGB_DITHER_MAX : DITHERTYPE),
|
||||
|
@ -1278,7 +1284,7 @@ render_frame (gint32 whichframe)
|
|||
gint bottom = MIN (rawy + rawheight, height);
|
||||
|
||||
gdk_draw_rgb_image (drawing_area->window,
|
||||
drawing_area->style->white_gc,
|
||||
drawing_style->white_gc,
|
||||
0, top, width, bottom - top,
|
||||
(total_frames == 1 ?
|
||||
GDK_RGB_DITHER_MAX : DITHERTYPE),
|
||||
|
@ -1288,7 +1294,7 @@ render_frame (gint32 whichframe)
|
|||
else
|
||||
{
|
||||
gdk_draw_rgb_image (drawing_area->window,
|
||||
drawing_area->style->white_gc,
|
||||
drawing_style->white_gc,
|
||||
0, 0, width, height,
|
||||
(total_frames == 1 ?
|
||||
GDK_RGB_DITHER_MAX : DITHERTYPE),
|
||||
|
|
|
@ -1761,6 +1761,7 @@ function_graph_expose (GtkWidget *widget,
|
|||
GdkEventExpose *ev,
|
||||
gpointer *data)
|
||||
{
|
||||
GtkStyle *style = gtk_widget_get_style (widget);
|
||||
gint x, y, last_y;
|
||||
gint rgbi[3];
|
||||
guchar *buffer;
|
||||
|
@ -1783,7 +1784,7 @@ function_graph_expose (GtkWidget *widget,
|
|||
}
|
||||
}
|
||||
|
||||
gdk_draw_rgb_image (widget->window, widget->style->black_gc,
|
||||
gdk_draw_rgb_image (widget->window, style->black_gc,
|
||||
0, 0, 256, 256,
|
||||
GDK_RGB_DITHER_NORMAL,
|
||||
buffer,
|
||||
|
@ -1791,7 +1792,7 @@ function_graph_expose (GtkWidget *widget,
|
|||
|
||||
g_free (buffer);
|
||||
|
||||
gdk_draw_line (widget->window, widget->style->white_gc, 0,255, 255, 0);
|
||||
gdk_draw_line (widget->window, style->white_gc, 0,255, 255, 0);
|
||||
|
||||
y = 255 * CLAMP (logistic_function (param, 0, param->power),
|
||||
0, 1.0);
|
||||
|
@ -1801,7 +1802,7 @@ function_graph_expose (GtkWidget *widget,
|
|||
/* curve */
|
||||
y = 255 * CLAMP (logistic_function (param, x/(gdouble)255, param->power),
|
||||
0, 1.0);
|
||||
gdk_draw_line (widget->window, widget->style->black_gc,
|
||||
gdk_draw_line (widget->window, style->black_gc,
|
||||
x, 255-last_y, x, 255-y);
|
||||
}
|
||||
return TRUE;
|
||||
|
|
|
@ -855,7 +855,7 @@ static void
|
|||
my_toggle_callback (GtkWidget *widget,
|
||||
gboolean *data)
|
||||
{
|
||||
gint val = GTK_TOGGLE_BUTTON (widget)->active;
|
||||
gint val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
|
||||
|
||||
*data = val;
|
||||
|
||||
|
|
|
@ -1488,8 +1488,9 @@ static void
|
|||
bender_update (BenderDialog *cd,
|
||||
int update)
|
||||
{
|
||||
gint i;
|
||||
gint other;
|
||||
GtkStyle *graph_style = gtk_widget_get_style (cd->graph);
|
||||
gint i;
|
||||
gint other;
|
||||
|
||||
if (update & UP_PREVIEW)
|
||||
{
|
||||
|
@ -1524,16 +1525,16 @@ bender_update (BenderDialog *cd,
|
|||
GdkPoint points[256];
|
||||
|
||||
/* Clear the pixmap */
|
||||
gdk_draw_rectangle (cd->pixmap, cd->graph->style->bg_gc[GTK_STATE_NORMAL],
|
||||
gdk_draw_rectangle (cd->pixmap, graph_style->bg_gc[GTK_STATE_NORMAL],
|
||||
TRUE, 0, 0, GRAPH_WIDTH + RADIUS * 2, GRAPH_HEIGHT + RADIUS * 2);
|
||||
|
||||
/* Draw the grid lines */
|
||||
for (i = 0; i < 5; i++)
|
||||
{
|
||||
gdk_draw_line (cd->pixmap, cd->graph->style->dark_gc[GTK_STATE_NORMAL],
|
||||
gdk_draw_line (cd->pixmap, graph_style->dark_gc[GTK_STATE_NORMAL],
|
||||
RADIUS, i * (GRAPH_HEIGHT / 4) + RADIUS,
|
||||
GRAPH_WIDTH + RADIUS, i * (GRAPH_HEIGHT / 4) + RADIUS);
|
||||
gdk_draw_line (cd->pixmap, cd->graph->style->dark_gc[GTK_STATE_NORMAL],
|
||||
gdk_draw_line (cd->pixmap, graph_style->dark_gc[GTK_STATE_NORMAL],
|
||||
i * (GRAPH_WIDTH / 4) + RADIUS, RADIUS,
|
||||
i * (GRAPH_WIDTH / 4) + RADIUS, GRAPH_HEIGHT + RADIUS);
|
||||
}
|
||||
|
@ -1546,7 +1547,7 @@ bender_update (BenderDialog *cd,
|
|||
points[i].x = i + RADIUS;
|
||||
points[i].y = 255 - cd->curve[other][i] + RADIUS;
|
||||
}
|
||||
gdk_draw_points (cd->pixmap, cd->graph->style->dark_gc[GTK_STATE_NORMAL], points, 256);
|
||||
gdk_draw_points (cd->pixmap, graph_style->dark_gc[GTK_STATE_NORMAL], points, 256);
|
||||
|
||||
|
||||
/* Draw the active curve */
|
||||
|
@ -1555,7 +1556,7 @@ bender_update (BenderDialog *cd,
|
|||
points[i].x = i + RADIUS;
|
||||
points[i].y = 255 - cd->curve[cd->outline][i] + RADIUS;
|
||||
}
|
||||
gdk_draw_points (cd->pixmap, cd->graph->style->black_gc, points, 256);
|
||||
gdk_draw_points (cd->pixmap, graph_style->black_gc, points, 256);
|
||||
|
||||
/* Draw the points */
|
||||
if (cd->curve_type == SMOOTH)
|
||||
|
@ -1563,13 +1564,13 @@ bender_update (BenderDialog *cd,
|
|||
for (i = 0; i < 17; i++)
|
||||
{
|
||||
if (cd->points[cd->outline][i][0] != -1)
|
||||
gdk_draw_arc (cd->pixmap, cd->graph->style->black_gc, TRUE,
|
||||
gdk_draw_arc (cd->pixmap, graph_style->black_gc, TRUE,
|
||||
(cd->points[cd->outline][i][0] * 255.0),
|
||||
255 - (cd->points[cd->outline][i][1] * 255.0),
|
||||
RADIUS * 2, RADIUS * 2, 0, 23040);
|
||||
}
|
||||
}
|
||||
gdk_draw_drawable (cd->graph->window, cd->graph->style->black_gc, cd->pixmap,
|
||||
gdk_draw_drawable (cd->graph->window, graph_style->black_gc, cd->pixmap,
|
||||
0, 0, 0, 0, GRAPH_WIDTH + RADIUS * 2, GRAPH_HEIGHT + RADIUS * 2);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -594,7 +594,7 @@ static void
|
|||
dialog_adaptive_callback (GtkWidget *widget,
|
||||
gpointer data)
|
||||
{
|
||||
if (GTK_TOGGLE_BUTTON (widget)->active)
|
||||
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
|
||||
filter_type |= FILTER_ADAPTIVE;
|
||||
else
|
||||
filter_type &= ~FILTER_ADAPTIVE;
|
||||
|
@ -606,7 +606,7 @@ static void
|
|||
dialog_recursive_callback (GtkWidget *widget,
|
||||
gpointer data)
|
||||
{
|
||||
if (GTK_TOGGLE_BUTTON (widget)->active)
|
||||
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
|
||||
filter_type |= FILTER_RECURSIVE;
|
||||
else
|
||||
filter_type &= ~FILTER_RECURSIVE;
|
||||
|
|
|
@ -658,7 +658,7 @@ fp_change_current_range (GtkWidget *widget,
|
|||
{
|
||||
gimp_radio_button_update (widget, data);
|
||||
|
||||
if (GTK_TOGGLE_BUTTON (widget)->active)
|
||||
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
|
||||
{
|
||||
fp_refresh_previews (fpvals.visible_frames);
|
||||
if (AW.window && GTK_WIDGET_VISIBLE (AW.window))
|
||||
|
@ -814,7 +814,7 @@ fp_change_current_pixels_by (GtkWidget *widget,
|
|||
{
|
||||
gimp_radio_button_update (widget, data);
|
||||
|
||||
if (GTK_TOGGLE_BUTTON (widget)->active)
|
||||
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
|
||||
{
|
||||
fp_refresh_previews (fpvals.visible_frames);
|
||||
if (AW.window && GTK_WIDGET_VISIBLE (AW.window) && AW.range_preview)
|
||||
|
@ -849,7 +849,7 @@ fp_change_selection (GtkWidget *widget,
|
|||
{
|
||||
gimp_radio_button_update (widget, data);
|
||||
|
||||
if (GTK_TOGGLE_BUTTON (widget)->active)
|
||||
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
|
||||
{
|
||||
fp_redraw_all_windows ();
|
||||
}
|
||||
|
@ -997,7 +997,7 @@ fp_show_hide_frame (GtkWidget *button,
|
|||
if (frame == NULL)
|
||||
return;
|
||||
|
||||
if (GTK_TOGGLE_BUTTON (button)->active)
|
||||
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)))
|
||||
{
|
||||
if (!GTK_WIDGET_VISIBLE (frame))
|
||||
{
|
||||
|
@ -1475,19 +1475,21 @@ draw_slider (GdkWindow *window,
|
|||
static void
|
||||
draw_it (GtkWidget *widget)
|
||||
{
|
||||
GtkStyle *style = gtk_widget_get_style (AW.aliasing_graph);
|
||||
|
||||
draw_slider (AW.aliasing_graph->window,
|
||||
AW.aliasing_graph->style->black_gc,
|
||||
AW.aliasing_graph->style->dark_gc[GTK_STATE_NORMAL],
|
||||
style->black_gc,
|
||||
style->dark_gc[GTK_STATE_NORMAL],
|
||||
fpvals.cutoff[SHADOWS]);
|
||||
|
||||
draw_slider (AW.aliasing_graph->window,
|
||||
AW.aliasing_graph->style->black_gc,
|
||||
AW.aliasing_graph->style->dark_gc[GTK_STATE_NORMAL],
|
||||
style->black_gc,
|
||||
style->dark_gc[GTK_STATE_NORMAL],
|
||||
fpvals.cutoff[MIDTONES]);
|
||||
|
||||
draw_slider (AW.aliasing_graph->window,
|
||||
AW.aliasing_graph->style->black_gc,
|
||||
AW.aliasing_graph->style->dark_gc[GTK_STATE_SELECTED],
|
||||
style->black_gc,
|
||||
style->dark_gc[GTK_STATE_SELECTED],
|
||||
fpvals.offset);
|
||||
}
|
||||
|
||||
|
|
|
@ -433,6 +433,7 @@ domap3(unsigned char *src, unsigned char *dest,
|
|||
static void
|
||||
render_frame (void)
|
||||
{
|
||||
GtkStyle *style;
|
||||
int i;
|
||||
static int frame = 0;
|
||||
unsigned char* tmp;
|
||||
|
@ -444,6 +445,8 @@ render_frame (void)
|
|||
if (! GTK_WIDGET_DRAWABLE (drawing_area))
|
||||
return;
|
||||
|
||||
style = gtk_widget_get_style (drawing_area);
|
||||
|
||||
pixels = width*height*(rgb_mode?3:1);
|
||||
|
||||
tmp = preview_data2;
|
||||
|
@ -477,7 +480,7 @@ render_frame (void)
|
|||
);
|
||||
|
||||
gdk_draw_rgb_image (drawing_area->window,
|
||||
drawing_area->style->white_gc,
|
||||
style->white_gc,
|
||||
0, 0, width, height,
|
||||
GDK_RGB_DITHER_NORMAL,
|
||||
preview_data1, width * 3);
|
||||
|
@ -533,7 +536,7 @@ render_frame (void)
|
|||
);
|
||||
|
||||
gdk_draw_gray_image (drawing_area->window,
|
||||
drawing_area->style->white_gc,
|
||||
style->white_gc,
|
||||
0, 0, width, height,
|
||||
GDK_RGB_DITHER_NORMAL,
|
||||
preview_data1, width);
|
||||
|
|
|
@ -253,11 +253,15 @@ static void
|
|||
show (void)
|
||||
{
|
||||
if (GTK_WIDGET_DRAWABLE (drawing_area))
|
||||
gdk_draw_rgb_32_image (drawing_area->window,
|
||||
drawing_area->style->white_gc,
|
||||
0, 0, IWIDTH, IHEIGHT,
|
||||
GDK_RGB_DITHER_NORMAL,
|
||||
disp, IWIDTH * 4);
|
||||
{
|
||||
GtkStyle *style = gtk_widget_get_style (drawing_area);
|
||||
|
||||
gdk_draw_rgb_32_image (drawing_area->window,
|
||||
style->white_gc,
|
||||
0, 0, IWIDTH, IHEIGHT,
|
||||
GDK_RGB_DITHER_NORMAL,
|
||||
disp, IWIDTH * 4);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -827,36 +827,37 @@ flare_center_create (GimpDrawable *drawable,
|
|||
static void
|
||||
flare_center_cursor_draw (FlareCenter *center)
|
||||
{
|
||||
GtkWidget *prvw = center->preview->area;
|
||||
GtkWidget *prvw = center->preview->area;
|
||||
GtkStyle *style = gtk_widget_get_style (prvw);
|
||||
gint width, height;
|
||||
|
||||
gimp_preview_get_size (center->preview, &width, &height);
|
||||
|
||||
gdk_gc_set_function (prvw->style->black_gc, GDK_INVERT);
|
||||
gdk_gc_set_function (style->black_gc, GDK_INVERT);
|
||||
|
||||
if (show_cursor)
|
||||
{
|
||||
if (center->cursor_drawn)
|
||||
{
|
||||
gdk_draw_line (prvw->window,
|
||||
prvw->style->black_gc,
|
||||
style->black_gc,
|
||||
center->oldx, 1,
|
||||
center->oldx,
|
||||
height - 1);
|
||||
gdk_draw_line (prvw->window,
|
||||
prvw->style->black_gc,
|
||||
style->black_gc,
|
||||
1, center->oldy,
|
||||
width - 1,
|
||||
center->oldy);
|
||||
}
|
||||
|
||||
gdk_draw_line (prvw->window,
|
||||
prvw->style->black_gc,
|
||||
style->black_gc,
|
||||
center->curx, 1,
|
||||
center->curx,
|
||||
height - 1);
|
||||
gdk_draw_line (prvw->window,
|
||||
prvw->style->black_gc,
|
||||
style->black_gc,
|
||||
1, center->cury,
|
||||
width - 1,
|
||||
center->cury);
|
||||
|
@ -867,7 +868,7 @@ flare_center_cursor_draw (FlareCenter *center)
|
|||
center->oldy = center->cury;
|
||||
center->cursor_drawn = TRUE;
|
||||
|
||||
gdk_gc_set_function (prvw->style->black_gc, GDK_COPY);
|
||||
gdk_gc_set_function (style->black_gc, GDK_COPY);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -1491,15 +1491,16 @@ newsprint_cspace_update (GtkWidget *widget,
|
|||
|
||||
if (st)
|
||||
{
|
||||
gboolean active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
|
||||
|
||||
/* the CMYK widget looks after the black pullout widget */
|
||||
if (new_cs == CS_CMYK)
|
||||
{
|
||||
gtk_widget_set_sensitive (st->pull_table,
|
||||
GTK_TOGGLE_BUTTON (widget)->active);
|
||||
gtk_widget_set_sensitive (st->pull_table, active);
|
||||
}
|
||||
|
||||
/* if we're not activate, then there's nothing more to do */
|
||||
if (!GTK_TOGGLE_BUTTON (widget)->active)
|
||||
if (! active)
|
||||
return;
|
||||
|
||||
pvals.colourspace = new_cs;
|
||||
|
|
|
@ -518,33 +518,34 @@ nova_center_create (GimpDrawable *drawable,
|
|||
static void
|
||||
nova_center_cursor_draw (NovaCenter *center)
|
||||
{
|
||||
GtkWidget *prvw = center->preview->area;
|
||||
GtkWidget *prvw = center->preview->area;
|
||||
GtkStyle *style = gtk_widget_get_style (prvw);
|
||||
gint width, height;
|
||||
|
||||
gimp_preview_get_size (center->preview, &width, &height);
|
||||
|
||||
gdk_gc_set_function (prvw->style->black_gc, GDK_INVERT);
|
||||
gdk_gc_set_function (style->black_gc, GDK_INVERT);
|
||||
|
||||
if (show_cursor)
|
||||
{
|
||||
if (center->cursor_drawn)
|
||||
{
|
||||
gdk_draw_line (prvw->window,
|
||||
prvw->style->black_gc,
|
||||
style->black_gc,
|
||||
center->oldx, 1, center->oldx,
|
||||
height - 1);
|
||||
gdk_draw_line (prvw->window,
|
||||
prvw->style->black_gc,
|
||||
style->black_gc,
|
||||
1, center->oldy,
|
||||
width - 1, center->oldy);
|
||||
}
|
||||
|
||||
gdk_draw_line (prvw->window,
|
||||
prvw->style->black_gc,
|
||||
style->black_gc,
|
||||
center->curx, 1, center->curx,
|
||||
height - 1);
|
||||
gdk_draw_line (prvw->window,
|
||||
prvw->style->black_gc,
|
||||
style->black_gc,
|
||||
1, center->cury,
|
||||
width - 1, center->cury);
|
||||
}
|
||||
|
@ -554,7 +555,7 @@ nova_center_cursor_draw (NovaCenter *center)
|
|||
center->oldy = center->cury;
|
||||
center->cursor_drawn = TRUE;
|
||||
|
||||
gdk_gc_set_function (prvw->style->black_gc, GDK_COPY);
|
||||
gdk_gc_set_function (style->black_gc, GDK_COPY);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -3514,7 +3514,7 @@ static void
|
|||
save_unit_toggle_update (GtkWidget *widget,
|
||||
gpointer data)
|
||||
{
|
||||
if (GTK_TOGGLE_BUTTON (widget)->active)
|
||||
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
|
||||
{
|
||||
SaveDialogVals *vals = (SaveDialogVals *) data;
|
||||
gdouble factor;
|
||||
|
@ -3555,12 +3555,10 @@ resolution_change_callback (GtkAdjustment *adjustment,
|
|||
ratio = 1.0;
|
||||
|
||||
gtk_spin_button_set_value (GTK_SPIN_BUTTON (ps_width_spinbutton),
|
||||
GTK_SPIN_BUTTON (ps_width_spinbutton)->
|
||||
adjustment->value * ratio);
|
||||
gtk_spin_button_get_value (GTK_SPIN_BUTTON (ps_width_spinbutton)) * ratio);
|
||||
|
||||
gtk_spin_button_set_value (GTK_SPIN_BUTTON (ps_height_spinbutton),
|
||||
GTK_SPIN_BUTTON (ps_height_spinbutton)->
|
||||
adjustment->value * ratio);
|
||||
gtk_spin_button_get_value (GTK_SPIN_BUTTON (ps_height_spinbutton)) * ratio);
|
||||
|
||||
return TRUE;
|
||||
|
||||
|
|
|
@ -460,7 +460,7 @@ smp_toggle_callback (GtkWidget *widget,
|
|||
{
|
||||
gboolean *toggle_val = (gboolean *)data;
|
||||
|
||||
*toggle_val = GTK_TOGGLE_BUTTON (widget)->active;
|
||||
*toggle_val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
|
||||
|
||||
if ((data == &g_di.sample_show_selection) ||
|
||||
(data == &g_di.sample_show_color))
|
||||
|
@ -1018,7 +1018,8 @@ levels_update (gint update)
|
|||
|
||||
if (update & INPUT_SLIDERS)
|
||||
{
|
||||
gdouble width, mid, tmp;
|
||||
GtkStyle *style = gtk_widget_get_style (g_di.in_lvl_drawarea);
|
||||
gdouble width, mid, tmp;
|
||||
|
||||
levels_erase_slider (g_di.in_lvl_drawarea->window, g_di.slider_pos[0]);
|
||||
levels_erase_slider (g_di.in_lvl_drawarea->window, g_di.slider_pos[1]);
|
||||
|
@ -1033,21 +1034,23 @@ levels_update (gint update)
|
|||
g_di.slider_pos[1] = (int) (mid + width * tmp + 0.5);
|
||||
|
||||
levels_draw_slider (g_di.in_lvl_drawarea->window,
|
||||
g_di.in_lvl_drawarea->style->black_gc,
|
||||
g_di.in_lvl_drawarea->style->dark_gc[GTK_STATE_NORMAL],
|
||||
style->black_gc,
|
||||
style->dark_gc[GTK_STATE_NORMAL],
|
||||
g_di.slider_pos[1]);
|
||||
levels_draw_slider (g_di.in_lvl_drawarea->window,
|
||||
g_di.in_lvl_drawarea->style->black_gc,
|
||||
g_di.in_lvl_drawarea->style->black_gc,
|
||||
style->black_gc,
|
||||
style->black_gc,
|
||||
g_di.slider_pos[0]);
|
||||
levels_draw_slider (g_di.in_lvl_drawarea->window,
|
||||
g_di.in_lvl_drawarea->style->black_gc,
|
||||
g_di.in_lvl_drawarea->style->white_gc,
|
||||
style->black_gc,
|
||||
style->white_gc,
|
||||
g_di.slider_pos[2]);
|
||||
}
|
||||
|
||||
if (update & OUTPUT_SLIDERS)
|
||||
{
|
||||
GtkStyle *style = gtk_widget_get_style (g_di.sample_drawarea);
|
||||
|
||||
levels_erase_slider (g_di.sample_drawarea->window, g_di.slider_pos[3]);
|
||||
levels_erase_slider (g_di.sample_drawarea->window, g_di.slider_pos[4]);
|
||||
|
||||
|
@ -1055,12 +1058,12 @@ levels_update (gint update)
|
|||
g_di.slider_pos[4] = DA_WIDTH * ((double) g_values.lvl_out_max / 255.0);
|
||||
|
||||
levels_draw_slider (g_di.sample_drawarea->window,
|
||||
g_di.sample_drawarea->style->black_gc,
|
||||
g_di.sample_drawarea->style->black_gc,
|
||||
style->black_gc,
|
||||
style->black_gc,
|
||||
g_di.slider_pos[3]);
|
||||
levels_draw_slider (g_di.sample_drawarea->window,
|
||||
g_di.sample_drawarea->style->black_gc,
|
||||
g_di.sample_drawarea->style->black_gc,
|
||||
style->black_gc,
|
||||
style->black_gc,
|
||||
g_di.slider_pos[4]);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2292,10 +2292,11 @@ static gboolean
|
|||
expose_event (GtkWidget *widget,
|
||||
GdkEventExpose *event)
|
||||
{
|
||||
guchar *data = img + event->area.y * 3 * PREVIEWSIZE + event->area.x * 3;
|
||||
GtkStyle *style = gtk_widget_get_style (widget);
|
||||
guchar *data = img + event->area.y * 3 * PREVIEWSIZE + event->area.x * 3;
|
||||
|
||||
gdk_draw_rgb_image_dithalign (widget->window,
|
||||
widget->style->white_gc,
|
||||
style->white_gc,
|
||||
event->area.x, event->area.y,
|
||||
event->area.width, event->area.height,
|
||||
GDK_RGB_DITHER_MAX,
|
||||
|
|
|
@ -640,38 +640,39 @@ draw_explict_sel (void)
|
|||
{
|
||||
if (exp_call.type == EXPLICT)
|
||||
{
|
||||
gdouble x,y;
|
||||
gdouble width = (gdouble) preview_width / (gdouble) itvals.numtiles;
|
||||
gdouble height = (gdouble) preview_height / (gdouble) itvals.numtiles;
|
||||
GtkStyle *style = gtk_widget_get_style (tint.preview);
|
||||
gdouble x,y;
|
||||
gdouble width = (gdouble) preview_width / (gdouble) itvals.numtiles;
|
||||
gdouble height = (gdouble) preview_height / (gdouble) itvals.numtiles;
|
||||
|
||||
x = width * (exp_call.x - 1);
|
||||
y = height * (exp_call.y - 1);
|
||||
|
||||
gdk_gc_set_function (tint.preview->style->black_gc, GDK_INVERT);
|
||||
gdk_gc_set_function (style->black_gc, GDK_INVERT);
|
||||
|
||||
gdk_draw_rectangle (tint.preview->window,
|
||||
tint.preview->style->black_gc,
|
||||
style->black_gc,
|
||||
0,
|
||||
(gint) x,
|
||||
(gint) y,
|
||||
(gint) width,
|
||||
(gint) height);
|
||||
gdk_draw_rectangle (tint.preview->window,
|
||||
tint.preview->style->black_gc,
|
||||
style->black_gc,
|
||||
0,
|
||||
(gint) x + 1,
|
||||
(gint) y + 1,
|
||||
(gint) width - 2,
|
||||
(gint) height - 2);
|
||||
gdk_draw_rectangle (tint.preview->window,
|
||||
tint.preview->style->black_gc,
|
||||
style->black_gc,
|
||||
0,
|
||||
(gint) x + 2,
|
||||
(gint) y + 2,
|
||||
(gint) width - 4,
|
||||
(gint) height - 4);
|
||||
|
||||
gdk_gc_set_function (tint.preview->style->black_gc, GDK_COPY);
|
||||
gdk_gc_set_function (style->black_gc, GDK_COPY);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -812,7 +813,7 @@ tileit_radio_update (GtkWidget *widget,
|
|||
{
|
||||
gimp_radio_button_update (widget, data);
|
||||
|
||||
if (GTK_TOGGLE_BUTTON (widget)->active)
|
||||
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
|
||||
{
|
||||
switch (exp_call.type)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue