dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app: fix implicit enum casting 

Silences clang.
This commit is contained in:
Kristian Rietveld 2015-01-09 23:47:57 +01:00
parent 6b6baa6b91
commit cea42c73d8
9 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/display/gimpdisplay-foreach.c
View File

@ -285,7 +285,7 @@ gimp_displays_set_busy (Gimp *gimp)
GimpDisplayShell *shell = GimpDisplayShell *shell =
gimp_display_get_shell (GIMP_DISPLAY (list->data)); gimp_display_get_shell (GIMP_DISPLAY (list->data));
gimp_display_shell_set_override_cursor (shell, GDK_WATCH); gimp_display_shell_set_override_cursor (shell, (GimpCursorType) GDK_WATCH);
} }
} }

6
app/display/gimpdisplayshell-tool-events.c
View File

@ -1473,9 +1473,11 @@ gimp_display_shell_start_scrolling (GimpDisplayShell *shell,
shell->rotate_drag_angle = shell->rotate_angle; shell->rotate_drag_angle = shell->rotate_angle;
if (shell->rotating) if (shell->rotating)
gimp_display_shell_set_override_cursor (shell, GDK_EXCHANGE); gimp_display_shell_set_override_cursor (shell,
(GimpCursorType) GDK_EXCHANGE);
else else
gimp_display_shell_set_override_cursor (shell, GDK_FLEUR); gimp_display_shell_set_override_cursor (shell,
(GimpCursorType) GDK_FLEUR);
} }
static void static void

2
app/file/file-utils.c
View File

@ -256,7 +256,7 @@ file_utils_load_thumbnail (const gchar *filename)
gimp_thumbnail_set_uri (thumbnail, uri); gimp_thumbnail_set_uri (thumbnail, uri);
pixbuf = gimp_thumbnail_load_thumb (thumbnail, pixbuf = gimp_thumbnail_load_thumb (thumbnail,
GIMP_THUMBNAIL_SIZE_NORMAL, (GimpThumbSize) GIMP_THUMBNAIL_SIZE_NORMAL,
NULL); NULL);
} }

2
app/tools/gimpregionselecttool.c
View File

@ -360,7 +360,7 @@ gimp_region_select_tool_get_mask (GimpRegionSelectTool *region_sel,
GimpRegionSelectOptions *options = GIMP_REGION_SELECT_TOOL_GET_OPTIONS (region_sel); GimpRegionSelectOptions *options = GIMP_REGION_SELECT_TOOL_GET_OPTIONS (region_sel);
GimpDisplayShell *shell = gimp_display_get_shell (display); GimpDisplayShell *shell = gimp_display_get_shell (display);
gimp_display_shell_set_override_cursor (shell, GDK_WATCH); gimp_display_shell_set_override_cursor (shell, (GimpCursorType) GDK_WATCH);
if (region_sel->segs) if (region_sel->segs)
{ {

6
app/tools/gimptexttool.c
View File

@ -694,7 +694,8 @@ gimp_text_tool_cursor_update (GimpTool *tool,
coords->y) && coords->y) &&
! text_tool->moving) ! text_tool->moving)
{ {
gimp_tool_control_set_cursor (tool->control, GDK_XTERM); gimp_tool_control_set_cursor (tool->control,
(GimpCursorType) GDK_XTERM);
gimp_tool_control_set_cursor_modifier (tool->control, gimp_tool_control_set_cursor_modifier (tool->control,
GIMP_CURSOR_MODIFIER_NONE); GIMP_CURSOR_MODIFIER_NONE);
} }
@ -705,7 +706,8 @@ gimp_text_tool_cursor_update (GimpTool *tool,
} }
else else
{ {
gimp_tool_control_set_cursor (tool->control, GDK_XTERM); gimp_tool_control_set_cursor (tool->control,
(GimpCursorType) GDK_XTERM);
gimp_tool_control_set_cursor_modifier (tool->control, gimp_tool_control_set_cursor_modifier (tool->control,
GIMP_CURSOR_MODIFIER_NONE); GIMP_CURSOR_MODIFIER_NONE);
} }

2
app/widgets/gimpcursor.c
View File

@ -245,7 +245,7 @@ gimp_cursor_new (GdkDisplay *display,
g_return_val_if_fail (cursor_type < GIMP_CURSOR_LAST, NULL); g_return_val_if_fail (cursor_type < GIMP_CURSOR_LAST, NULL);
if (cursor_type <= (GimpCursorType) GDK_LAST_CURSOR) if (cursor_type <= (GimpCursorType) GDK_LAST_CURSOR)
return gdk_cursor_new_for_display (display, cursor_type); return gdk_cursor_new_for_display (display, (GdkCursorType) cursor_type);
g_return_val_if_fail (cursor_type >= GIMP_CURSOR_NONE, NULL); g_return_val_if_fail (cursor_type >= GIMP_CURSOR_NONE, NULL);

2
app/widgets/gimpcurveview.c
View File

@ -906,7 +906,7 @@ gimp_curve_view_motion_notify (GtkWidget *widget,
GimpCurveView *view = GIMP_CURVE_VIEW (widget); GimpCurveView *view = GIMP_CURVE_VIEW (widget);
GimpCurve *curve = view->curve; GimpCurve *curve = view->curve;
GtkAllocation allocation; GtkAllocation allocation;
GimpCursorType new_cursor = GDK_X_CURSOR; GdkCursorType new_cursor = GDK_X_CURSOR;
gint border; gint border;
gint width, height; gint width, height;
gdouble x; gdouble x;

2
app/widgets/gimpdialogfactory.c
View File

@ -1569,7 +1569,7 @@ gimp_dialog_factory_set_busy (GimpDialogFactory *factory)
cursor = gimp_cursor_new (display, cursor = gimp_cursor_new (display,
GIMP_HANDEDNESS_RIGHT, GIMP_HANDEDNESS_RIGHT,
GDK_WATCH, (GimpCursorType) GDK_WATCH,
GIMP_TOOL_CURSOR_NONE, GIMP_TOOL_CURSOR_NONE,
GIMP_CURSOR_MODIFIER_NONE); GIMP_CURSOR_MODIFIER_NONE);
} }

2
app/widgets/gimpthumbbox.c
View File

@ -676,7 +676,7 @@ gimp_thumb_box_create_thumbnail (GimpThumbBox *box,
gimp_imagefile_set_file (box->imagefile, file); gimp_imagefile_set_file (box->imagefile, file);
if (force || if (force ||
(gimp_thumbnail_peek_thumb (thumb, size) < GIMP_THUMB_STATE_FAILED && (gimp_thumbnail_peek_thumb (thumb, (GimpThumbSize) size) < GIMP_THUMB_STATE_FAILED &&
! gimp_thumbnail_has_failed (thumb))) ! gimp_thumbnail_has_failed (thumb)))
{ {
GError *error = NULL; GError *error = NULL;