Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'issue2225' into gtk-3-24

Browse Source
This commit is contained in:
John Ralls
2020-01-30 10:31:57 -08:00
parent 9c832b388b eabaf90076
commit e2c34b9db7
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/gtkapplication-quartz-menu.c
View File

@@ -393,8 +393,15 @@ menu_item_removed (gint position,
gpointer user_data)
{
GNSMenu *menu = user_data;
[menu removeItemAtIndex:position];
@try
{
[menu removeItemAtIndex:position];
}
@catch(NSException *err)
{
g_critical("GNSMenu removeItemAtIndex: %d raised exception %s", position,
[[err reason] UTF8String]);
}
}
@implementation GNSMenu

6
gtk/gtkdnd-quartz.c
View File

@@ -444,7 +444,7 @@ gtk_drag_dest_set (GtkWidget *widget,
old_site = g_object_get_data (G_OBJECT (widget), "gtk-drag-dest");
site = g_new (GtkDragDestSite, 1);
site = g_new0 (GtkDragDestSite, 1);
site->flags = flags;
site->have_drag = FALSE;
if (targets)
@@ -519,6 +519,7 @@ gtk_drag_dest_unset (GtkWidget *widget)
/**
* gtk_drag_dest_get_target_list: (method)
* @widget: a #GtkWidget
* Returns: (nullable) (transfer none): the #GtkTargetList, or %NULL if none
*/
GtkTargetList*
gtk_drag_dest_get_target_list (GtkWidget *widget)
@@ -1202,7 +1203,8 @@ gtk_drag_begin_internal (GtkWidget *widget,
window = [(id<GdkNSView>)[nswindow contentView] gdkWindow];
g_return_val_if_fail (nsevent != NULL, NULL);
g_return_val_if_fail (target_list != NULL, NULL);
context = gdk_drag_begin (window, g_list_copy (target_list->list));
g_return_val_if_fail (context != NULL, NULL);