Use newtypes in Gtk.Widgets to support new overlapping instance detection algorithm in the compiler; add GtkEntry and instance tune w (GtkExpand,GtkExpand) | gtkWidget w

1 files changed, 33 insertions, 24 deletions

diff --git a/src/Gtk/Widgets.dcl b/src/Gtk/Widgets.dcl
index 10de329..233160c 100644
--- a/src/Gtk/Widgets.dcl
+++ b/src/Gtk/Widgets.dcl
@@ -20,13 +20,13 @@ where
 	toPtr   :: !a -> Pointer
 	fromPtr :: !Pointer -> a
 
-:: GtkActionBar
+:: GtkActionBar =: GtkActionBar Pointer
 instance gtkWidget GtkActionBar
 
 newActionBar :: GtkM GtkActionBar
 packActionBar :: !GtkActionBar !GtkDirection !w -> GtkM w | gtkWidget w
 
-:: GtkBox
+:: GtkBox =: GtkBox Pointer
 instance gtkWidget GtkBox
 instance gtkContainer GtkBox
 instance gtkOrientable GtkBox
@@ -36,13 +36,13 @@ packBox :: !GtkBox !GtkDirection !GtkExpand !w -> GtkM w | gtkWidget w
 
 instance tune GtkBox GtkSpacing
 
-:: GtkButton
+:: GtkButton =: GtkButton Pointer
 instance gtkWidget GtkButton
 instance ptr GtkButton
 
 newButtonFromIconName :: !String -> GtkM GtkButton
 
-:: GtkContainer
+:: GtkContainer =: GtkContainer Pointer
 
 class gtkContainer a :: !a -> GtkContainer
 
@@ -52,7 +52,7 @@ instance ptr GtkContainer
 
 addToContainer :: !c !w -> GtkM w | gtkWidget w & gtkContainer c
 
-:: GtkDialog
+:: GtkDialog =: GtkDialog Pointer
 
 class gtkDialog a :: !a -> GtkDialog
 
@@ -72,7 +72,15 @@ getContentArea :: !d -> GtkBox | gtkDialog d
 newMessageDialog :: !GtkWindow !GtkMessageType !GtkButtonsType !String -> GtkM GtkDialog
 getFileWithDialog :: !GtkWindow !GtkFileChooserAction !(Maybe String) -> GtkM (Maybe FilePath)
 
-:: GtkFrame
+:: GtkEntry =: GtkEntry Pointer
+instance gtkWidget GtkEntry
+
+newEntry :: GtkM GtkEntry
+getText :: !GtkEntry -> GtkM String
+
+instance tune GtkEntry GtkText
+
+:: GtkFrame =: GtkFrame Pointer
 instance gtkWidget GtkFrame
 instance gtkContainer GtkFrame
 instance ptr GtkFrame
@@ -80,36 +88,36 @@ instance ptr GtkFrame
 newFrame :: !GtkTitle !w -> GtkM GtkFrame | gtkWidget w
 framed :: !GtkTitle !(GtkM w) -> GtkM (w, GtkFrame) | gtkWidget w
 
-:: GtkGrid
+:: GtkGrid =: GtkGrid Pointer
 instance gtkWidget GtkGrid
 
 newGrid :: GtkM GtkGrid
 attachGrid :: !GtkGrid !(!Int,!Int) !(!Int,!Int) !w -> GtkM w | gtkWidget w
 
-:: GtkLabel
+:: GtkLabel =: GtkLabel Pointer
 instance gtkWidget GtkLabel
 
 newLabel :: GtkM GtkLabel
 instance tune GtkLabel GtkText
 
-:: GtkListStore
+:: GtkListStore =: GtkListStore Pointer
 
 newListStore :: ![GType] -> GtkM GtkListStore
 clearListStore :: !GtkListStore -> GtkM GtkListStore
 appendToListStore :: ![GValue] !GtkListStore -> GtkM GtkListStore
 swapItems :: !Int !Int !GtkListStore -> GtkM Bool
 
-:: GtkMenu
+:: GtkMenu =: GtkMenu Pointer
 instance gtkWidget GtkMenu
 
 newMenu :: GtkM GtkMenu
 
-:: GtkMenuBar
+:: GtkMenuBar =: GtkMenuBar Pointer
 instance gtkWidget GtkMenuBar
 
 newMenuBar :: GtkM GtkMenuBar
 
-:: GtkMenuItem
+:: GtkMenuItem =: GtkMenuItem Pointer
 
 class gtkMenuItem a :: !a -> GtkMenuItem
 
@@ -119,7 +127,7 @@ instance gtkMenuItem GtkMenuItem
 newMenuItem :: !String -> GtkM GtkMenuItem
 setSubMenu :: !mi !GtkMenu -> GtkM GtkMenu | gtkMenuItem mi
 
