diff options
| author | Milosz Derezynski <mderezynski@gmail.com> | 2006-05-22 08:57:39 +0000 |
|---|---|---|
| committer | mderezynski <mderezynski@users.sourceforge.net> | 2006-05-22 08:57:39 +0000 |
| commit | 6c5f67c056b76e38278c81c559ddc9db68e5f8e4 (patch) | |
| tree | 5c6cb8ed8ac5f8a9d3675f7237becca591204339 /src/widgets/toolbox.cpp | |
| parent | * Don't forget to acquire the row from the model in toolbox.cpp:cell_data_func() (diff) | |
| download | inkscape-6c5f67c056b76e38278c81c559ddc9db68e5f8e4.tar.gz inkscape-6c5f67c056b76e38278c81c559ddc9db68e5f8e4.zip | |
* Make sure we don't read on NULL pointer instead of gobject instance in text-edit.cpp:*_set_insensitive()
(bzr r938)
Diffstat (limited to 'src/widgets/toolbox.cpp')
| -rw-r--r-- | src/widgets/toolbox.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 98ea859a8..f8f2f611d 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -2967,6 +2967,9 @@ namespace { GtkTreeIter iter; char *family; + gdk_pointer_ungrab (GDK_CURRENT_TIME); + gdk_keyboard_ungrab (GDK_CURRENT_TIME); + gtk_tree_selection_get_selected (selection, &model, &iter); gtk_tree_model_get (model, &iter, 0, &family, -1); @@ -3209,6 +3212,7 @@ namespace { gtk_window_move (GTK_WINDOW (popdown), x, y + widget->allocation.height + 2); //2px of grace space gtk_widget_show_all (popdown); +#if 0 gdk_pointer_grab (widget->window, TRUE, GdkEventMask (GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | @@ -3216,6 +3220,7 @@ namespace { NULL, NULL, GDK_CURRENT_TIME); gdk_keyboard_grab (widget->window, TRUE, GDK_CURRENT_TIME); +#endif visible = true; } |