[gtk/nested-popover-menu] warning fixes
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/nested-popover-menu] warning fixes
- Date: Wed, 4 Sep 2019 04:12:27 +0000 (UTC)
commit d8980befd546ecb65c70fea8ab452649164ba9f2
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Sep 4 00:11:05 2019 -0400
warning fixes
gtk/gtkpopover.c | 2 +-
gtk/gtkpopovermenu.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c
index db23eef002..bc8f0f80fa 100644
--- a/gtk/gtkpopover.c
+++ b/gtk/gtkpopover.c
@@ -370,7 +370,7 @@ close_menu (GtkPopover *popover)
{
gtk_popover_popdown (popover);
if (GTK_IS_POPOVER_MENU (popover))
- popover = gtk_popover_menu_get_parent_menu (GTK_POPOVER_MENU (popover));
+ popover = (GtkPopover *)gtk_popover_menu_get_parent_menu (GTK_POPOVER_MENU (popover));
else
popover = NULL;
}
diff --git a/gtk/gtkpopovermenu.c b/gtk/gtkpopovermenu.c
index 93a34dd7d3..c4958af1f5 100644
--- a/gtk/gtkpopovermenu.c
+++ b/gtk/gtkpopovermenu.c
@@ -212,7 +212,7 @@ focus_out (GtkEventController *controller,
if (!contains_focus)
{
if (menu->parent_menu &&
- GTK_POPOVER_MENU (menu->parent_menu)->open_submenu == menu)
+ GTK_POPOVER_MENU (menu->parent_menu)->open_submenu == (GtkWidget*)menu)
GTK_POPOVER_MENU (menu->parent_menu)->open_submenu = NULL;
gtk_popover_popdown (GTK_POPOVER (menu));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]