Add fromPtr function; rename ptr to toPtr (to be able to implement "extra" widgets in external modules)

3 files changed, 10 insertions, 3 deletions

diff --git a/src/Gtk/Signal.icl b/src/Gtk/Signal.icl
index d98a14d..699ee98 100644
--- a/src/Gtk/Signal.icl
+++ b/src/Gtk/Signal.icl
@@ -20,7 +20,7 @@ installSignalHandler widget handler =
 		}) >>|
 	gets (\st -> st.signal_counter) >>= \id ->
 	toState case handler_internal of
-		GSHI_Void _ -> 'I'.g_signal_connect_void (ptr (gtkWidget widget)) signal_name id
+		GSHI_Void _ -> 'I'.g_signal_connect_void (toPtr (gtkWidget widget)) signal_name id
 where
 	(signal_name,handler_internal) = case handler of
 		DestroyHandler f -> ("destroy",GSHI_Void f)
diff --git a/src/Gtk/Widgets.dcl b/src/Gtk/Widgets.dcl
index d7df700..def39c9 100644
--- a/src/Gtk/Widgets.dcl
+++ b/src/Gtk/Widgets.dcl
@@ -10,7 +10,10 @@ from Gtk.Types import :: GtkCSSClass, :: GtkDirection, :: GtkExpand,
 	:: GtkLabel, :: GtkMargins, :: GtkOrientation, :: GtkPanedHandleWidth,
 	:: GtkResize, :: GtkShrink, :: GtkStylePriority
 
-class ptr a :: !a -> Pointer
+class ptr a
+where
+	toPtr   :: !a -> Pointer
+	fromPtr :: !Pointer -> a
 
 :: GtkWidget
 
diff --git a/src/Gtk/Widgets.icl b/src/Gtk/Widgets.icl
index 7fda320..e485364 100644
--- a/src/Gtk/Widgets.icl
+++ b/src/Gtk/Widgets.icl
@@ -18,7 +18,11 @@ import Gtk.Types
 :: GtkWidget :== Pointer
 
 instance gtkWidget GtkWidget where gtkWidget w = w
-instance ptr GtkWidget where ptr w = w
+
+instance ptr GtkWidget
+where
+	toPtr   w = w
+	fromPtr w = w
 
 addCSSClass :: !GtkCSSClass !w -> GtkM () | gtkWidget w
 addCSSClass (Class cls) widget =