diff options
author | Camil Staps | 2019-10-21 22:26:53 +0200 |
---|---|---|
committer | Camil Staps | 2019-10-21 22:26:53 +0200 |
commit | 33a1ae2a40c99fed28e8ee719c31247484e1aa3f (patch) | |
tree | 3aa6da011b9e3aed457d026c1cd34ed99f4ada18 | |
parent | Fix accWorld (diff) |
Alphabetic order in Gtk.Widgets
-rw-r--r-- | src/Gtk/Widgets.dcl | 38 | ||||
-rw-r--r-- | src/Gtk/Widgets.icl | 92 |
2 files changed, 65 insertions, 65 deletions
diff --git a/src/Gtk/Widgets.dcl b/src/Gtk/Widgets.dcl index 55a6ad4..b027511 100644 --- a/src/Gtk/Widgets.dcl +++ b/src/Gtk/Widgets.dcl @@ -16,19 +16,12 @@ where toPtr :: !a -> Pointer fromPtr :: !Pointer -> a -:: GtkWidget - -class gtkWidget a :: !a -> GtkWidget - -instance gtkWidget GtkWidget -instance ptr GtkWidget - -show :: !w -> GtkM w | gtkWidget w -destroy :: !w -> GtkM () | gtkWidget w +:: GtkBox +instance gtkWidget GtkBox +instance gtkContainer GtkBox -addCSSClass :: !GtkCSSClass !w -> GtkM w | gtkWidget w -removeCSSClass :: !GtkCSSClass !w -> GtkM () | gtkWidget w -setMargins :: !GtkMargins !w -> GtkM w | gtkWidget w +newBox :: !GtkOrientation !Int -> GtkM GtkBox +packBox :: !GtkBox !GtkDirection !GtkExpand !w -> GtkM w | gtkWidget w :: GtkContainer @@ -53,13 +46,6 @@ runDialog :: !d -> GtkM GtkResponse | gtkDialog d getFileWithDialog :: !GtkWindow !GtkFileChooserAction !(Maybe String) -> GtkM (Maybe FilePath) -:: GtkBox -instance gtkWidget GtkBox -instance gtkContainer GtkBox - -newBox :: !GtkOrientation !Int -> GtkM GtkBox -packBox :: !GtkBox !GtkDirection !GtkExpand !w -> GtkM w | gtkWidget w - :: GtkFrame instance gtkWidget GtkFrame instance gtkContainer GtkFrame @@ -116,6 +102,20 @@ instance gtkContainer GtkTextView newTextView :: GtkM GtkTextView getTextBuffer :: !GtkTextView -> GtkTextBuffer +:: GtkWidget + +class gtkWidget a :: !a -> GtkWidget + +instance gtkWidget GtkWidget +instance ptr GtkWidget + +show :: !w -> GtkM w | gtkWidget w +destroy :: !w -> GtkM () | gtkWidget w + +addCSSClass :: !GtkCSSClass !w -> GtkM w | gtkWidget w +removeCSSClass :: !GtkCSSClass !w -> GtkM () | gtkWidget w +setMargins :: !GtkMargins !w -> GtkM w | gtkWidget w + :: GtkWindow instance gtkWidget GtkWindow instance gtkContainer GtkWindow diff --git a/src/Gtk/Widgets.icl b/src/Gtk/Widgets.icl index 5c8f1e6..5bf9e10 100644 --- a/src/Gtk/Widgets.icl +++ b/src/Gtk/Widgets.icl @@ -14,41 +14,22 @@ import System._Pointer import Gtk import Gtk.Internal -:: GtkWidget :== Pointer - -instance gtkWidget GtkWidget where gtkWidget w = w - -instance ptr GtkWidget -where - toPtr w = w - fromPtr w = w +:: GtkBox :== Pointer -show :: !w -> GtkM w | gtkWidget w -show widget = toState (gtk_widget_show (gtkWidget widget)) >>| pure widget +instance gtkWidget GtkBox where gtkWidget b = b +instance gtkContainer GtkBox where gtkContainer b = b -destroy :: !w -> GtkM () | gtkWidget w -destroy widget = toState (gtk_widget_destroy (gtkWidget widget)) +newBox :: !GtkOrientation !Int -> GtkM GtkBox +newBox orientation spacing = + toStateR (gtk_box_new orientation=:Vertical spacing) >>= + show -addCSSClass :: !GtkCSSClass !w -> GtkM w | gtkWidget w -addCSSClass (Class cls) widget = - toStateR (gtk_widget_get_style_context (gtkWidget widget)) >>= \context -> - toState (gtk_style_context_add_class context cls) >>| +packBox :: !GtkBox !GtkDirection !GtkExpand !w -> GtkM w | gtkWidget w +packBox box direction expand widget = + toState (if direction=:StartToEnd gtk_box_pack_start gtk_box_pack_end + box (gtkWidget widget) expand=:Expand True 0) >>| pure widget -removeCSSClass :: !GtkCSSClass !w -> GtkM () | gtkWidget w -removeCSSClass (Class cls) widget = - toStateR (gtk_widget_get_style_context (gtkWidget widget)) >>= \context -> - toState (gtk_style_context_remove_class context cls) - -setMargins :: !GtkMargins !w -> GtkM w | gtkWidget w -setMargins {left,top,right,bottom} widget` = - let widget = gtkWidget widget` in - toState (gtk_widget_set_margin_left widget left) >>| - toState (gtk_widget_set_margin_top widget top) >>| - toState (gtk_widget_set_margin_right widget right) >>| - toState (gtk_widget_set_margin_bottom widget bottom) >>| - pure widget` - :: GtkContainer :== Pointer instance gtkWidget GtkContainer where gtkWidget c = c @@ -100,22 +81,6 @@ where destroy dialog >>| pure Nothing -:: GtkBox :== Pointer - -instance gtkWidget GtkBox where gtkWidget b = b -instance gtkContainer GtkBox where gtkContainer b = b - -newBox :: !GtkOrientation !Int -> GtkM GtkBox -newBox orientation spacing = - toStateR (gtk_box_new orientation=:Vertical spacing) >>= - show - -packBox :: !GtkBox !GtkDirection !GtkExpand !w -> GtkM w | gtkWidget w -packBox box direction expand widget = - toState (if direction=:StartToEnd gtk_box_pack_start gtk_box_pack_end - box (gtkWidget widget) expand=:Expand True 0) >>| - pure widget - :: GtkFrame :== Pointer instance gtkWidget GtkFrame where gtkWidget f = f @@ -226,6 +191,41 @@ newTextView = getTextBuffer :: !GtkTextView -> GtkTextBuffer getTextBuffer text_view = gtk_text_view_get_buffer text_view +:: GtkWidget :== Pointer + +instance gtkWidget GtkWidget where gtkWidget w = w + +instance ptr GtkWidget +where + toPtr w = w + fromPtr w = w + +show :: !w -> GtkM w | gtkWidget w +show widget = toState (gtk_widget_show (gtkWidget widget)) >>| pure widget + +destroy :: !w -> GtkM () | gtkWidget w +destroy widget = toState (gtk_widget_destroy (gtkWidget widget)) + +addCSSClass :: !GtkCSSClass !w -> GtkM w | gtkWidget w +addCSSClass (Class cls) widget = + toStateR (gtk_widget_get_style_context (gtkWidget widget)) >>= \context -> + toState (gtk_style_context_add_class context cls) >>| + pure widget + +removeCSSClass :: !GtkCSSClass !w -> GtkM () | gtkWidget w +removeCSSClass (Class cls) widget = + toStateR (gtk_widget_get_style_context (gtkWidget widget)) >>= \context -> + toState (gtk_style_context_remove_class context cls) + +setMargins :: !GtkMargins !w -> GtkM w | gtkWidget w +setMargins {left,top,right,bottom} widget` = + let widget = gtkWidget widget` in + toState (gtk_widget_set_margin_left widget left) >>| + toState (gtk_widget_set_margin_top widget top) >>| + toState (gtk_widget_set_margin_right widget right) >>| + toState (gtk_widget_set_margin_bottom widget bottom) >>| + pure widget` + :: GtkWindow :== Pointer instance gtkWidget GtkWindow where gtkWidget w = w |