blob: 3929fcd06e2bbb7de702c719db9dd6d2d3a5af16 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
--- gps-2021-20210701-19B6B-src-pristine/kernel/src/gtkada-search_entry.adb
+++ gps-2021-20210701-19B6B-src/kernel/src/gtkada-search_entry.adb
@@ -21,13 +21,13 @@
with Gtk.Widget; use Gtk.Widget;
with Gtkada.Handlers; use Gtkada.Handlers;
with GPS.Intl; use GPS.Intl;
+with Gtk.Main;
package body Gtkada.Search_Entry is
procedure On_Clear_Entry
- (Self : access Gtk_Entry_Record'Class;
- Pos : Gtk_Entry_Icon_Position;
- Event : Gdk_Event);
+ (Self : access Gtk_Entry_Record'Class;
+ Pos : Gtk_Entry_Icon_Position);
-- Called when the user presses the "clear" icon
procedure On_Changed (Self : access Gtk_Widget_Record'Class);
@@ -39,14 +39,14 @@
function Get_Icon_Position
(Self : access Gtkada_Search_Entry_Record'Class;
- Event : Gdk_Event_Button) return Gtk_Entry_Icon_Position
+ Event : Gdk_Event) return Gtk_Entry_Icon_Position
is
Alloc : Gtk_Allocation;
Rect : Gdk_Rectangle;
X, Y : Gint;
begin
Self.Get_Allocation (Alloc);
- Get_Position (Event.Window, X, Y);
+ Get_Position (Get_Window (Event), X, Y);
Self.Get_Icon_Area (Gtk_Entry_Icon_Primary, Rect);
@@ -62,13 +62,12 @@
--------------------
procedure On_Clear_Entry
- (Self : access Gtk_Entry_Record'Class;
- Pos : Gtk_Entry_Icon_Position;
- Event : Gdk_Event)
+ (Self : access Gtk_Entry_Record'Class;
+ Pos : Gtk_Entry_Icon_Position)
is
pragma Unreferenced (Pos); -- unreliable with gtk+ 3.8
begin
- if Gtkada_Search_Entry (Self).Get_Icon_Position (Event.Button) =
+ if Gtkada_Search_Entry (Self).Get_Icon_Position (Gtk.Main.Get_Current_Event) =
Gtk_Entry_Icon_Secondary
then
Self.Set_Text ("");
|