From 353ef6e949d7375f9e70e0e004a42c56406f5d0d Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Mon, 21 Oct 2019 11:05:54 +0200
Subject: Add GtkMenu* functionality and reorder combinator arguments to ease
 binding

---
 src/Gtk/Widgets.dcl | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

(limited to 'src/Gtk/Widgets.dcl')

diff --git a/src/Gtk/Widgets.dcl b/src/Gtk/Widgets.dcl
index 42f65c1..ab5d5c8 100644
--- a/src/Gtk/Widgets.dcl
+++ b/src/Gtk/Widgets.dcl
@@ -35,14 +35,14 @@ instance gtkWidget GtkContainer
 instance gtkContainer GtkContainer
 instance ptr GtkContainer
 
-addToContainer :: !w !c -> GtkM () | gtkWidget w & gtkContainer c
+addToContainer :: !c !w -> GtkM w | gtkWidget w & gtkContainer c
 
 :: GtkBox
 instance gtkWidget GtkBox
 instance gtkContainer GtkBox
 
 newBox :: !GtkOrientation !Int -> GtkM GtkBox
-packBox :: !w !GtkBox !GtkDirection !GtkExpand -> GtkM () | gtkWidget w
+packBox :: !GtkBox !GtkDirection !GtkExpand !w -> GtkM w | gtkWidget w
 
 :: GtkFrame
 instance gtkWidget GtkFrame
@@ -51,6 +51,30 @@ instance gtkContainer GtkFrame
 newFrame :: !GtkLabel !w -> GtkM GtkFrame | gtkWidget w
 framed :: !GtkLabel !(GtkM w) -> GtkM (w, GtkFrame) | gtkWidget w
 
+:: GtkMenu
+instance gtkWidget GtkMenu
+
+newMenu :: GtkM GtkMenu
+
+:: GtkMenuBar
+instance gtkWidget GtkMenuBar
+
+newMenuBar :: GtkM GtkMenuBar
+
+:: GtkMenuItem
+instance gtkWidget GtkMenuItem
+
+newMenuItem :: !String -> GtkM GtkMenuItem
+setSubMenu :: !GtkMenuItem !GtkMenu -> GtkM GtkMenu
+
+:: GtkMenuShell
+instance gtkWidget GtkMenuShell
+
+class gtkMenuShell a :: !a -> GtkMenuShell
+instance gtkMenuShell GtkMenu, GtkMenuBar, GtkMenuShell
+
+appendToMenuShell :: !s !GtkMenuItem -> GtkM GtkMenuItem | gtkMenuShell s
+
 :: GtkPaned
 instance gtkWidget GtkPaned
 instance gtkContainer GtkPaned
-- 
cgit v1.2.3