From 1af27a3bb964caad3a1fd5ec80e94e681ae57e10 Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Mon, 28 Oct 2019 09:24:11 +0100
Subject: Add GtkLabel, GtkGrid, and alignment tuning for GtkWidget

---
 src/Gtk/Widgets.dcl | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

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

diff --git a/src/Gtk/Widgets.dcl b/src/Gtk/Widgets.dcl
index b0a0448..10de329 100644
--- a/src/Gtk/Widgets.dcl
+++ b/src/Gtk/Widgets.dcl
@@ -9,11 +9,11 @@ from Gtk.State import :: GtkM
 from Gtk.Tune import class tune
 from Gtk.Types import
 	:: GType, :: GValue,
-	:: GtkButtonsType, :: GtkCSSClass, :: GtkDirection, :: GtkExpand,
-	:: GtkFileChooserAction, :: GtkLabel, :: GtkMargins, :: GtkMessageType,
+	:: GtkAlign, :: GtkButtonsType, :: GtkCSSClass, :: GtkDirection,
+	:: GtkExpand, :: GtkFileChooserAction, :: GtkMargins, :: GtkMessageType,
 	:: GtkModal, :: GtkOrientation, :: GtkPanedHandleWidth, :: GtkResize,
 	:: GtkResponse, :: GtkScrollbarPolicy, :: GtkSensitivity, :: GtkShrink,
-	:: GtkSpacing, :: GtkStylePriority, :: GtkTitle, :: GtkWrapMode
+	:: GtkSpacing, :: GtkStylePriority, :: GtkText, :: GtkTitle, :: GtkWrapMode
 
 class ptr a
 where
@@ -77,8 +77,20 @@ instance gtkWidget GtkFrame
 instance gtkContainer GtkFrame
 instance ptr GtkFrame
 
-newFrame :: !GtkLabel !w -> GtkM GtkFrame | gtkWidget w
-framed :: !GtkLabel !(GtkM w) -> GtkM (w, GtkFrame) | gtkWidget w
+newFrame :: !GtkTitle !w -> GtkM GtkFrame | gtkWidget w
+framed :: !GtkTitle !(GtkM w) -> GtkM (w, GtkFrame) | gtkWidget w
+
+:: GtkGrid
+instance gtkWidget GtkGrid
+
+newGrid :: GtkM GtkGrid
+attachGrid :: !GtkGrid !(!Int,!Int) !(!Int,!Int) !w -> GtkM w | gtkWidget w
+
+:: GtkLabel
+instance gtkWidget GtkLabel
+
+newLabel :: GtkM GtkLabel
+instance tune GtkLabel GtkText
 
 :: GtkListStore
 
@@ -203,6 +215,7 @@ removeCSSClass :: !GtkCSSClass !w -> GtkM () | gtkWidget w
 setMargins :: !GtkMargins !w -> GtkM w | gtkWidget w
 
 instance tune w GtkSensitivity | gtkWidget w
+instance tune w (GtkAlign,GtkAlign) | gtkWidget w
 
 :: GtkWindow
 
-- 
cgit v1.2.3