Remove ptr class

3 files changed, 2 insertions, 65 deletions

diff --git a/src/Gtk/Signal.icl b/src/Gtk/Signal.icl
index ca19afd..26fcc7f 100644
--- a/src/Gtk/Signal.icl
+++ b/src/Gtk/Signal.icl
@@ -32,12 +32,8 @@ installSignalHandler handler widget =
 		& signal_handlers = 'Data.Map'.put (st.signal_counter+1) handler_internal st.signal_handlers
 		, signal_counter  = st.signal_counter+1
 		}) >>= \{signal_counter=id} ->
-	toState
-		(g_signal_connect
-			(type handler_internal)
-			(toPtr (gtkWidget widget))
-			(signalName handler)
-			id) >>|
+	let (GtkWidget w) = gtkWidget widget in
+	toState (g_signal_connect (type handler_internal) w (signalName handler) id) >>|
 	pure widget
 where
 	type handler = case handler of
diff --git a/src/Gtk/Widgets.dcl b/src/Gtk/Widgets.dcl
index 233160c..d85d93e 100644
--- a/src/Gtk/Widgets.dcl
+++ b/src/Gtk/Widgets.dcl
@@ -15,11 +15,6 @@ from Gtk.Types import
 	:: GtkResponse, :: GtkScrollbarPolicy, :: GtkSensitivity, :: GtkShrink,
 	:: GtkSpacing, :: GtkStylePriority, :: GtkText, :: GtkTitle, :: GtkWrapMode
 
-class ptr a
-where
-	toPtr   :: !a -> Pointer
-	fromPtr :: !Pointer -> a
-
 :: GtkActionBar =: GtkActionBar Pointer
 instance gtkWidget GtkActionBar
 
@@ -38,7 +33,6 @@ instance tune GtkBox GtkSpacing
 
 :: GtkButton =: GtkButton Pointer
 instance gtkWidget GtkButton
-instance ptr GtkButton
 
 newButtonFromIconName :: !String -> GtkM GtkButton
 
@@ -48,7 +42,6 @@ class gtkContainer a :: !a -> GtkContainer
 
 instance gtkWidget GtkContainer
 instance gtkContainer GtkContainer
-instance ptr GtkContainer
 
 addToContainer :: !c !w -> GtkM w | gtkWidget w & gtkContainer c
 
@@ -60,7 +53,6 @@ instance gtkWidget GtkDialog
 instance gtkContainer GtkDialog
 instance gtkWindow GtkDialog
 instance gtkDialog GtkDialog
-instance ptr GtkDialog
 
 instance tune d GtkModal | gtkDialog d
 
@@ -83,7 +75,6 @@ instance tune GtkEntry GtkText
 :: GtkFrame =: GtkFrame Pointer
 instance gtkWidget GtkFrame
 instance gtkContainer GtkFrame
-instance ptr GtkFrame
 
 newFrame :: !GtkTitle !w -> GtkM GtkFrame | gtkWidget w
 framed :: !GtkTitle !(GtkM w) -> GtkM (w, GtkFrame) | gtkWidget w
@@ -130,7 +121,6 @@ setSubMenu :: !mi !GtkMenu -> GtkM GtkMenu | gtkMenuItem mi
 :: GtkCheckMenuItem =: GtkCheckMenuItem Pointer
 instance gtkWidget GtkCheckMenuItem
 instance gtkMenuItem GtkCheckMenuItem
-instance ptr GtkCheckMenuItem
 
 newCheckMenuItem :: !String -> GtkM GtkCheckMenuItem
 isActive :: !GtkCheckMenuItem -> GtkM Bool
@@ -168,20 +158,17 @@ instance tune GtkScrolledWindow (GtkScrollbarPolicy, GtkScrollbarPolicy)
 
 :: GtkSeparator =: GtkSeparator Pointer
 instance gtkWidget GtkSeparator
-instance ptr GtkSeparator
 
 newSeparator :: !GtkOrientation -> GtkM GtkSeparator
 
 :: GtkSpinner =: GtkSpinner Pointer
 instance gtkWidget GtkSpinner
-instance ptr GtkSpinner
 
 newSpinner :: GtkM GtkSpinner
 startSpinner :: !GtkSpinner -> GtkM GtkSpinner
 stopSpinner :: !GtkSpinner -> GtkM GtkSpinner
 
 :: GtkTextBuffer =: GtkTextBuffer Pointer
-instance ptr GtkTextBuffer
 
 setText :: !String !GtkTextBuffer -> GtkM GtkTextBuffer
 setMarkup :: !String !GtkTextBuffer -> GtkM GtkTextBuffer
@@ -190,7 +177,6 @@ insertAtCursor :: !String !GtkTextBuffer -> GtkM GtkTextBuffer
 :: GtkTextView =: GtkTextView Pointer
 instance gtkWidget GtkTextView
 instance gtkContainer GtkTextView
-instance ptr GtkTextView
 
 newTextView :: GtkM GtkTextView
 getTextBuffer :: !GtkTextView -> GtkTextBuffer
@@ -212,7 +198,6 @@ selectPath :: ![Int] !GtkTreeView -> GtkM Bool
 class gtkWidget a :: !a -> GtkWidget
 
 instance gtkWidget GtkWidget
