Commit 6fddfc29 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files

app/gdisplay.[ch] oops, my last commit caused a segfault.

2000-06-09  Michael Natterer  <mitch@gimp.org>

	* app/gdisplay.[ch]
	* app/scroll.c: oops, my last commit caused a segfault.
parent 48b32fd2
2000-06-09 Michael Natterer <mitch@gimp.org>
* app/gdisplay.[ch]
* app/scroll.c: oops, my last commit caused a segfault.
2000-06-09 Michael Natterer <mitch@gimp.org>
 
Cursor patch II:
......
......@@ -1605,8 +1605,11 @@ gdisplay_real_install_tool_cursor (GDisplay *gdisp,
}
void
gdisplay_install_tool_cursor (GDisplay *gdisp,
GdkCursorType cursor_type)
gdisplay_install_tool_cursor (GDisplay *gdisp,
GdkCursorType cursor_type) /*,
ToolType tool_type,
CursorModifier modifier,
gboolean toggle_cursor) */
{
if (!gdisp->using_override_cursor)
gdisplay_real_install_tool_cursor (gdisp,
......@@ -1614,6 +1617,9 @@ gdisplay_install_tool_cursor (GDisplay *gdisp,
TOOL_TYPE_NONE,
CURSOR_MODIFIER_NONE,
FALSE,
/*tool_type,
modifier,
toggle_cursor,*/
FALSE);
}
......@@ -1647,7 +1653,7 @@ gdisplay_remove_override_cursor (GDisplay *gdisp)
gdisp->using_override_cursor = FALSE;
gdisplay_real_install_tool_cursor (gdisp,
gdisp->current_cursor,
active_tool->type,
gdisp->cursor_tool,
CURSOR_MODIFIER_NONE,
FALSE,
TRUE);
......
......@@ -183,18 +183,21 @@ void gdisplay_transform_coords_f (GDisplay *, gdouble, gdouble,
void gdisplay_untransform_coords_f (GDisplay *, gdouble, gdouble,
gdouble *, gdouble *, gboolean);
void gdisplay_real_install_tool_cursor (GDisplay *gdisp,
GdkCursorType cursor_type,
ToolType tool_type,
CursorModifier modifier,
gboolean toggle_cursor,
gboolean always_install);
void gdisplay_install_tool_cursor (GDisplay *gdisp,
GdkCursorType cursor_type);
void gdisplay_remove_tool_cursor (GDisplay *gdisp);
void gdisplay_install_override_cursor (GDisplay *gdisp,
GdkCursorType cursor_type);
void gdisplay_remove_override_cursor (GDisplay *gdisp);
void gdisplay_real_install_tool_cursor (GDisplay *gdisp,
GdkCursorType cursor_type,
ToolType tool_type,
CursorModifier modifier,
gboolean toggle_cursor,
gboolean always_install);
void gdisplay_install_tool_cursor (GDisplay *gdisp,
GdkCursorType cursor_type); /*,
ToolType tool_type,
CursorModifier modifier,
gboolean toggle_cursor); */
void gdisplay_remove_tool_cursor (GDisplay *gdisp);
void gdisplay_install_override_cursor (GDisplay *gdisp,
GdkCursorType cursor_type);
void gdisplay_remove_override_cursor (GDisplay *gdisp);
void gdisplay_set_menu_sensitivity (GDisplay *);
void gdisplay_expose_area (GDisplay *, gint, gint, gint, gint);
......
......@@ -78,7 +78,7 @@ end_grab_and_scroll (GDisplay *gdisp,
{
gdisplay_real_install_tool_cursor (gdisp,
gdisp->current_cursor,
active_tool->type,
gdisp->cursor_tool,
CURSOR_MODIFIER_NONE,
FALSE,
TRUE);
......
......@@ -1605,8 +1605,11 @@ gdisplay_real_install_tool_cursor (GDisplay *gdisp,
}
void
gdisplay_install_tool_cursor (GDisplay *gdisp,
GdkCursorType cursor_type)
gdisplay_install_tool_cursor (GDisplay *gdisp,
GdkCursorType cursor_type) /*,
ToolType tool_type,
CursorModifier modifier,
gboolean toggle_cursor) */
{
if (!gdisp->using_override_cursor)
gdisplay_real_install_tool_cursor (gdisp,
......@@ -1614,6 +1617,9 @@ gdisplay_install_tool_cursor (GDisplay *gdisp,
TOOL_TYPE_NONE,
CURSOR_MODIFIER_NONE,
FALSE,
/*tool_type,
modifier,
toggle_cursor,*/
FALSE);
}
......@@ -1647,7 +1653,7 @@ gdisplay_remove_override_cursor (GDisplay *gdisp)
gdisp->using_override_cursor = FALSE;
gdisplay_real_install_tool_cursor (gdisp,
gdisp->current_cursor,
active_tool->type,
gdisp->cursor_tool,
CURSOR_MODIFIER_NONE,
FALSE,
TRUE);
......
......@@ -183,18 +183,21 @@ void gdisplay_transform_coords_f (GDisplay *, gdouble, gdouble,
void gdisplay_untransform_coords_f (GDisplay *, gdouble, gdouble,
gdouble *, gdouble *, gboolean);
void gdisplay_real_install_tool_cursor (GDisplay *gdisp,
GdkCursorType cursor_type,
ToolType tool_type,
CursorModifier modifier,
gboolean toggle_cursor,
gboolean always_install);
void gdisplay_install_tool_cursor (GDisplay *gdisp,
GdkCursorType cursor_type);
void gdisplay_remove_tool_cursor (GDisplay *gdisp);
void gdisplay_install_override_cursor (GDisplay *gdisp,
GdkCursorType cursor_type);
void gdisplay_remove_override_cursor (GDisplay *gdisp);
void gdisplay_real_install_tool_cursor (GDisplay *gdisp,
GdkCursorType cursor_type,
ToolType tool_type,
CursorModifier modifier,
gboolean toggle_cursor,
gboolean always_install);
void gdisplay_install_tool_cursor (GDisplay *gdisp,
GdkCursorType cursor_type); /*,
ToolType tool_type,
CursorModifier modifier,
gboolean toggle_cursor); */
void gdisplay_remove_tool_cursor (GDisplay *gdisp);
void gdisplay_install_override_cursor (GDisplay *gdisp,
GdkCursorType cursor_type);
void gdisplay_remove_override_cursor (GDisplay *gdisp);
void gdisplay_set_menu_sensitivity (GDisplay *);
void gdisplay_expose_area (GDisplay *, gint, gint, gint, gint);
......
......@@ -78,7 +78,7 @@ end_grab_and_scroll (GDisplay *gdisp,
{
gdisplay_real_install_tool_cursor (gdisp,
gdisp->current_cursor,
active_tool->type,
gdisp->cursor_tool,
CURSOR_MODIFIER_NONE,
FALSE,
TRUE);
......
......@@ -1605,8 +1605,11 @@ gdisplay_real_install_tool_cursor (GDisplay *gdisp,
}
void
gdisplay_install_tool_cursor (GDisplay *gdisp,
GdkCursorType cursor_type)
gdisplay_install_tool_cursor (GDisplay *gdisp,
GdkCursorType cursor_type) /*,
ToolType tool_type,
CursorModifier modifier,
gboolean toggle_cursor) */
{
if (!gdisp->using_override_cursor)
gdisplay_real_install_tool_cursor (gdisp,
......@@ -1614,6 +1617,9 @@ gdisplay_install_tool_cursor (GDisplay *gdisp,
TOOL_TYPE_NONE,
CURSOR_MODIFIER_NONE,
FALSE,
/*tool_type,
modifier,
toggle_cursor,*/
FALSE);
}
......@@ -1647,7 +1653,7 @@ gdisplay_remove_override_cursor (GDisplay *gdisp)
gdisp->using_override_cursor = FALSE;
gdisplay_real_install_tool_cursor (gdisp,
gdisp->current_cursor,
active_tool->type,
gdisp->cursor_tool,
CURSOR_MODIFIER_NONE,
FALSE,
TRUE);
......
......@@ -183,18 +183,21 @@ void gdisplay_transform_coords_f (GDisplay *, gdouble, gdouble,
void gdisplay_untransform_coords_f (GDisplay *, gdouble, gdouble,
gdouble *, gdouble *, gboolean);
void gdisplay_real_install_tool_cursor (GDisplay *gdisp,
GdkCursorType cursor_type,
ToolType tool_type,
CursorModifier modifier,
gboolean toggle_cursor,
gboolean always_install);
void gdisplay_install_tool_cursor (GDisplay *gdisp,
GdkCursorType cursor_type);
void gdisplay_remove_tool_cursor (GDisplay *gdisp);
void gdisplay_install_override_cursor (GDisplay *gdisp,
GdkCursorType cursor_type);
void gdisplay_remove_override_cursor (GDisplay *gdisp);
void gdisplay_real_install_tool_cursor (GDisplay *gdisp,
GdkCursorType cursor_type,
ToolType tool_type,
CursorModifier modifier,
gboolean toggle_cursor,
gboolean always_install);
void gdisplay_install_tool_cursor (GDisplay *gdisp,
GdkCursorType cursor_type); /*,
ToolType tool_type,
CursorModifier modifier,
gboolean toggle_cursor); */
void gdisplay_remove_tool_cursor (GDisplay *gdisp);
void gdisplay_install_override_cursor (GDisplay *gdisp,
GdkCursorType cursor_type);
void gdisplay_remove_override_cursor (GDisplay *gdisp);
void gdisplay_set_menu_sensitivity (GDisplay *);
void gdisplay_expose_area (GDisplay *, gint, gint, gint, gint);
......
......@@ -78,7 +78,7 @@ end_grab_and_scroll (GDisplay *gdisp,
{
gdisplay_real_install_tool_cursor (gdisp,
gdisp->current_cursor,
active_tool->type,
gdisp->cursor_tool,
CURSOR_MODIFIER_NONE,
FALSE,
TRUE);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment