Skip to content

Commit 9c2f8e6

Browse files
committed
gtk2: Fix win32-specific name conflicts
1 parent 780dc3d commit 9c2f8e6

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

gtk2.fbfrog

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
-renameproc gtk_widget_is_sensitive gtk_widget_is_sensitive_
1010
-renameproc gtk_check_version gtk_check_version_
1111
-renameproc gtk_stock_add gtk_stock_add_
12+
-ifdef __FB_WIN32__
13+
-renameproc gtk_init gtk_init_
14+
-renameproc gtk_init_check gtk_init_check_
15+
-endif
1216

1317
-rename gtk_major_version gtk_major_version_
1418
-rename gtk_minor_version gtk_minor_version_

inc/gtk/gtk2.bi

+13-2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
'' variable gtk_binary_age => gtk_binary_age_
2323
'' variable gtk_interface_age => gtk_interface_age_
2424
'' procedure gtk_check_version => gtk_check_version_
25+
'' #ifdef __FB_WIN32__
26+
'' procedure gtk_init => gtk_init_
27+
'' procedure gtk_init_check => gtk_init_check_
28+
'' #endif
2529
'' procedure gtk_stock_add => gtk_stock_add_
2630

2731
extern "C"
@@ -7630,8 +7634,15 @@ type GtkKeySnoopFunc as function(byval grab_widget as GtkWidget ptr, byval event
76307634

76317635
declare function gtk_check_version_ alias "gtk_check_version"(byval required_major as guint, byval required_minor as guint, byval required_micro as guint) as const zstring ptr
76327636
declare function gtk_parse_args(byval argc as long ptr, byval argv as zstring ptr ptr ptr) as gboolean
7633-
declare sub gtk_init(byval argc as long ptr, byval argv as zstring ptr ptr ptr)
7634-
declare function gtk_init_check(byval argc as long ptr, byval argv as zstring ptr ptr ptr) as gboolean
7637+
7638+
#ifdef __FB_WIN32__
7639+
declare sub gtk_init_ alias "gtk_init"(byval argc as long ptr, byval argv as zstring ptr ptr ptr)
7640+
declare function gtk_init_check_ alias "gtk_init_check"(byval argc as long ptr, byval argv as zstring ptr ptr ptr) as gboolean
7641+
#else
7642+
declare sub gtk_init(byval argc as long ptr, byval argv as zstring ptr ptr ptr)
7643+
declare function gtk_init_check(byval argc as long ptr, byval argv as zstring ptr ptr ptr) as gboolean
7644+
#endif
7645+
76357646
declare function gtk_init_with_args(byval argc as long ptr, byval argv as zstring ptr ptr ptr, byval parameter_string as const zstring ptr, byval entries as GOptionEntry ptr, byval translation_domain as const zstring ptr, byval error as GError ptr ptr) as gboolean
76367647
declare function gtk_get_option_group(byval open_default_display as gboolean) as GOptionGroup ptr
76377648

0 commit comments

Comments
 (0)