-instance ptr GtkWidget
 
 show :: !w -> GtkM w | gtkWidget w
 hide :: !w -> GtkM w | gtkWidget w
diff --git a/src/Gtk/Widgets.icl b/src/Gtk/Widgets.icl
index 47dd3fb..de07c4f 100644
--- a/src/Gtk/Widgets.icl
+++ b/src/Gtk/Widgets.icl
@@ -53,10 +53,6 @@ where
 		pure box
 
 instance gtkWidget GtkButton where gtkWidget (GtkButton b) = GtkWidget b
-instance ptr GtkButton
-where
-	toPtr (GtkButton b) = b
-	fromPtr b = GtkButton b
 
 newButtonFromIconName :: !String -> GtkM GtkButton
 newButtonFromIconName icon =
@@ -66,11 +62,6 @@ newButtonFromIconName icon =
 instance gtkWidget GtkContainer where gtkWidget (GtkContainer c) = GtkWidget c
 instance gtkContainer GtkContainer where gtkContainer c = c
 
-instance ptr GtkContainer
-where
-	toPtr (GtkContainer c) = c
-	fromPtr c = GtkContainer c
-
 addToContainer :: !c !w -> GtkM w | gtkWidget w & gtkContainer c
 addToContainer container widget =
 	let
@@ -85,11 +76,6 @@ instance gtkContainer GtkDialog where gtkContainer (GtkDialog d) = GtkContainer
 instance gtkWindow GtkDialog where gtkWindow (GtkDialog d) = GtkWindow d
 instance gtkDialog GtkDialog where gtkDialog d = d
 
-instance ptr GtkDialog
-where
-	toPtr (GtkDialog d) = d
-	fromPtr d = GtkDialog d
-
 instance tune d GtkModal | gtkDialog d
 where
 	tune setting dialog =
@@ -164,10 +150,6 @@ where
 
 instance gtkWidget GtkFrame where gtkWidget (GtkFrame f) = GtkWidget f
 instance gtkContainer GtkFrame where gtkContainer (GtkFrame f) = GtkContainer f
-instance ptr GtkFrame
-where
-	toPtr (GtkFrame f) = f
-	fromPtr f = GtkFrame f
 
 newFrame :: !GtkTitle !w -> GtkM GtkFrame | gtkWidget w
 newFrame (Title title) widget =
@@ -278,10 +260,6 @@ setSubMenu item menu=:(GtkMenu m) =
 
 instance gtkWidget GtkCheckMenuItem where gtkWidget (GtkCheckMenuItem cmi) = GtkWidget cmi
 instance gtkMenuItem GtkCheckMenuItem where gtkMenuItem (GtkCheckMenuItem cmi) = GtkMenuItem cmi
-instance ptr GtkCheckMenuItem
-where
-	toPtr (GtkCheckMenuItem cmi) = cmi
-	fromPtr cmi = GtkCheckMenuItem cmi
 
 newCheckMenuItem :: !String -> GtkM GtkCheckMenuItem
 newCheckMenuItem label =
@@ -356,10 +334,6 @@ where
 		pure window
 
 instance gtkWidget GtkSeparator where gtkWidget (GtkSeparator s) = GtkWidget s
-instance ptr GtkSeparator
-where
-	toPtr (GtkSeparator s) = s
-	fromPtr s = GtkSeparator s
 
 newSeparator :: !GtkOrientation -> GtkM GtkSeparator
 newSeparator orientation =
@@ -367,10 +341,6 @@ newSeparator orientation =
 	show (GtkSeparator s)
 
 instance gtkWidget GtkSpinner where gtkWidget (GtkSpinner s) = GtkWidget s
-instance ptr GtkSpinner
-where
-	toPtr (GtkSpinner s) = s
-	fromPtr s = GtkSpinner s
 
 newSpinner :: GtkM GtkSpinner
 newSpinner =
@@ -387,11 +357,6 @@ stopSpinner spinner=:(GtkSpinner s) =
 	toState (gtk_spinner_stop s) >>|
 	pure spinner
 
-instance ptr GtkTextBuffer
-where
-	toPtr (GtkTextBuffer b) = b
-	fromPtr b = GtkTextBuffer b
-
 setText :: !String !GtkTextBuffer -> GtkM GtkTextBuffer
 setText s buffer=:(GtkTextBuffer b) =
 	toState (gtk_text_buffer_set_text b s (size s)) >>|
@@ -413,10 +378,6 @@ insertAtCursor s buffer=:(GtkTextBuffer b) =
 
 instance gtkWidget GtkTextView where gtkWidget (GtkTextView tv) = GtkWidget tv
 instance gtkContainer GtkTextView where gtkContainer (GtkTextView tv) = GtkContainer tv
-instance ptr GtkTextView
-where
-	toPtr (GtkTextView tv) = tv
-	fromPtr tv = GtkTextView tv
 
 newTextView :: GtkM GtkTextView
 newTextView =
@@ -483,11 +444,6 @@ selectPath path (GtkTreeView tv) =
 
 instance gtkWidget GtkWidget where gtkWidget w = w
 
-instance ptr GtkWidget
-where
-	toPtr (GtkWidget w) = w
-	fromPtr w = GtkWidget w
-
 show :: !w -> GtkM w | gtkWidget w
 show widget =
 	let (GtkWidget w) = gtkWidget widget in