Commit 3b91bfcc authored by Morten Welinder's avatar Morten Welinder

Broken cvs -- retry.

parent 3063d373
......@@ -327,8 +327,9 @@ foo_canvas_item_dispose (GObject *object)
}
if (item == item->canvas->grabbed_item) {
GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (item->canvas));
item->canvas->grabbed_item = NULL;
gdk_pointer_ungrab (GDK_CURRENT_TIME);
gdk_display_pointer_ungrab (display, GDK_CURRENT_TIME);
}
if (item == item->canvas->focused_item)
......@@ -879,14 +880,16 @@ foo_canvas_item_grab (FooCanvasItem *item, guint event_mask, GdkCursor *cursor,
void
foo_canvas_item_ungrab (FooCanvasItem *item, guint32 etime)
{
GdkDisplay *display;
g_return_if_fail (FOO_IS_CANVAS_ITEM (item));
if (item->canvas->grabbed_item != item)
return;
display = gtk_widget_get_display (GTK_WIDGET (item->canvas));
item->canvas->grabbed_item = NULL;
gdk_pointer_ungrab (etime);
gdk_display_pointer_ungrab (display, etime);
}
......@@ -2120,8 +2123,9 @@ shutdown_transients (FooCanvas *canvas)
}
if (canvas->grabbed_item) {
GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (canvas));
canvas->grabbed_item = NULL;
gdk_pointer_ungrab (GDK_CURRENT_TIME);
gdk_display_pointer_ungrab (display, GDK_CURRENT_TIME);
}
remove_idle (canvas);
......
2003-05-22 Morten Welinder <terra@gnome.org>
* dialog-stf-fixed-page.c (fixed_page_canvas_motion_notify_event):
Set cursor for right display.
* dialog-cell-format.c (cb_rotate_canvas_button): Ungrab the right
display.
* dialog-view.c, view.glade: New files.
2003-05-21 Morten Welinder <terra@gnome.org>
......
......@@ -1331,7 +1331,8 @@ cb_rotate_canvas_button (GnomeCanvas *canvas, GdkEventButton *event,
return TRUE;
} else if (event->type == GDK_BUTTON_RELEASE) {
if (state->align.motion_handle != 0) {
gdk_pointer_ungrab (event->time);
gdk_display_pointer_ungrab (gtk_widget_get_display (GTK_WIDGET (canvas)),
event->time);
g_signal_handler_disconnect (canvas, state->align.motion_handle);
state->align.motion_handle = 0;
}
......
......@@ -159,6 +159,7 @@ fixed_page_scroll_value_changed (GtkAdjustment *adjustment, DruidPageData_t *dat
static gboolean
fixed_page_canvas_motion_notify_event (GnomeCanvas *canvas, GdkEventMotion *event, DruidPageData_t *data)
{
GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (canvas));
FixedInfo_t *info = data->fixed_info;
GdkCursor *cursor;
double worldx, worldy;
......@@ -170,7 +171,7 @@ fixed_page_canvas_motion_notify_event (GnomeCanvas *canvas, GdkEventMotion *even
if (column != -1 || info->fixed_run_mousedown) {
cursor = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW);
cursor = gdk_cursor_new_for_display (display, GDK_SB_H_DOUBLE_ARROW);
gdk_window_set_cursor (canvas->layout.bin_window, cursor);
gdk_cursor_unref (cursor);
......@@ -231,7 +232,7 @@ fixed_page_canvas_motion_notify_event (GnomeCanvas *canvas, GdkEventMotion *even
}
} else {
cursor = gdk_cursor_new (GDK_HAND2);
cursor = gdk_cursor_new_for_display (display, GDK_HAND2);
gdk_window_set_cursor (canvas->layout.bin_window, cursor);
gdk_cursor_unref (cursor);
}
......
......@@ -76,11 +76,6 @@ cb_view_ok_clicked (G_GNUC_UNUSED GtkWidget *button,
if (!name)
return; /* Just ignore */
gnumeric_notice (state->wbcg, GTK_MESSAGE_ERROR,
_("Connecting to a different display has been disabled "
"due to bugs in GTK+."));
return;
display = gdk_display_open (name);
if (!display) {
char *error_str =
......
2003-05-22 Morten Welinder <terra@gnome.org>
* widget-editable-label.c (el_set_cursor): Set cursor for the
right display.
2003-05-19 Morten Welinder <terra@gnome.org>
* gnumeric-cell-renderer-toggle.c
......
......@@ -86,7 +86,8 @@ el_set_style_label (EditableLabel *el)
static void
el_set_cursor (GtkEntry *entry, GdkCursorType cursor_type)
{
GdkCursor *cursor = gdk_cursor_new (cursor_type);
GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (entry));
GdkCursor *cursor = gdk_cursor_new_for_display (display, cursor_type);
gdk_window_set_cursor (entry->text_area, cursor);
gdk_cursor_unref (cursor);
}
......
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