paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-29 08:50:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

GTK3: Fixed function return type and got rid of deprecated function call.

Browse Source
This commit is contained in:
Abou Al Montacir 2023-11-16 00:33:35 +01:00
parent 16ce270720
commit e928a40d93
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lcl/interfaces/gtk3/gtk3bindings/lazgdk3.pas
View File

@ -4425,7 +4425,7 @@ type
function get_entries_for_keycode(hardware_keycode: guint; keys: PPGdkKeymapKey; keyvals: PPguint; n_entries: Pgint): gboolean; cdecl; inline;
function get_entries_for_keyval(keyval: guint; keys: PPGdkKeymapKey; n_keys: Pgint): gboolean; cdecl; inline;
function get_modifier_mask(intent: TGdkModifierIntent): TGdkModifierType; cdecl; inline;
function get_modifier_state: TGdkModifierType; cdecl; inline;
function get_modifier_state: guint; cdecl; inline;
function get_num_lock_state: gboolean; cdecl; inline;
function get_scroll_lock_state: gboolean; cdecl; inline;
function have_bidi_layouts: gboolean; cdecl; inline;
@ -4567,7 +4567,6 @@ function gdk_cairo_create(window: PGdkWindow): Pcairo_t; cdecl; external;
function gdk_cursor_new(cursor_type: TGdkCursorType): PGdkCursor; cdecl; external;
function gdk_device_manager_get_client_pointer(device_manager: PGdkDeviceManager): PGdkDevice; cdecl; external;
function gdk_display_get_device_manager(display: PGdkDisplay): PGdkDeviceManager; cdecl; external;
function gdk_keymap_get_default: PGdkKeymap; cdecl; external;
function gdk_screen_get_active_window(screen: PGdkScreen): PGdkWindow; cdecl; external;
function gdk_screen_get_height(screen: PGdkScreen): gint; cdecl; external;
function gdk_screen_get_height_mm(screen: PGdkScreen): gint; cdecl; external;
@ -4770,7 +4769,7 @@ function gdk_keymap_get_entries_for_keycode(keymap: PGdkKeymap; hardware_keycode
function gdk_keymap_get_entries_for_keyval(keymap: PGdkKeymap; keyval: guint; keys: PPGdkKeymapKey; n_keys: Pgint): gboolean; cdecl; external LazGdk3_library name 'gdk_keymap_get_entries_for_keyval';
function gdk_keymap_get_for_display(display: PGdkDisplay): PGdkKeymap; cdecl; external LazGdk3_library name 'gdk_keymap_get_for_display';
function gdk_keymap_get_modifier_mask(keymap: PGdkKeymap; intent: TGdkModifierIntent): TGdkModifierType; cdecl; external LazGdk3_library name 'gdk_keymap_get_modifier_mask';
function gdk_keymap_get_modifier_state(keymap: PGdkKeymap): TGdkModifierType; cdecl; external LazGdk3_library name 'gdk_keymap_get_modifier_state';
function gdk_keymap_get_modifier_state(keymap: PGdkKeymap): guint; cdecl; external LazGdk3_library name 'gdk_keymap_get_modifier_state';
function gdk_keymap_get_num_lock_state(keymap: PGdkKeymap): gboolean; cdecl; external LazGdk3_library name 'gdk_keymap_get_num_lock_state';
function gdk_keymap_get_scroll_lock_state(keymap: PGdkKeymap): gboolean; cdecl; external LazGdk3_library name 'gdk_keymap_get_scroll_lock_state';
function gdk_keymap_get_type: TGType; cdecl; external LazGdk3_library name 'gdk_keymap_get_type';
@ -6782,7 +6781,7 @@ begin
Result := LazGdk3.gdk_keymap_get_modifier_mask(@self, intent);
end;
function TGdkKeymap.get_modifier_state: TGdkModifierType; cdecl;
function TGdkKeymap.get_modifier_state: guint; cdecl;
begin
Result := LazGdk3.gdk_keymap_get_modifier_state(@self);
end;

4
lcl/interfaces/gtk3/gtk3winapi.inc
View File

@ -2240,8 +2240,8 @@ begin
*)
// AModifierMask := gdk_keymap_get_modifier_mask(AKeyMap, 0);
AKeyMap := gdk_keymap_get_default;
AModifiers := gdk_keymap_get_modifier_state(AKeyMap);
AKeyMap := TGdkKeymap.get_for_display(gdk_display_get_default);
AModifiers := TGdkModifierType(AKeyMap^.get_modifier_state);
case nVirtKey of
VK_LBUTTON:
if GDK_BUTTON1_MASK in AModifiers then