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

Changed name of `gimp_rectangle_tool_is_active_at' to

Browse Source 
2007-12-13  Martin Nordholts  <martinn@svn.gnome.org>

	* app/tools/gimprectangletool.[ch]: Changed name of
	`gimp_rectangle_tool_is_active_at' to
	`gimp_rectangle_tool_is_active_on_display'.

	* app/tools/gimpcroptool.c
	* app/tools/gimprectangleselecttool.c: Use the new name.

svn path=/trunk/; revision=24360
This commit is contained in:
Martin Nordholts
2007-12-13 21:48:55 +00:00
committed by Martin Nordholts
parent 54dd1e1fab
commit 8208d16bb0
5 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2007-12-13 Martin Nordholts <martinn@svn.gnome.org>
* app/tools/gimprectangletool.[ch]: Changed name of
`gimp_rectangle_tool_is_active_at' to
`gimp_rectangle_tool_is_active_on_display'.
* app/tools/gimpcroptool.c
* app/tools/gimprectangleselecttool.c: Use the new name.
2007-12-13 Martin Nordholts <martinn@svn.gnome.org>
* app/tools/gimprectangletool.[ch]: Don't use the `display' member

2
app/tools/gimpcroptool.c
View File

@ -232,7 +232,7 @@ gimp_crop_tool_button_press (GimpTool *tool,
rect_tool = GIMP_RECTANGLE_TOOL (tool);
if (gimp_rectangle_tool_is_active (rect_tool) &&
! gimp_rectangle_tool_is_active_at (rect_tool, display))
! gimp_rectangle_tool_is_active_on_display (rect_tool, display))
gimp_rectangle_tool_cancel (GIMP_RECTANGLE_TOOL (tool));
gimp_rectangle_tool_button_press (tool, coords, time, state, display);

2
app/tools/gimprectangleselecttool.c
View File

@ -350,7 +350,7 @@ gimp_rect_select_tool_button_press (GimpTool *tool,
priv = GIMP_RECT_SELECT_TOOL_GET_PRIVATE(rect_sel_tool);
if (gimp_rectangle_tool_is_active (rectangle) &&
! gimp_rectangle_tool_is_active_at (rectangle, display))
! gimp_rectangle_tool_is_active_on_display (rectangle, display))
gimp_rectangle_tool_cancel (GIMP_RECTANGLE_TOOL (tool));
function = gimp_rectangle_tool_get_function (rectangle);

16
app/tools/gimprectangletool.c
View File

@ -697,7 +697,7 @@ gimp_rectangle_tool_get_active_display (GimpRectangleTool *rect_tool)
}
/**
* gimp_rectangle_tool_is_active_at:
* gimp_rectangle_tool_is_active_on_display:
* @rect_tool:
* @display: The #GimpDisplay to test for.
*
@ -705,7 +705,7 @@ gimp_rectangle_tool_get_active_display (GimpRectangleTool *rect_tool)
* otherwise.
**/
gboolean
gimp_rectangle_tool_is_active_at (GimpRectangleTool *rect_tool,
gimp_rectangle_tool_is_active_on_display (GimpRectangleTool *rect_tool,
GimpDisplay *display)
{
g_return_val_if_fail (GIMP_IS_RECTANGLE_TOOL (rect_tool), FALSE);
@ -883,7 +883,7 @@ gimp_rectangle_tool_button_press (GimpTool *tool,
gimp_draw_tool_pause (draw_tool);
if (! gimp_rectangle_tool_is_active_at (rect_tool, display))
if (! gimp_rectangle_tool_is_active_on_display (rect_tool, display))
{
if (gimp_draw_tool_is_active (draw_tool))
{
@ -992,7 +992,7 @@ gimp_rectangle_tool_button_release (GimpTool *tool,
private = GIMP_RECTANGLE_TOOL_GET_PRIVATE (tool);
options = GIMP_RECTANGLE_TOOL_GET_OPTIONS (tool);
if (! gimp_rectangle_tool_is_active_at (rect_tool, display))
if (! gimp_rectangle_tool_is_active_on_display (rect_tool, display))
return;
gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
@ -1397,7 +1397,7 @@ gimp_rectangle_tool_key_press (GimpTool *tool,
rect_tool = GIMP_RECTANGLE_TOOL (tool);
private = GIMP_RECTANGLE_TOOL_GET_PRIVATE (tool);
if (! gimp_rectangle_tool_is_active_at (rect_tool, display))
if (! gimp_rectangle_tool_is_active_on_display (rect_tool, display))
return FALSE;
switch (kevent->keyval)
@ -1533,7 +1533,7 @@ gimp_rectangle_tool_oper_update (GimpTool *tool,
private = GIMP_RECTANGLE_TOOL_GET_PRIVATE (tool);
rect_tool = GIMP_RECTANGLE_TOOL (tool);
if (! gimp_rectangle_tool_is_active_at (rect_tool, display))
if (! gimp_rectangle_tool_is_active_on_display (rect_tool, display))
return;
if (private->suppress_updates)
@ -1635,7 +1635,7 @@ gimp_rectangle_tool_cursor_update (GimpTool *tool,
rect_tool = GIMP_RECTANGLE_TOOL (tool);
private = GIMP_RECTANGLE_TOOL_GET_PRIVATE (tool);
if (gimp_rectangle_tool_is_active_at (rect_tool, display))
if (gimp_rectangle_tool_is_active_on_display (rect_tool, display))
{
switch (private->function)
{
@ -1862,7 +1862,7 @@ gimp_rectangle_tool_update_handle_sizes (GimpRectangleTool *rect_tool,
tool = GIMP_TOOL (rect_tool);
private = GIMP_RECTANGLE_TOOL_GET_PRIVATE (tool);
if (! gimp_rectangle_tool_is_active_at (rect_tool, display))
if (! gimp_rectangle_tool_is_active_on_display (rect_tool, display))
return;
shell = GIMP_DISPLAY_SHELL (display->shell);

2
app/tools/gimprectangletool.h
View File

@ -143,7 +143,7 @@ gboolean gimp_rectangle_tool_point_in_rectangle (GimpRectangleTool *re
gdouble x,
gdouble y);
GimpDisplay*gimp_rectangle_tool_get_active_display (GimpRectangleTool *rect_tool);
gboolean gimp_rectangle_tool_is_active_at (GimpRectangleTool *rect_tool,
gboolean gimp_rectangle_tool_is_active_on_display(GimpRectangleTool *rect_tool,
GimpDisplay *display);
gboolean gimp_rectangle_tool_is_active (GimpRectangleTool *rect_tool);