Merge PR#124 by Vasile Rotaru

garrigue · Jul 4, 2021 · 5cc0f7e · 5cc0f7e
1 parent 504fac1
commit 5cc0f7e
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,10 +1,13 @@
 LablGTK changes log
 
+2021.07.05 [Jacques]
+  * Update scrollbar handling in GText.view for gtk3 (#124) [Vasile Rotaru]
+
 2021.03.15 [Jacques]
   * Add bindings fro GtkStack and GtkStackSwitcher (#122) [Hugo @swarmpan]
 
 2020.08.31 [Jacques]
-  * Fix #116 : problem with GPack.layout adjustments (reported by Vasile Toraru)
+  * Fix #116 : problem with GPack.layout adjustments (reported by Vasile Rotaru)
 
 ## In Lablgtk-3.1.1
 

diff --git a/src/gText.mli b/src/gText.mli
@@ -491,14 +491,12 @@ object ('a)
   method populate_popup :
     callback:(menu obj -> unit) -> GtkSignal.id
   method set_anchor : callback:(unit -> unit) -> GtkSignal.id
-  method set_scroll_adjustments :
-    callback:(GData.adjustment option -> GData.adjustment option -> unit)
-    -> GtkSignal.id
   method toggle_overwrite : callback:(unit -> unit) -> GtkSignal.id
   method notify_accepts_tab : callback:(bool -> unit) -> GtkSignal.id
   method notify_bottom_margin : callback:(int -> unit) -> GtkSignal.id
   method notify_cursor_visible : callback:(bool -> unit) -> GtkSignal.id
   method notify_editable : callback:(bool -> unit) -> GtkSignal.id
+  method notify_hadjustment : callback:(GData.adjustment -> unit) -> GtkSignal.id
   method notify_im_module : callback:(string -> unit) -> GtkSignal.id
   method notify_indent : callback:(int -> unit) -> GtkSignal.id
   method notify_input_hints :
@@ -516,6 +514,7 @@ object ('a)
   method notify_populate_all : callback:(bool -> unit) -> GtkSignal.id
   method notify_right_margin : callback:(int -> unit) -> GtkSignal.id
   method notify_top_margin : callback:(int -> unit) -> GtkSignal.id
+  method notify_vadjustment : callback:(GData.adjustment -> unit) -> GtkSignal.id
   method notify_wrap_mode :
       callback:(GtkEnums.wrap_mode -> unit) -> GtkSignal.id
 
@@ -551,6 +550,7 @@ object
   method get_line_yrange : iter -> int * int
   method get_window : Tags.text_window_type -> Gdk.window option
   method get_window_type : Gdk.window -> Tags.text_window_type
+  method hadjustment : GData.adjustment
   method im_module : string
   method indent : int
   method input_hints : GtkEnums.input_hints
@@ -591,6 +591,7 @@ object
   method set_input_hints : GtkEnums.input_hints -> unit
   method set_input_purpose : GtkEnums.input_purpose -> unit
   method set_justification : Tags.justification -> unit
+  method set_hadjustment : GData.adjustment -> unit
   method set_left_margin : int -> unit
   method set_monospace : bool -> unit
   method set_overwrite : bool -> unit
@@ -600,9 +601,11 @@ object
   method set_populate_all : bool -> unit
   method set_right_margin : int -> unit
   method set_top_margin : int -> unit
+  method set_vadjustment : GData.adjustment -> unit
   method set_wrap_mode : Tags.wrap_mode -> unit
   method starts_display_line : iter -> bool
   method top_margin : int
+  method vadjustment : GData.adjustment
   method visible_rect : Gdk.Rectangle.t
   method window_to_buffer_coords :
     tag:Tags.text_window_type -> x:int -> y:int -> int * int

diff --git a/src/gTree.mli b/src/gTree.mli
@@ -363,9 +363,6 @@ class view_signals : [> tree_view] obj ->
     method select_cursor_parent : callback:(unit -> bool) -> GtkSignal.id
     method select_cursor_row :
       callback:(start_editing:bool -> bool) -> GtkSignal.id
-    method set_scroll_adjustments :
-      callback:(GData.adjustment option -> GData.adjustment option -> unit) ->
-      GtkSignal.id
     method start_interactive_search : callback:(unit -> bool) -> GtkSignal.id
     method test_collapse_row :
       callback:(tree_iter -> tree_path -> bool) -> GtkSignal.id

diff --git a/src/gtkBin.props b/src/gtkBin.props
@@ -74,7 +74,6 @@ class Viewport set wrap : Bin {
   "hadjustment"          GtkAdjustment        : Read / Write
   "vadjustment"          GtkAdjustment        : Read / Write
   "shadow-type"          GtkShadowType        : Read / Write
-  signal set_scroll_adjustments : GtkAdjustment_opt GtkAdjustment_opt
 }
 
 class Expander set wrap wrapsig : Bin {

diff --git a/src/gtkText.props b/src/gtkText.props
@@ -22,6 +22,7 @@ class TextView wrap wrapsig : Container {
   "cursor-visible"       gboolean             : Read / Write / Set
   "indent"               gint                 : Read / Write
   "justification"        GtkJustification     : Read / Write / Set
+  "hadjustment"          GtkAdjustment        : Read / Write
   "left-margin"          gint                 : Read / Write
   "pixels-above-lines"   gint                 : Read / Write
   "pixels-below-lines"   gint                 : Read / Write
@@ -39,6 +40,7 @@ class TextView wrap wrapsig : Container {
   "overwrite"            gboolean             : Read / Write
   "populate-all"         gboolean             : Read / Write
   "top-margin"           gint                 : Read / Write
+  "vadjustment"          GtkAdjustment        : Read / Write
 
   signal copy_clipboard
   signal cut_clipboard
@@ -50,7 +52,6 @@ class TextView wrap wrapsig : Container {
   signal paste_clipboard
   signal populate_popup :     GtkMenu
   signal set_anchor
-  signal set_scroll_adjustments : GtkAdjustment_opt GtkAdjustment_opt
   signal toggle_overwrite
 }
 

diff --git a/src/gtkTree.props b/src/gtkTree.props
@@ -54,7 +54,6 @@ class TreeView set wrap wrapsig : Container {
   signal select_all : -> gboolean
   signal select_cursor_parent : -> gboolean
   signal select_cursor_row : start_editing:gboolean -> gboolean
-  signal set_scroll_adjustments : GtkAdjustment_opt GtkAdjustment_opt
   signal start_interactive_search : -> gboolean
   signal test_collapse_row : GtkTreeIter GtkTreePathCopy -> gboolean
   signal test_expand_row :   GtkTreeIter GtkTreePathCopy -> gboolean