From 7c69859cf3d7e2436bb54045c5129fc4561f35d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=BDeljan=20Rikalo?= Date: Fri, 24 Jan 2025 17:18:03 +0100 Subject: [PATCH] Gtk3: fixed building gtk3 ws on older distros, newer code is ifdefed with -dUSEGTK3LATESTBINDINGS if someone need latest glib2,gio2,gmodule2 and gobject2 bindings. Commented code is not used at all for lazarus gtk3. --- lcl/interfaces/gtk3/gtk3bindings/lazgio2.pas | 18 +++++ lcl/interfaces/gtk3/gtk3bindings/lazglib2.pas | 76 ++++++++++++++++++- .../gtk3/gtk3bindings/lazgmodule2.pas | 6 ++ .../gtk3/gtk3bindings/lazgobject2.pas | 12 +++ lcl/interfaces/gtk3/gtk3bindings/lazgtk3.pas | 12 ++- 5 files changed, 122 insertions(+), 2 deletions(-) diff --git a/lcl/interfaces/gtk3/gtk3bindings/lazgio2.pas b/lcl/interfaces/gtk3/gtk3bindings/lazgio2.pas index fe17c89162..b839d3790a 100644 --- a/lcl/interfaces/gtk3/gtk3bindings/lazgio2.pas +++ b/lcl/interfaces/gtk3/gtk3bindings/lazgio2.pas @@ -3709,7 +3709,9 @@ type function close_finish(result_: PGAsyncResult; error: PPGError): gboolean; cdecl; inline; function emit_accept_certificate(peer_cert: PGTlsCertificate; errors: TGTlsCertificateFlags): gboolean; cdecl; inline; function get_certificate: PGTlsCertificate; cdecl; inline; + {$IFDEF USEGTK3LATESTBINDINGS} function get_channel_binding_data(type_: TGTlsChannelBindingType; data: Pguint8; error: PPGError): gboolean; cdecl; inline; + {$ENDIF} function get_database: PGTlsDatabase; cdecl; inline; function get_interaction: PGTlsInteraction; cdecl; inline; function get_negotiated_protocol: Pgchar; cdecl; inline; @@ -6713,7 +6715,9 @@ type priv1: PGTlsConnectionPrivate; function emit_accept_certificate(peer_cert: PGTlsCertificate; errors: TGTlsCertificateFlags): gboolean; cdecl; inline; function get_certificate: PGTlsCertificate; cdecl; inline; + {$IFDEF USEGTK3LATESTBINDINGS} function get_channel_binding_data(type_: TGTlsChannelBindingType; data: Pguint8; error: PPGError): gboolean; cdecl; inline; + {$ENDIF} function get_database: PGTlsDatabase; cdecl; inline; function get_interaction: PGTlsInteraction; cdecl; inline; function get_negotiated_protocol: Pgchar; cdecl; inline; @@ -7086,7 +7090,9 @@ type function is_loopback: gboolean; cdecl; inline; function is_readonly: gboolean; cdecl; inline; function is_user_mountable: gboolean; cdecl; inline; + {$IFDEF USEGTK3LATESTBINDINGS} function at(mount_path: Pgchar; time_read: Pguint64): PGUnixMountPoint; cdecl; inline; static; + {$ENDIF} end; @@ -7740,7 +7746,9 @@ function g_dtls_connection_close(conn: PGDtlsConnection; cancellable: PGCancella function g_dtls_connection_close_finish(conn: PGDtlsConnection; result_: PGAsyncResult; error: PPGError): gboolean; cdecl; external LazGio2_library name 'g_dtls_connection_close_finish'; function g_dtls_connection_emit_accept_certificate(conn: PGDtlsConnection; peer_cert: PGTlsCertificate; errors: TGTlsCertificateFlags): gboolean; cdecl; external LazGio2_library name 'g_dtls_connection_emit_accept_certificate'; function g_dtls_connection_get_certificate(conn: PGDtlsConnection): PGTlsCertificate; cdecl; external LazGio2_library name 'g_dtls_connection_get_certificate'; +{$IFDEF USEGTK3LATESTBINDINGS} function g_dtls_connection_get_channel_binding_data(conn: PGDtlsConnection; type_: TGTlsChannelBindingType; data: Pguint8; error: PPGError): gboolean; cdecl; external LazGio2_library name 'g_dtls_connection_get_channel_binding_data'; +{$ENDIF} function g_dtls_connection_get_database(conn: PGDtlsConnection): PGTlsDatabase; cdecl; external LazGio2_library name 'g_dtls_connection_get_database'; function g_dtls_connection_get_interaction(conn: PGDtlsConnection): PGTlsInteraction; cdecl; external LazGio2_library name 'g_dtls_connection_get_interaction'; function g_dtls_connection_get_negotiated_protocol(conn: PGDtlsConnection): Pgchar; cdecl; external LazGio2_library name 'g_dtls_connection_get_negotiated_protocol'; @@ -8530,7 +8538,9 @@ function g_tls_client_connection_get_validation_flags(conn: PGTlsClientConnectio function g_tls_client_connection_new(base_io_stream: PGIOStream; server_identity: PGSocketConnectable; error: PPGError): PGTlsClientConnection; cdecl; external LazGio2_library name 'g_tls_client_connection_new'; function g_tls_connection_emit_accept_certificate(conn: PGTlsConnection; peer_cert: PGTlsCertificate; errors: TGTlsCertificateFlags): gboolean; cdecl; external LazGio2_library name 'g_tls_connection_emit_accept_certificate'; function g_tls_connection_get_certificate(conn: PGTlsConnection): PGTlsCertificate; cdecl; external LazGio2_library name 'g_tls_connection_get_certificate'; +{$IFDEF USEGTK3LATESTBINDINGS} function g_tls_connection_get_channel_binding_data(conn: PGTlsConnection; type_: TGTlsChannelBindingType; data: Pguint8; error: PPGError): gboolean; cdecl; external LazGio2_library name 'g_tls_connection_get_channel_binding_data'; +{$ENDIF} function g_tls_connection_get_database(conn: PGTlsConnection): PGTlsDatabase; cdecl; external LazGio2_library name 'g_tls_connection_get_database'; function g_tls_connection_get_interaction(conn: PGTlsConnection): PGTlsInteraction; cdecl; external LazGio2_library name 'g_tls_connection_get_interaction'; function g_tls_connection_get_negotiated_protocol(conn: PGTlsConnection): Pgchar; cdecl; external LazGio2_library name 'g_tls_connection_get_negotiated_protocol'; @@ -8620,7 +8630,9 @@ function g_unix_mount_is_readonly(mount_entry: PGUnixMountEntry): gboolean; cdec function g_unix_mount_is_system_internal(mount_entry: PGUnixMountEntry): gboolean; cdecl; external LazGio2_library name 'g_unix_mount_is_system_internal'; function g_unix_mount_monitor_get: PGUnixMountMonitor; cdecl; external LazGio2_library name 'g_unix_mount_monitor_get'; function g_unix_mount_monitor_get_type: TGType; cdecl; external LazGio2_library name 'g_unix_mount_monitor_get_type'; +{$IFDEF USEGTK3LATESTBINDINGS} function g_unix_mount_point_at(mount_path: Pgchar; time_read: Pguint64): PGUnixMountPoint; cdecl; external LazGio2_library name 'g_unix_mount_point_at'; +{$ENDIF} function g_unix_mount_point_compare(mount1: PGUnixMountPoint; mount2: PGUnixMountPoint): gint; cdecl; external LazGio2_library name 'g_unix_mount_point_compare'; function g_unix_mount_point_copy(mount_point: PGUnixMountPoint): PGUnixMountPoint; cdecl; external LazGio2_library name 'g_unix_mount_point_copy'; function g_unix_mount_point_get_device_path(mount_point: PGUnixMountPoint): Pgchar; cdecl; external LazGio2_library name 'g_unix_mount_point_get_device_path'; @@ -12976,10 +12988,12 @@ begin Result := LazGio2.g_dtls_connection_get_certificate(@self); end; +{$IFDEF USEGTK3LATESTBINDINGS} function TGDtlsConnection.get_channel_binding_data(type_: TGTlsChannelBindingType; data: Pguint8; error: PPGError): gboolean; cdecl; begin Result := LazGio2.g_dtls_connection_get_channel_binding_data(@self, type_, data, error); end; +{$ENDIF} function TGDtlsConnection.get_database: PGTlsDatabase; cdecl; begin @@ -16681,10 +16695,12 @@ begin Result := LazGio2.g_tls_connection_get_certificate(@self); end; +{$IFDEF USEGTK3LATESTBINDINGS} function TGTlsConnection.get_channel_binding_data(type_: TGTlsChannelBindingType; data: Pguint8; error: PPGError): gboolean; cdecl; begin Result := LazGio2.g_tls_connection_get_channel_binding_data(@self, type_, data, error); end; +{$ENDIF} function TGTlsConnection.get_database: PGTlsDatabase; cdecl; begin @@ -16996,10 +17012,12 @@ begin Result := LazGio2.g_unix_mount_point_is_user_mountable(@self); end; +{$IFDEF USEGTK3LATESTBINDINGS} function TGUnixMountPoint.at(mount_path: Pgchar; time_read: Pguint64): PGUnixMountPoint; cdecl; begin Result := LazGio2.g_unix_mount_point_at(mount_path, time_read); end; +{$ENDIF} function TGUnixOutputStream.new(fd: gint; close_fd: gboolean): PGUnixOutputStream; cdecl; begin diff --git a/lcl/interfaces/gtk3/gtk3bindings/lazglib2.pas b/lcl/interfaces/gtk3/gtk3bindings/lazglib2.pas index f624cf9bec..165761bd48 100644 --- a/lcl/interfaces/gtk3/gtk3bindings/lazglib2.pas +++ b/lcl/interfaces/gtk3/gtk3bindings/lazglib2.pas @@ -1724,23 +1724,29 @@ type procedure add_application(uri: Pgchar; name: Pgchar; exec: Pgchar); cdecl; inline; procedure add_group(uri: Pgchar; group: Pgchar); cdecl; inline; procedure free; cdecl; inline; + {$IFDEF USEGTK3LATESTBINDINGS} function get_added(uri: Pgchar; error: PPGError): glong; cdecl; inline; deprecated 'Use g_bookmark_file_get_added_date_time() instead, as `time_t` is deprecated due to the year 2038 problem.'; function get_added_date_time(uri: Pgchar; error: PPGError): PGDateTime; cdecl; inline; function get_app_info(uri: Pgchar; name: Pgchar; exec: PPgchar; count: Pguint; stamp: Pglong; error: PPGError): gboolean; cdecl; inline; deprecated 'Use g_bookmark_file_get_application_info() instead, as `time_t` is deprecated due to the year 2038 problem.'; function get_application_info(uri: Pgchar; name: Pgchar; exec: PPgchar; count: Pguint; stamp: PPGDateTime; error: PPGError): gboolean; cdecl; inline; + {$ENDIF} function get_applications(uri: Pgchar; length: Pgsize; error: PPGError): PPgchar; cdecl; inline; function get_description(uri: Pgchar; error: PPGError): Pgchar; cdecl; inline; function get_groups(uri: Pgchar; length: Pgsize; error: PPGError): PPgchar; cdecl; inline; function get_icon(uri: Pgchar; href: PPgchar; mime_type: PPgchar; error: PPGError): gboolean; cdecl; inline; function get_is_private(uri: Pgchar; error: PPGError): gboolean; cdecl; inline; function get_mime_type(uri: Pgchar; error: PPGError): Pgchar; cdecl; inline; + {$IFDEF USEGTK3LATESTBINDINGS} function get_modified(uri: Pgchar; error: PPGError): glong; cdecl; inline; deprecated 'Use g_bookmark_file_get_modified_date_time() instead, as `time_t` is deprecated due to the year 2038 problem.'; function get_modified_date_time(uri: Pgchar; error: PPGError): PGDateTime; cdecl; inline; + {$ENDIF} function get_size: gint; cdecl; inline; function get_title(uri: Pgchar; error: PPGError): Pgchar; cdecl; inline; function get_uris(length: Pgsize): PPgchar; cdecl; inline; function get_visited(uri: Pgchar; error: PPGError): glong; cdecl; inline; deprecated 'Use g_bookmark_file_get_visited_date_time() instead, as `time_t` is deprecated due to the year 2038 problem.'; + {$IFDEF USEGTK3LATESTBINDINGS} function get_visited_date_time(uri: Pgchar; error: PPGError): PGDateTime; cdecl; inline; + {$ENDIF} function has_application(uri: Pgchar; name: Pgchar; error: PPGError): gboolean; cdecl; inline; function has_group(uri: Pgchar; group: Pgchar; error: PPGError): gboolean; cdecl; inline; function has_item(uri: Pgchar): gboolean; cdecl; inline; @@ -1751,20 +1757,28 @@ type function remove_application(uri: Pgchar; name: Pgchar; error: PPGError): gboolean; cdecl; inline; function remove_group(uri: Pgchar; group: Pgchar; error: PPGError): gboolean; cdecl; inline; function remove_item(uri: Pgchar; error: PPGError): gboolean; cdecl; inline; + {$IFDEF USEGTK3LATESTBINDINGS} procedure set_added(uri: Pgchar; added: glong); cdecl; inline; deprecated 'Use g_bookmark_file_set_added_date_time() instead, as `time_t` is deprecated due to the year 2038 problem.'; procedure set_added_date_time(uri: Pgchar; added: PGDateTime); cdecl; inline; + {$ENDIF} function set_app_info(uri: Pgchar; name: Pgchar; exec: Pgchar; count: gint; stamp: glong; error: PPGError): gboolean; cdecl; inline; deprecated 'Use g_bookmark_file_set_application_info() instead, as `time_t` is deprecated due to the year 2038 problem.'; + {$IFDEF USEGTK3LATESTBINDINGS} function set_application_info(uri: Pgchar; name: Pgchar; exec: Pgchar; count: gint; stamp: PGDateTime; error: PPGError): gboolean; cdecl; inline; + {$ENDIF} procedure set_description(uri: Pgchar; description: Pgchar); cdecl; inline; procedure set_groups(uri: Pgchar; groups: PPgchar; length: gsize); cdecl; inline; procedure set_icon(uri: Pgchar; href: Pgchar; mime_type: Pgchar); cdecl; inline; procedure set_is_private(uri: Pgchar; is_private: gboolean); cdecl; inline; procedure set_mime_type(uri: Pgchar; mime_type: Pgchar); cdecl; inline; procedure set_modified(uri: Pgchar; modified: glong); cdecl; inline; deprecated 'Use g_bookmark_file_set_modified_date_time() instead, as `time_t` is deprecated due to the year 2038 problem.'; + {$IFDEF USEGTK3LATESTBINDINGS} procedure set_modified_date_time(uri: Pgchar; modified: PGDateTime); cdecl; inline; + {$ENDIF} procedure set_title(uri: Pgchar; title: Pgchar); cdecl; inline; procedure set_visited(uri: Pgchar; visited: glong); cdecl; inline; deprecated 'Use g_bookmark_file_set_visited_date_time() instead, as `time_t` is deprecated due to the year 2038 problem.'; + {$IFDEF USEGTK3LATESTBINDINGS} procedure set_visited_date_time(uri: Pgchar; visited: PGDateTime); cdecl; inline; + {$ENDIF} function to_data(length: Pgsize; error: PPGError): Pgchar; cdecl; inline; function to_file(filename: Pgchar; error: PPGError): gboolean; cdecl; inline; function error_quark: TGQuark; cdecl; inline; static; @@ -3809,6 +3823,7 @@ type PPGUriParamsFlags = ^PGUriParamsFlags; PGUriParamsFlags = ^TGUriParamsFlags; TGUri = object + {$IFDEF USEGTK3LATESTBINDINGS} function get_auth_params: Pgchar; cdecl; inline; function get_flags: TGUriFlags; cdecl; inline; function get_fragment: Pgchar; cdecl; inline; @@ -3829,20 +3844,27 @@ type function build_with_user(flags: TGUriFlags; scheme: Pgchar; user: Pgchar; password: Pgchar; auth_params: Pgchar; host: Pgchar; port: gint; path: Pgchar; query: Pgchar; fragment: Pgchar): PGUri; cdecl; inline; static; function error_quark: TGQuark; cdecl; inline; static; function escape_bytes(unescaped: Pguint8; length: gsize; reserved_chars_allowed: Pgchar): Pgchar; cdecl; inline; static; + {$ENDIF} function escape_string(unescaped: Pgchar; reserved_chars_allowed: Pgchar; allow_utf8: gboolean): Pgchar; cdecl; inline; static; + {$IFDEF USEGTK3LATESTBINDINGS} function is_valid(uri_string: Pgchar; flags: TGUriFlags; error: PPGError): gboolean; cdecl; inline; static; function join(flags: TGUriFlags; scheme: Pgchar; userinfo: Pgchar; host: Pgchar; port: gint; path: Pgchar; query: Pgchar; fragment: Pgchar): Pgchar; cdecl; inline; static; function join_with_user(flags: TGUriFlags; scheme: Pgchar; user: Pgchar; password: Pgchar; auth_params: Pgchar; host: Pgchar; port: gint; path: Pgchar; query: Pgchar; fragment: Pgchar): Pgchar; cdecl; inline; static; + {$ENDIF} function list_extract_uris(uri_list: Pgchar): PPgchar; cdecl; inline; static; + {$IFDEF USEGTK3LATESTBINDINGS} function parse(uri_string: Pgchar; flags: TGUriFlags; error: PPGError): PGUri; cdecl; inline; static; function parse_params(params: Pgchar; length: gssize; separators: Pgchar; flags: TGUriParamsFlags; error: PPGError): PGHashTable; cdecl; inline; static; + {$ENDIF} function parse_scheme(uri: Pgchar): Pgchar; cdecl; inline; static; + {$IFDEF USEGTK3LATESTBINDINGS} function peek_scheme(uri: Pgchar): Pgchar; cdecl; inline; static; function resolve_relative(base_uri_string: Pgchar; uri_ref: Pgchar; flags: TGUriFlags; error: PPGError): Pgchar; cdecl; inline; static; function split(uri_ref: Pgchar; flags: TGUriFlags; scheme: PPgchar; userinfo: PPgchar; host: PPgchar; port: Pgint; path: PPgchar; query: PPgchar; fragment: PPgchar; error: PPGError): gboolean; cdecl; inline; static; function split_network(uri_string: Pgchar; flags: TGUriFlags; scheme: PPgchar; host: PPgchar; port: Pgint; error: PPGError): gboolean; cdecl; inline; static; function split_with_user(uri_ref: Pgchar; flags: TGUriFlags; scheme: PPgchar; user: PPgchar; password: PPgchar; auth_params: PPgchar; host: PPgchar; port: Pgint; path: PPgchar; query: PPgchar; fragment: PPgchar; error: PPGError): gboolean; cdecl; inline; static; function unescape_bytes(escaped_string: Pgchar; length: gssize; illegal_characters: Pgchar; error: PPGError): PGBytes; cdecl; inline; static; + {$ENDIF} function unescape_segment(escaped_string: Pgchar; escaped_string_end: Pgchar; illegal_characters: Pgchar): Pgchar; cdecl; inline; static; function unescape_string(escaped_string: Pgchar; illegal_characters: Pgchar): Pgchar; cdecl; inline; static; end; @@ -3861,8 +3883,10 @@ type dummy1: gpointer; dummy2: gpointer; dummy3: array [0..255] of guint8; + {$IFDEF USEGTK3LATESTBINDINGS} procedure init(params: Pgchar; length: gssize; separators: Pgchar; flags: TGUriParamsFlags); cdecl; inline; function next(attribute: PPgchar; value: PPgchar; error: PPGError): gboolean; cdecl; inline; + {$ENDIF} end; @@ -4185,23 +4209,29 @@ function g_bit_nth_msf(mask: gulong; nth_bit: gint): gint; cdecl; external LazGL function g_bit_storage(number: gulong): guint; cdecl; external LazGLib2_library name 'g_bit_storage'; function g_bit_trylock(address: Pgint; lock_bit: gint): gboolean; cdecl; external LazGLib2_library name 'g_bit_trylock'; function g_bookmark_file_error_quark: TGQuark; cdecl; external LazGLib2_library name 'g_bookmark_file_error_quark'; +{$IFDEF USEGTK3LATESTBINDINGS} function g_bookmark_file_get_added(bookmark: PGBookmarkFile; uri: Pgchar; error: PPGError): glong; cdecl; external LazGLib2_library name 'g_bookmark_file_get_added'; deprecated 'Use g_bookmark_file_get_added_date_time() instead, as `time_t` is deprecated due to the year 2038 problem.'; function g_bookmark_file_get_added_date_time(bookmark: PGBookmarkFile; uri: Pgchar; error: PPGError): PGDateTime; cdecl; external LazGLib2_library name 'g_bookmark_file_get_added_date_time'; function g_bookmark_file_get_app_info(bookmark: PGBookmarkFile; uri: Pgchar; name: Pgchar; exec: PPgchar; count: Pguint; stamp: Pglong; error: PPGError): gboolean; cdecl; external LazGLib2_library name 'g_bookmark_file_get_app_info'; deprecated 'Use g_bookmark_file_get_application_info() instead, as `time_t` is deprecated due to the year 2038 problem.'; function g_bookmark_file_get_application_info(bookmark: PGBookmarkFile; uri: Pgchar; name: Pgchar; exec: PPgchar; count: Pguint; stamp: PPGDateTime; error: PPGError): gboolean; cdecl; external LazGLib2_library name 'g_bookmark_file_get_application_info'; +{$ENDIF} function g_bookmark_file_get_applications(bookmark: PGBookmarkFile; uri: Pgchar; length: Pgsize; error: PPGError): PPgchar; cdecl; external LazGLib2_library name 'g_bookmark_file_get_applications'; function g_bookmark_file_get_description(bookmark: PGBookmarkFile; uri: Pgchar; error: PPGError): Pgchar; cdecl; external LazGLib2_library name 'g_bookmark_file_get_description'; function g_bookmark_file_get_groups(bookmark: PGBookmarkFile; uri: Pgchar; length: Pgsize; error: PPGError): PPgchar; cdecl; external LazGLib2_library name 'g_bookmark_file_get_groups'; function g_bookmark_file_get_icon(bookmark: PGBookmarkFile; uri: Pgchar; href: PPgchar; mime_type: PPgchar; error: PPGError): gboolean; cdecl; external LazGLib2_library name 'g_bookmark_file_get_icon'; function g_bookmark_file_get_is_private(bookmark: PGBookmarkFile; uri: Pgchar; error: PPGError): gboolean; cdecl; external LazGLib2_library name 'g_bookmark_file_get_is_private'; function g_bookmark_file_get_mime_type(bookmark: PGBookmarkFile; uri: Pgchar; error: PPGError): Pgchar; cdecl; external LazGLib2_library name 'g_bookmark_file_get_mime_type'; +{$IFDEF USEGTK3LATESTBINDINGS} function g_bookmark_file_get_modified(bookmark: PGBookmarkFile; uri: Pgchar; error: PPGError): glong; cdecl; external LazGLib2_library name 'g_bookmark_file_get_modified'; deprecated 'Use g_bookmark_file_get_modified_date_time() instead, as `time_t` is deprecated due to the year 2038 problem.'; function g_bookmark_file_get_modified_date_time(bookmark: PGBookmarkFile; uri: Pgchar; error: PPGError): PGDateTime; cdecl; external LazGLib2_library name 'g_bookmark_file_get_modified_date_time'; +{$ENDIF} function g_bookmark_file_get_size(bookmark: PGBookmarkFile): gint; cdecl; external LazGLib2_library name 'g_bookmark_file_get_size'; function g_bookmark_file_get_title(bookmark: PGBookmarkFile; uri: Pgchar; error: PPGError): Pgchar; cdecl; external LazGLib2_library name 'g_bookmark_file_get_title'; function g_bookmark_file_get_uris(bookmark: PGBookmarkFile; length: Pgsize): PPgchar; cdecl; external LazGLib2_library name 'g_bookmark_file_get_uris'; function g_bookmark_file_get_visited(bookmark: PGBookmarkFile; uri: Pgchar; error: PPGError): glong; cdecl; external LazGLib2_library name 'g_bookmark_file_get_visited'; deprecated 'Use g_bookmark_file_get_visited_date_time() instead, as `time_t` is deprecated due to the year 2038 problem.'; +{$IFDEF USEGTK3LATESTBINDINGS} function g_bookmark_file_get_visited_date_time(bookmark: PGBookmarkFile; uri: Pgchar; error: PPGError): PGDateTime; cdecl; external LazGLib2_library name 'g_bookmark_file_get_visited_date_time'; +{$ENDIF} function g_bookmark_file_has_application(bookmark: PGBookmarkFile; uri: Pgchar; name: Pgchar; error: PPGError): gboolean; cdecl; external LazGLib2_library name 'g_bookmark_file_has_application'; function g_bookmark_file_has_group(bookmark: PGBookmarkFile; uri: Pgchar; group: Pgchar; error: PPGError): gboolean; cdecl; external LazGLib2_library name 'g_bookmark_file_has_group'; function g_bookmark_file_has_item(bookmark: PGBookmarkFile; uri: Pgchar): gboolean; cdecl; external LazGLib2_library name 'g_bookmark_file_has_item'; @@ -4214,7 +4244,9 @@ function g_bookmark_file_remove_application(bookmark: PGBookmarkFile; uri: Pgcha function g_bookmark_file_remove_group(bookmark: PGBookmarkFile; uri: Pgchar; group: Pgchar; error: PPGError): gboolean; cdecl; external LazGLib2_library name 'g_bookmark_file_remove_group'; function g_bookmark_file_remove_item(bookmark: PGBookmarkFile; uri: Pgchar; error: PPGError): gboolean; cdecl; external LazGLib2_library name 'g_bookmark_file_remove_item'; function g_bookmark_file_set_app_info(bookmark: PGBookmarkFile; uri: Pgchar; name: Pgchar; exec: Pgchar; count: gint; stamp: glong; error: PPGError): gboolean; cdecl; external LazGLib2_library name 'g_bookmark_file_set_app_info'; deprecated 'Use g_bookmark_file_set_application_info() instead, as `time_t` is deprecated due to the year 2038 problem.'; +{$IFDEF USEGTK3LATESTBINDINGS} function g_bookmark_file_set_application_info(bookmark: PGBookmarkFile; uri: Pgchar; name: Pgchar; exec: Pgchar; count: gint; stamp: PGDateTime; error: PPGError): gboolean; cdecl; external LazGLib2_library name 'g_bookmark_file_set_application_info'; +{$ENDIF} function g_bookmark_file_to_data(bookmark: PGBookmarkFile; length: Pgsize; error: PPGError): Pgchar; cdecl; external LazGLib2_library name 'g_bookmark_file_to_data'; function g_bookmark_file_to_file(bookmark: PGBookmarkFile; filename: Pgchar; error: PPGError): gboolean; cdecl; external LazGLib2_library name 'g_bookmark_file_to_file'; function g_build_filename(first_element: Pgchar; args: array of const): Pgchar; cdecl; external LazGLib2_library name 'g_build_filename'; @@ -5109,11 +5141,14 @@ function g_unix_signal_add(signum: gint; handler: TGSourceFunc; user_data: gpoin function g_unix_signal_add_full(priority: gint; signum: gint; handler: TGSourceFunc; user_data: gpointer; notify: TGDestroyNotify): guint; cdecl; external LazGLib2_library name 'g_unix_signal_add_full'; function g_unix_signal_source_new(signum: gint): PGSource; cdecl; external LazGLib2_library name 'g_unix_signal_source_new'; function g_unlink(filename: Pgchar): gint; cdecl; external LazGLib2_library name 'g_unlink'; +{$IFDEF USEGTK3LATESTBINDINGS} function g_uri_build(flags: TGUriFlags; scheme: Pgchar; userinfo: Pgchar; host: Pgchar; port: gint; path: Pgchar; query: Pgchar; fragment: Pgchar): PGUri; cdecl; external LazGLib2_library name 'g_uri_build'; function g_uri_build_with_user(flags: TGUriFlags; scheme: Pgchar; user: Pgchar; password: Pgchar; auth_params: Pgchar; host: Pgchar; port: gint; path: Pgchar; query: Pgchar; fragment: Pgchar): PGUri; cdecl; external LazGLib2_library name 'g_uri_build_with_user'; function g_uri_error_quark: TGQuark; cdecl; external LazGLib2_library name 'g_uri_error_quark'; function g_uri_escape_bytes(unescaped: Pguint8; length: gsize; reserved_chars_allowed: Pgchar): Pgchar; cdecl; external LazGLib2_library name 'g_uri_escape_bytes'; +{$ENDIF} function g_uri_escape_string(unescaped: Pgchar; reserved_chars_allowed: Pgchar; allow_utf8: gboolean): Pgchar; cdecl; external LazGLib2_library name 'g_uri_escape_string'; +{$IFDEF USEGTK3LATESTBINDINGS} function g_uri_get_auth_params(uri: PGUri): Pgchar; cdecl; external LazGLib2_library name 'g_uri_get_auth_params'; function g_uri_get_flags(uri: PGUri): TGUriFlags; cdecl; external LazGLib2_library name 'g_uri_get_flags'; function g_uri_get_fragment(uri: PGUri): Pgchar; cdecl; external LazGLib2_library name 'g_uri_get_fragment'; @@ -5123,18 +5158,24 @@ function g_uri_get_path(uri: PGUri): Pgchar; cdecl; external LazGLib2_library na function g_uri_get_port(uri: PGUri): gint; cdecl; external LazGLib2_library name 'g_uri_get_port'; function g_uri_get_query(uri: PGUri): Pgchar; cdecl; external LazGLib2_library name 'g_uri_get_query'; function g_uri_get_scheme(uri: PGUri): Pgchar; cdecl; external LazGLib2_library name 'g_uri_get_scheme'; +{$ENDIF} function g_uri_get_type: TGType; cdecl; external LazGLib2_library name 'g_uri_get_type'; +{$IFDEF USEGTK3LATESTBINDINGS} function g_uri_get_user(uri: PGUri): Pgchar; cdecl; external LazGLib2_library name 'g_uri_get_user'; function g_uri_get_userinfo(uri: PGUri): Pgchar; cdecl; external LazGLib2_library name 'g_uri_get_userinfo'; function g_uri_is_valid(uri_string: Pgchar; flags: TGUriFlags; error: PPGError): gboolean; cdecl; external LazGLib2_library name 'g_uri_is_valid'; function g_uri_join(flags: TGUriFlags; scheme: Pgchar; userinfo: Pgchar; host: Pgchar; port: gint; path: Pgchar; query: Pgchar; fragment: Pgchar): Pgchar; cdecl; external LazGLib2_library name 'g_uri_join'; function g_uri_join_with_user(flags: TGUriFlags; scheme: Pgchar; user: Pgchar; password: Pgchar; auth_params: Pgchar; host: Pgchar; port: gint; path: Pgchar; query: Pgchar; fragment: Pgchar): Pgchar; cdecl; external LazGLib2_library name 'g_uri_join_with_user'; +{$ENDIF} function g_uri_list_extract_uris(uri_list: Pgchar): PPgchar; cdecl; external LazGLib2_library name 'g_uri_list_extract_uris'; +{$IFDEF USEGTK3LATESTBINDINGS} function g_uri_params_iter_next(iter: PGUriParamsIter; attribute: PPgchar; value: PPgchar; error: PPGError): gboolean; cdecl; external LazGLib2_library name 'g_uri_params_iter_next'; function g_uri_parse(uri_string: Pgchar; flags: TGUriFlags; error: PPGError): PGUri; cdecl; external LazGLib2_library name 'g_uri_parse'; function g_uri_parse_params(params: Pgchar; length: gssize; separators: Pgchar; flags: TGUriParamsFlags; error: PPGError): PGHashTable; cdecl; external LazGLib2_library name 'g_uri_parse_params'; function g_uri_parse_relative(base_uri: PGUri; uri_ref: Pgchar; flags: TGUriFlags; error: PPGError): PGUri; cdecl; external LazGLib2_library name 'g_uri_parse_relative'; +{$ENDIF} function g_uri_parse_scheme(uri: Pgchar): Pgchar; cdecl; external LazGLib2_library name 'g_uri_parse_scheme'; +{$IFDEF USEGTK3LATESTBINDINGS} function g_uri_peek_scheme(uri: Pgchar): Pgchar; cdecl; external LazGLib2_library name 'g_uri_peek_scheme'; function g_uri_ref(uri: PGUri): PGUri; cdecl; external LazGLib2_library name 'g_uri_ref'; function g_uri_resolve_relative(base_uri_string: Pgchar; uri_ref: Pgchar; flags: TGUriFlags; error: PPGError): Pgchar; cdecl; external LazGLib2_library name 'g_uri_resolve_relative'; @@ -5144,6 +5185,7 @@ function g_uri_split_with_user(uri_ref: Pgchar; flags: TGUriFlags; scheme: PPgch function g_uri_to_string(uri: PGUri): Pgchar; cdecl; external LazGLib2_library name 'g_uri_to_string'; function g_uri_to_string_partial(uri: PGUri; flags: TGUriHideFlags): Pgchar; cdecl; external LazGLib2_library name 'g_uri_to_string_partial'; function g_uri_unescape_bytes(escaped_string: Pgchar; length: gssize; illegal_characters: Pgchar; error: PPGError): PGBytes; cdecl; external LazGLib2_library name 'g_uri_unescape_bytes'; +{$ENDIF} function g_uri_unescape_segment(escaped_string: Pgchar; escaped_string_end: Pgchar; illegal_characters: Pgchar): Pgchar; cdecl; external LazGLib2_library name 'g_uri_unescape_segment'; function g_uri_unescape_string(escaped_string: Pgchar; illegal_characters: Pgchar): Pgchar; cdecl; external LazGLib2_library name 'g_uri_unescape_string'; function g_utf16_to_ucs4(str: Pguint16; len: glong; items_read: Pglong; items_written: Pglong; error: PPGError): Pgunichar; cdecl; external LazGLib2_library name 'g_utf16_to_ucs4'; @@ -5351,18 +5393,24 @@ procedure g_bit_unlock(address: Pgint; lock_bit: gint); cdecl; external LazGLib2 procedure g_bookmark_file_add_application(bookmark: PGBookmarkFile; uri: Pgchar; name: Pgchar; exec: Pgchar); cdecl; external LazGLib2_library name 'g_bookmark_file_add_application'; procedure g_bookmark_file_add_group(bookmark: PGBookmarkFile; uri: Pgchar; group: Pgchar); cdecl; external LazGLib2_library name 'g_bookmark_file_add_group'; procedure g_bookmark_file_free(bookmark: PGBookmarkFile); cdecl; external LazGLib2_library name 'g_bookmark_file_free'; +{$IFDEF USEGTK3LATESTBINDINGS} procedure g_bookmark_file_set_added(bookmark: PGBookmarkFile; uri: Pgchar; added: glong); cdecl; external LazGLib2_library name 'g_bookmark_file_set_added'; deprecated 'Use g_bookmark_file_set_added_date_time() instead, as `time_t` is deprecated due to the year 2038 problem.'; procedure g_bookmark_file_set_added_date_time(bookmark: PGBookmarkFile; uri: Pgchar; added: PGDateTime); cdecl; external LazGLib2_library name 'g_bookmark_file_set_added_date_time'; +{$ENDIF} procedure g_bookmark_file_set_description(bookmark: PGBookmarkFile; uri: Pgchar; description: Pgchar); cdecl; external LazGLib2_library name 'g_bookmark_file_set_description'; procedure g_bookmark_file_set_groups(bookmark: PGBookmarkFile; uri: Pgchar; groups: PPgchar; length: gsize); cdecl; external LazGLib2_library name 'g_bookmark_file_set_groups'; procedure g_bookmark_file_set_icon(bookmark: PGBookmarkFile; uri: Pgchar; href: Pgchar; mime_type: Pgchar); cdecl; external LazGLib2_library name 'g_bookmark_file_set_icon'; procedure g_bookmark_file_set_is_private(bookmark: PGBookmarkFile; uri: Pgchar; is_private: gboolean); cdecl; external LazGLib2_library name 'g_bookmark_file_set_is_private'; procedure g_bookmark_file_set_mime_type(bookmark: PGBookmarkFile; uri: Pgchar; mime_type: Pgchar); cdecl; external LazGLib2_library name 'g_bookmark_file_set_mime_type'; procedure g_bookmark_file_set_modified(bookmark: PGBookmarkFile; uri: Pgchar; modified: glong); cdecl; external LazGLib2_library name 'g_bookmark_file_set_modified'; deprecated 'Use g_bookmark_file_set_modified_date_time() instead, as `time_t` is deprecated due to the year 2038 problem.'; +{$IFDEF USEGTK3LATESTBINDINGS} procedure g_bookmark_file_set_modified_date_time(bookmark: PGBookmarkFile; uri: Pgchar; modified: PGDateTime); cdecl; external LazGLib2_library name 'g_bookmark_file_set_modified_date_time'; +{$ENDIF} procedure g_bookmark_file_set_title(bookmark: PGBookmarkFile; uri: Pgchar; title: Pgchar); cdecl; external LazGLib2_library name 'g_bookmark_file_set_title'; procedure g_bookmark_file_set_visited(bookmark: PGBookmarkFile; uri: Pgchar; visited: glong); cdecl; external LazGLib2_library name 'g_bookmark_file_set_visited'; deprecated 'Use g_bookmark_file_set_visited_date_time() instead, as `time_t` is deprecated due to the year 2038 problem.'; +{$IFDEF USEGTK3LATESTBINDINGS} procedure g_bookmark_file_set_visited_date_time(bookmark: PGBookmarkFile; uri: Pgchar; visited: PGDateTime); cdecl; external LazGLib2_library name 'g_bookmark_file_set_visited_date_time'; +{$ENDIF} procedure g_byte_array_sort(array_: Pguint8; compare_func: TGCompareFunc); cdecl; external LazGLib2_library name 'g_byte_array_sort'; procedure g_byte_array_sort_with_data(array_: Pguint8; compare_func: TGCompareDataFunc; user_data: gpointer); cdecl; external LazGLib2_library name 'g_byte_array_sort_with_data'; procedure g_byte_array_unref(array_: Pguint8); cdecl; external LazGLib2_library name 'g_byte_array_unref'; @@ -5696,8 +5744,10 @@ procedure g_tree_replace(tree: PGTree; key: gpointer; value: gpointer); cdecl; e procedure g_tree_unref(tree: PGTree); cdecl; external LazGLib2_library name 'g_tree_unref'; procedure g_unicode_canonical_ordering(string_: Pgunichar; len: gsize); cdecl; external LazGLib2_library name 'g_unicode_canonical_ordering'; procedure g_unsetenv(variable: Pgchar); cdecl; external LazGLib2_library name 'g_unsetenv'; +{$IFDEF USEGTK3LATESTBINDINGS} procedure g_uri_params_iter_init(iter: PGUriParamsIter; params: Pgchar; length: gssize; separators: Pgchar; flags: TGUriParamsFlags); cdecl; external LazGLib2_library name 'g_uri_params_iter_init'; procedure g_uri_unref(uri: PGUri); cdecl; external LazGLib2_library name 'g_uri_unref'; +{$ENDIF} procedure g_usleep(microseconds: gulong); cdecl; external LazGLib2_library name 'g_usleep'; procedure g_variant_builder_add(builder: PGVariantBuilder; format_string: Pgchar; args: array of const); cdecl; external LazGLib2_library name 'g_variant_builder_add'; procedure g_variant_builder_add_parsed(builder: PGVariantBuilder; format: Pgchar; args: array of const); cdecl; external LazGLib2_library name 'g_variant_builder_add_parsed'; @@ -5951,6 +6001,7 @@ begin LazGLib2.g_bookmark_file_free(@self); end; +{$IFDEF USEGTK3LATESTBINDINGS} function TGBookmarkFile.get_added(uri: Pgchar; error: PPGError): glong; cdecl; begin Result := LazGLib2.g_bookmark_file_get_added(@self, uri, error); @@ -5970,6 +6021,7 @@ function TGBookmarkFile.get_application_info(uri: Pgchar; name: Pgchar; exec: PP begin Result := LazGLib2.g_bookmark_file_get_application_info(@self, uri, name, exec, count, stamp, error); end; +{$ENDIF} function TGBookmarkFile.get_applications(uri: Pgchar; length: Pgsize; error: PPGError): PPgchar; cdecl; begin @@ -6001,6 +6053,7 @@ begin Result := LazGLib2.g_bookmark_file_get_mime_type(@self, uri, error); end; +{$IFDEF USEGTK3LATESTBINDINGS} function TGBookmarkFile.get_modified(uri: Pgchar; error: PPGError): glong; cdecl; begin Result := LazGLib2.g_bookmark_file_get_modified(@self, uri, error); @@ -6010,6 +6063,7 @@ function TGBookmarkFile.get_modified_date_time(uri: Pgchar; error: PPGError): PG begin Result := LazGLib2.g_bookmark_file_get_modified_date_time(@self, uri, error); end; +{$ENDIF} function TGBookmarkFile.get_size: gint; cdecl; begin @@ -6031,10 +6085,12 @@ begin Result := LazGLib2.g_bookmark_file_get_visited(@self, uri, error); end; +{$IFDEF USEGTK3LATESTBINDINGS} function TGBookmarkFile.get_visited_date_time(uri: Pgchar; error: PPGError): PGDateTime; cdecl; begin Result := LazGLib2.g_bookmark_file_get_visited_date_time(@self, uri, error); end; +{$ENDIF} function TGBookmarkFile.has_application(uri: Pgchar; name: Pgchar; error: PPGError): gboolean; cdecl; begin @@ -6086,6 +6142,7 @@ begin Result := LazGLib2.g_bookmark_file_remove_item(@self, uri, error); end; +{$IFDEF USEGTK3LATESTBINDINGS} procedure TGBookmarkFile.set_added(uri: Pgchar; added: glong); cdecl; begin LazGLib2.g_bookmark_file_set_added(@self, uri, added); @@ -6095,16 +6152,19 @@ procedure TGBookmarkFile.set_added_date_time(uri: Pgchar; added: PGDateTime); cd begin LazGLib2.g_bookmark_file_set_added_date_time(@self, uri, added); end; +{$ENDIF} function TGBookmarkFile.set_app_info(uri: Pgchar; name: Pgchar; exec: Pgchar; count: gint; stamp: glong; error: PPGError): gboolean; cdecl; begin Result := LazGLib2.g_bookmark_file_set_app_info(@self, uri, name, exec, count, stamp, error); end; +{$IFDEF USEGTK3LATESTBINDINGS} function TGBookmarkFile.set_application_info(uri: Pgchar; name: Pgchar; exec: Pgchar; count: gint; stamp: PGDateTime; error: PPGError): gboolean; cdecl; begin Result := LazGLib2.g_bookmark_file_set_application_info(@self, uri, name, exec, count, stamp, error); end; +{$ENDIF} procedure TGBookmarkFile.set_description(uri: Pgchar; description: Pgchar); cdecl; begin @@ -6136,10 +6196,12 @@ begin LazGLib2.g_bookmark_file_set_modified(@self, uri, modified); end; +{$IFDEF USEGTK3LATESTBINDINGS} procedure TGBookmarkFile.set_modified_date_time(uri: Pgchar; modified: PGDateTime); cdecl; begin LazGLib2.g_bookmark_file_set_modified_date_time(@self, uri, modified); end; +{$ENDIF} procedure TGBookmarkFile.set_title(uri: Pgchar; title: Pgchar); cdecl; begin @@ -6151,10 +6213,12 @@ begin LazGLib2.g_bookmark_file_set_visited(@self, uri, visited); end; +{$IFDEF USEGTK3LATESTBINDINGS} procedure TGBookmarkFile.set_visited_date_time(uri: Pgchar; visited: PGDateTime); cdecl; begin LazGLib2.g_bookmark_file_set_visited_date_time(@self, uri, visited); end; +{$ENDIF} function TGBookmarkFile.to_data(length: Pgsize; error: PPGError): Pgchar; cdecl; begin @@ -10151,6 +10215,7 @@ begin LazGLib2.g_tree_unref(@self); end; +{$IFDEF USEGTK3LATESTBINDINGS} function TGUri.get_auth_params: Pgchar; cdecl; begin Result := LazGLib2.g_uri_get_auth_params(@self); @@ -10250,17 +10315,19 @@ function TGUri.escape_bytes(unescaped: Pguint8; length: gsize; reserved_chars_al begin Result := LazGLib2.g_uri_escape_bytes(unescaped, length, reserved_chars_allowed); end; - +{$ENDIF} function TGUri.escape_string(unescaped: Pgchar; reserved_chars_allowed: Pgchar; allow_utf8: gboolean): Pgchar; cdecl; begin Result := LazGLib2.g_uri_escape_string(unescaped, reserved_chars_allowed, allow_utf8); end; +{$IFDEF USEGTK3LATESTBINDINGS} function TGUri.is_valid(uri_string: Pgchar; flags: TGUriFlags; error: PPGError): gboolean; cdecl; begin Result := LazGLib2.g_uri_is_valid(uri_string, flags, error); end; + function TGUri.join(flags: TGUriFlags; scheme: Pgchar; userinfo: Pgchar; host: Pgchar; port: gint; path: Pgchar; query: Pgchar; fragment: Pgchar): Pgchar; cdecl; begin Result := LazGLib2.g_uri_join(flags, scheme, userinfo, host, port, path, query, fragment); @@ -10270,12 +10337,14 @@ function TGUri.join_with_user(flags: TGUriFlags; scheme: Pgchar; user: Pgchar; p begin Result := LazGLib2.g_uri_join_with_user(flags, scheme, user, password, auth_params, host, port, path, query, fragment); end; +{$ENDIF} function TGUri.list_extract_uris(uri_list: Pgchar): PPgchar; cdecl; begin Result := LazGLib2.g_uri_list_extract_uris(uri_list); end; +{$IFDEF USEGTK3LATESTBINDINGS} function TGUri.parse(uri_string: Pgchar; flags: TGUriFlags; error: PPGError): PGUri; cdecl; begin Result := LazGLib2.g_uri_parse(uri_string, flags, error); @@ -10285,12 +10354,14 @@ function TGUri.parse_params(params: Pgchar; length: gssize; separators: Pgchar; begin Result := LazGLib2.g_uri_parse_params(params, length, separators, flags, error); end; +{$ENDIF} function TGUri.parse_scheme(uri: Pgchar): Pgchar; cdecl; begin Result := LazGLib2.g_uri_parse_scheme(uri); end; +{$IFDEF USEGTK3LATESTBINDINGS} function TGUri.peek_scheme(uri: Pgchar): Pgchar; cdecl; begin Result := LazGLib2.g_uri_peek_scheme(uri); @@ -10320,6 +10391,7 @@ function TGUri.unescape_bytes(escaped_string: Pgchar; length: gssize; illegal_ch begin Result := LazGLib2.g_uri_unescape_bytes(escaped_string, length, illegal_characters, error); end; +{$ENDIF} function TGUri.unescape_segment(escaped_string: Pgchar; escaped_string_end: Pgchar; illegal_characters: Pgchar): Pgchar; cdecl; begin @@ -10331,6 +10403,7 @@ begin Result := LazGLib2.g_uri_unescape_string(escaped_string, illegal_characters); end; +{$IFDEF USEGTK3LATESTBINDINGS} procedure TGUriParamsIter.init(params: Pgchar; length: gssize; separators: Pgchar; flags: TGUriParamsFlags); cdecl; begin LazGLib2.g_uri_params_iter_init(@self, params, length, separators, flags); @@ -10340,6 +10413,7 @@ function TGUriParamsIter.next(attribute: PPgchar; value: PPgchar; error: PPGErro begin Result := LazGLib2.g_uri_params_iter_next(@self, attribute, value, error); end; +{$ENDIF} function TGVariant.new_array(child_type: PGVariantType; children: PPGVariant; n_children: gsize): PGVariant; cdecl; begin diff --git a/lcl/interfaces/gtk3/gtk3bindings/lazgmodule2.pas b/lcl/interfaces/gtk3/gtk3bindings/lazgmodule2.pas index 955d466a8b..fb68cffced 100644 --- a/lcl/interfaces/gtk3/gtk3bindings/lazgmodule2.pas +++ b/lcl/interfaces/gtk3/gtk3bindings/lazgmodule2.pas @@ -53,7 +53,9 @@ type function symbol(symbol_name: Pgchar; symbol: Pgpointer): gboolean; cdecl; inline; function build_path(directory: Pgchar; module_name: Pgchar): Pgchar; cdecl; inline; static; function error: Pgchar; cdecl; inline; static; + {$IFDEF USEGTK3LATESTBINDINGS} function error_quark: TGQuark; cdecl; inline; static; + {$ENDIF} function open(file_name: Pgchar; flags: TGModuleFlags): PGModule; cdecl; inline; static; function supported: gboolean; cdecl; inline; static; end; @@ -63,7 +65,9 @@ type function g_module_build_path(directory: Pgchar; module_name: Pgchar): Pgchar; cdecl; external LazGModule2_library name 'g_module_build_path'; function g_module_close(module: PGModule): gboolean; cdecl; external LazGModule2_library name 'g_module_close'; function g_module_error: Pgchar; cdecl; external LazGModule2_library name 'g_module_error'; +{$IFDEF USEGTK3LATESTBINDINGS} function g_module_error_quark: TGQuark; cdecl; external LazGModule2_library name 'g_module_error_quark'; +{$ENDIF} function g_module_name(module: PGModule): Pgchar; cdecl; external LazGModule2_library name 'g_module_name'; function g_module_open(file_name: Pgchar; flags: TGModuleFlags): PGModule; cdecl; external LazGModule2_library name 'g_module_open'; function g_module_supported: gboolean; cdecl; external LazGModule2_library name 'g_module_supported'; @@ -100,10 +104,12 @@ begin Result := LazGModule2.g_module_error(); end; +{$IFDEF USEGTK3LATESTBINDINGS} function TGModule.error_quark: TGQuark; cdecl; begin Result := LazGModule2.g_module_error_quark(); end; +{$ENDIF} function TGModule.open(file_name: Pgchar; flags: TGModuleFlags): PGModule; cdecl; begin diff --git a/lcl/interfaces/gtk3/gtk3bindings/lazgobject2.pas b/lcl/interfaces/gtk3/gtk3bindings/lazgobject2.pas index c295375ecf..8d561d7218 100644 --- a/lcl/interfaces/gtk3/gtk3bindings/lazgobject2.pas +++ b/lcl/interfaces/gtk3/gtk3bindings/lazgobject2.pas @@ -463,7 +463,9 @@ type procedure set_instance(instance: gpointer); cdecl; inline; procedure set_int(v_int: gint); cdecl; inline; procedure set_int64(v_int64: gint64); cdecl; inline; + {$IFDEF USEGTK3LATESTBINDINGS} procedure set_interned_string(v_string: Pgchar); cdecl; inline; + {$ENDIF} procedure set_long(v_long: glong); cdecl; inline; procedure set_object(v_object: PGObject); cdecl; inline; procedure set_param(param: PGParamSpec); cdecl; inline; @@ -661,7 +663,9 @@ type ref_count: guint; param_id: guint; function internal(param_type: TGType; name: Pgchar; nick: Pgchar; blurb: Pgchar; flags: TGParamFlags): PGParamSpec; cdecl; inline; static; + {$IFDEF USEGTK3LATESTBINDINGS} function is_valid_name(name: Pgchar): gboolean; cdecl; inline; static; + {$ENDIF} function get_blurb: Pgchar; cdecl; inline; function get_default_value: PGValue; cdecl; inline; function get_name: Pgchar; cdecl; inline; @@ -1371,7 +1375,9 @@ function g_param_spec_gtype(name: Pgchar; nick: Pgchar; blurb: Pgchar; is_a_type function g_param_spec_int(name: Pgchar; nick: Pgchar; blurb: Pgchar; minimum: gint; maximum: gint; default_value: gint; flags: TGParamFlags): PGParamSpec; cdecl; external LazGObject2_library name 'g_param_spec_int'; function g_param_spec_int64(name: Pgchar; nick: Pgchar; blurb: Pgchar; minimum: gint64; maximum: gint64; default_value: gint64; flags: TGParamFlags): PGParamSpec; cdecl; external LazGObject2_library name 'g_param_spec_int64'; function g_param_spec_internal(param_type: TGType; name: Pgchar; nick: Pgchar; blurb: Pgchar; flags: TGParamFlags): PGParamSpec; cdecl; external LazGObject2_library name 'g_param_spec_internal'; +{$IFDEF USEGTK3LATESTBINDINGS} function g_param_spec_is_valid_name(name: Pgchar): gboolean; cdecl; external LazGObject2_library name 'g_param_spec_is_valid_name'; +{$ENDIF} function g_param_spec_long(name: Pgchar; nick: Pgchar; blurb: Pgchar; minimum: glong; maximum: glong; default_value: glong; flags: TGParamFlags): PGParamSpec; cdecl; external LazGObject2_library name 'g_param_spec_long'; function g_param_spec_object(name: Pgchar; nick: Pgchar; blurb: Pgchar; object_type: TGType; flags: TGParamFlags): PGParamSpec; cdecl; external LazGObject2_library name 'g_param_spec_object'; function g_param_spec_override(name: Pgchar; overridden: PGParamSpec): PGParamSpec; cdecl; external LazGObject2_library name 'g_param_spec_override'; @@ -1671,7 +1677,9 @@ procedure g_value_set_gtype(value: PGValue; v_gtype: TGType); cdecl; external La procedure g_value_set_instance(value: PGValue; instance: gpointer); cdecl; external LazGObject2_library name 'g_value_set_instance'; procedure g_value_set_int(value: PGValue; v_int: gint); cdecl; external LazGObject2_library name 'g_value_set_int'; procedure g_value_set_int64(value: PGValue; v_int64: gint64); cdecl; external LazGObject2_library name 'g_value_set_int64'; +{$IFDEF USEGTK3LATESTBINDINGS} procedure g_value_set_interned_string(value: PGValue; v_string: Pgchar); cdecl; external LazGObject2_library name 'g_value_set_interned_string'; +{$ENDIF} procedure g_value_set_long(value: PGValue; v_long: glong); cdecl; external LazGObject2_library name 'g_value_set_long'; procedure g_value_set_object(value: PGValue; v_object: PGObject); cdecl; external LazGObject2_library name 'g_value_set_object'; procedure g_value_set_param(value: PGValue; param: PGParamSpec); cdecl; external LazGObject2_library name 'g_value_set_param'; @@ -2275,10 +2283,12 @@ begin LazGObject2.g_value_set_int64(@self, v_int64); end; +{$IFDEF USEGTK3LATESTBINDINGS} procedure TGValue.set_interned_string(v_string: Pgchar); cdecl; begin LazGObject2.g_value_set_interned_string(@self, v_string); end; +{$ENDIF} procedure TGValue.set_long(v_long: glong); cdecl; begin @@ -2540,10 +2550,12 @@ begin Result := LazGObject2.g_param_spec_internal(param_type, name, nick, blurb, flags); end; +{$IFDEF USEGTK3LATESTBINDINGS} function TGParamSpec.is_valid_name(name: Pgchar): gboolean; cdecl; begin Result := LazGObject2.g_param_spec_is_valid_name(name); end; +{$ENDIF} function TGParamSpec.get_blurb: Pgchar; cdecl; begin diff --git a/lcl/interfaces/gtk3/gtk3bindings/lazgtk3.pas b/lcl/interfaces/gtk3/gtk3bindings/lazgtk3.pas index 42fc43f57e..8cb900caa8 100644 --- a/lcl/interfaces/gtk3/gtk3bindings/lazgtk3.pas +++ b/lcl/interfaces/gtk3/gtk3bindings/lazgtk3.pas @@ -10813,7 +10813,7 @@ type PGtkPlugAccessiblePrivate = ^TGtkPlugAccessiblePrivate; TGtkPlugAccessible = object(TGtkWindowAccessible) priv4: PGtkPlugAccessiblePrivate; - function get_id: Pgchar; cdecl; inline; + {$IFDEF USEGTK3LATESTBINDINGS}function get_id: Pgchar; cdecl; inline;{$ENDIF} end; TGtkPlugAccessiblePrivate = record @@ -12533,7 +12533,9 @@ type PGtkSocketAccessiblePrivate = ^TGtkSocketAccessiblePrivate; TGtkSocketAccessible = object(TGtkContainerAccessible) priv3: PGtkSocketAccessiblePrivate; + {$IFDEF USEGTK3LATESTBINDINGS} procedure embed(path: Pgchar); cdecl; inline; + {$ENDIF} end; TGtkSocketAccessiblePrivate = record @@ -16253,7 +16255,9 @@ function gtk_places_sidebar_get_show_trash(sidebar: PGtkPlacesSidebar): gboolean function gtk_places_sidebar_get_type: TGType; cdecl; external LazGtk3_library name 'gtk_places_sidebar_get_type'; function gtk_places_sidebar_list_shortcuts(sidebar: PGtkPlacesSidebar): PGSList; cdecl; external LazGtk3_library name 'gtk_places_sidebar_list_shortcuts'; function gtk_places_sidebar_new: PGtkPlacesSidebar; cdecl; external LazGtk3_library name 'gtk_places_sidebar_new'; +{$IFDEF USEGTK3LATESTBINDINGS} function gtk_plug_accessible_get_id(plug: PGtkPlugAccessible): Pgchar; cdecl; external LazGtk3_library name 'gtk_plug_accessible_get_id'; +{$ENDIF} function gtk_plug_accessible_get_type: TGType; cdecl; external LazGtk3_library name 'gtk_plug_accessible_get_type'; function gtk_plug_get_embedded(plug: PGtkPlug): gboolean; cdecl; external LazGtk3_library name 'gtk_plug_get_embedded'; function gtk_plug_get_id(plug: PGtkPlug): TWindow; cdecl; external LazGtk3_library name 'gtk_plug_get_id'; @@ -18269,7 +18273,9 @@ procedure gtk_show_about_dialog(parent: PGtkWindow; first_property_name: Pgchar; procedure gtk_size_group_add_widget(size_group: PGtkSizeGroup; widget: PGtkWidget); cdecl; external LazGtk3_library name 'gtk_size_group_add_widget'; procedure gtk_size_group_remove_widget(size_group: PGtkSizeGroup; widget: PGtkWidget); cdecl; external LazGtk3_library name 'gtk_size_group_remove_widget'; procedure gtk_size_group_set_mode(size_group: PGtkSizeGroup; mode: TGtkSizeGroupMode); cdecl; external LazGtk3_library name 'gtk_size_group_set_mode'; +{$IFDEF USEGTK3LATESTBINDINGS} procedure gtk_socket_accessible_embed(socket: PGtkSocketAccessible; path: Pgchar); cdecl; external LazGtk3_library name 'gtk_socket_accessible_embed'; +{$ENDIF} procedure gtk_socket_add_id(socket_: PGtkSocket; window: TWindow); cdecl; external LazGtk3_library name 'gtk_socket_add_id'; procedure gtk_spin_button_configure(spin_button: PGtkSpinButton; adjustment: PGtkAdjustment; climb_rate: gdouble; digits: guint); cdecl; external LazGtk3_library name 'gtk_spin_button_configure'; procedure gtk_spin_button_get_increments(spin_button: PGtkSpinButton; step: Pgdouble; page: Pgdouble); cdecl; external LazGtk3_library name 'gtk_spin_button_get_increments'; @@ -30342,10 +30348,12 @@ begin Result := LazGtk3.gtk_plug_get_socket_window(@self); end; +{$IFDEF USEGTK3LATESTBINDINGS} function TGtkPlugAccessible.get_id: Pgchar; cdecl; begin Result := LazGtk3.gtk_plug_accessible_get_id(@self); end; +{$ENDIF} function TGtkPopoverMenu.new: PGtkPopoverMenu; cdecl; begin @@ -31987,10 +31995,12 @@ begin Result := LazGtk3.gtk_socket_get_plug_window(@self); end; +{$IFDEF USEGTK3LATESTBINDINGS} procedure TGtkSocketAccessible.embed(path: Pgchar); cdecl; begin LazGtk3.gtk_socket_accessible_embed(@self, path); end; +{$ENDIF} function TGtkSpinButton.new(adjustment: PGtkAdjustment; climb_rate: gdouble; digits: guint): PGtkSpinButton; cdecl; begin