-:: GtkCheckMenuItem
+:: GtkCheckMenuItem =: GtkCheckMenuItem Pointer
 instance gtkWidget GtkCheckMenuItem
 instance gtkMenuItem GtkCheckMenuItem
 instance ptr GtkCheckMenuItem
@@ -128,7 +136,7 @@ newCheckMenuItem :: !String -> GtkM GtkCheckMenuItem
 isActive :: !GtkCheckMenuItem -> GtkM Bool
 setActive :: !Bool !GtkCheckMenuItem -> GtkM GtkCheckMenuItem
 
-:: GtkMenuShell
+:: GtkMenuShell =: GtkMenuShell Pointer
 instance gtkWidget GtkMenuShell
 
 class gtkMenuShell a :: !a -> GtkMenuShell
@@ -136,13 +144,13 @@ instance gtkMenuShell GtkMenu, GtkMenuBar, GtkMenuShell
 
 appendToMenuShell :: !s !mi -> GtkM mi | gtkMenuShell s & gtkMenuItem mi
 
-:: GtkOrientable
+:: GtkOrientable =: GtkOrientable Pointer
 
 class gtkOrientable a :: !a -> GtkOrientable
 
 instance tune o GtkOrientation | gtkOrientable o
 
-:: GtkPaned
+:: GtkPaned =: GtkPaned Pointer
 instance gtkWidget GtkPaned
 instance gtkContainer GtkPaned
 
@@ -150,7 +158,7 @@ newPaned :: !GtkOrientation !GtkPanedHandleWidth -> GtkM GtkPaned
 packPane1 :: !GtkPaned !GtkResize !GtkShrink !w -> GtkM w | gtkWidget w
 packPane2 :: !GtkPaned !GtkResize !GtkShrink !w -> GtkM w | gtkWidget w
 
-:: GtkScrolledWindow
+:: GtkScrolledWindow =: GtkScrolledWindow Pointer
 instance gtkWidget GtkScrolledWindow
 instance gtkContainer GtkScrolledWindow
 
@@ -158,13 +166,13 @@ newScrolledWindow :: GtkM GtkScrolledWindow
 
 instance tune GtkScrolledWindow (GtkScrollbarPolicy, GtkScrollbarPolicy)
 
-:: GtkSeparator
+:: GtkSeparator =: GtkSeparator Pointer
 instance gtkWidget GtkSeparator
 instance ptr GtkSeparator
 
 newSeparator :: !GtkOrientation -> GtkM GtkSeparator
 
-:: GtkSpinner
+:: GtkSpinner =: GtkSpinner Pointer
 instance gtkWidget GtkSpinner
 instance ptr GtkSpinner
 
@@ -172,14 +180,14 @@ newSpinner :: GtkM GtkSpinner
 startSpinner :: !GtkSpinner -> GtkM GtkSpinner
 stopSpinner :: !GtkSpinner -> GtkM GtkSpinner
 
-:: GtkTextBuffer
+:: GtkTextBuffer =: GtkTextBuffer Pointer
 instance ptr GtkTextBuffer
 
 setText :: !String !GtkTextBuffer -> GtkM GtkTextBuffer
 setMarkup :: !String !GtkTextBuffer -> GtkM GtkTextBuffer
 insertAtCursor :: !String !GtkTextBuffer -> GtkM GtkTextBuffer
 
-:: GtkTextView
+:: GtkTextView =: GtkTextView Pointer
 instance gtkWidget GtkTextView
 instance gtkContainer GtkTextView
 instance ptr GtkTextView
@@ -189,7 +197,7 @@ getTextBuffer :: !GtkTextView -> GtkTextBuffer
 
 instance tune GtkTextView GtkWrapMode
 
-:: GtkTreeView
+:: GtkTreeView =: GtkTreeView Pointer
 instance gtkWidget GtkTreeView
 
 newTreeView :: !GtkListStore -> GtkM GtkTreeView
@@ -199,7 +207,7 @@ addSelectionChangedHandler :: !(GtkM ()) !GtkTreeView -> GtkM GtkTreeView
 getPathToSelection :: !GtkTreeView -> GtkM (Maybe [Int])
 selectPath :: ![Int] !GtkTreeView -> GtkM Bool
 
-:: GtkWidget
+:: GtkWidget =: GtkWidget Pointer
 
 class gtkWidget a :: !a -> GtkWidget
 
@@ -216,8 +224,9 @@ setMargins :: !GtkMargins !w -> GtkM w | gtkWidget w
 
 instance tune w GtkSensitivity | gtkWidget w
 instance tune w (GtkAlign,GtkAlign) | gtkWidget w
+instance tune w (GtkExpand,GtkExpand) | gtkWidget w
 
-:: GtkWindow
+:: GtkWindow =: GtkWindow Pointer
 
 class gtkWindow a :: !a -> GtkWindow