From 0a237866059148319ad47d862cb663d0c9b1ef53 Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Sat, 14 Oct 2006 17:39:00 +0000 Subject: [PATCH] - reverted r4880 (wrong varargs reform) and r4838 (wrong removal of varargs/array of const overloads) * arrayconstructor and array of const are no longer compatible with the extra varargs parameters (so overloaded varargs and array of const cdecl functions can be distinguished) * fixed tprintf2 for the correct varargs syntax git-svn-id: trunk@4909 - --- compiler/htypechk.pas | 4 +- compiler/ncal.pas | 31 +++--------- packages/base/libc/argph.inc | 3 ++ packages/base/libc/fcntlh.inc | 3 ++ packages/base/libc/monetaryh.inc | 2 + packages/base/libc/semaphoreh.inc | 1 + packages/base/libc/sioctlh.inc | 1 + packages/base/libc/sptraceh.inc | 1 + packages/base/libc/ssemh.inc | 1 + packages/base/libc/stdioh.inc | 6 +++ packages/base/libc/ucontexth.inc | 1 + packages/base/libc/ulimith.inc | 1 + packages/base/libc/unistdh.inc | 7 ++- packages/base/libc/wcharh.inc | 6 +++ packages/base/sqlite/sqlite.pp | 3 ++ .../gconf/gconfclient/gconfchangeset.inc | 2 + .../gnome1/gnome/libgnome/gnometriggers.inc | 2 + .../gnome1/gnome/libgnomeui/gnomedialog.inc | 2 + packages/extra/gtk/gtk/gtksignal.pp | 2 + packages/extra/gtk2/glib/gerror.inc | 10 ++++ packages/extra/gtk2/glib/gfileutils.inc | 7 +++ packages/extra/gtk2/glib/gmessages.inc | 23 +++++++++ packages/extra/gtk2/glib/gobject.inc | 17 +++++++ packages/extra/gtk2/glib/grel.inc | 10 ++++ packages/extra/gtk2/glib/gscanner.inc | 8 ++++ packages/extra/gtk2/glib/gsignal.inc | 17 +++++++ packages/extra/gtk2/glib/gstrfuncs.inc | 14 ++++++ packages/extra/gtk2/glib/gstring.inc | 8 ++++ packages/extra/gtk2/glib/gutils.inc | 6 +++ packages/extra/gtk2/gtk+/gtk/gtkbindings.inc | 6 +++ .../extra/gtk2/gtk+/gtk/gtkcelllayout.inc | 2 + packages/extra/gtk2/gtk+/gtk/gtkclist.inc | 13 +++++ packages/extra/gtk2/gtk+/gtk/gtkcontainer.inc | 11 +++++ packages/extra/gtk2/gtk+/gtk/gtkctree.inc | 4 ++ packages/extra/gtk2/gtk+/gtk/gtkcurve.inc | 5 ++ packages/extra/gtk2/gtk+/gtk/gtkdialog.inc | 10 ++++ .../gtk2/gtk+/gtk/gtkfilechooserdialog.inc | 5 +- packages/extra/gtk2/gtk+/gtk/gtkliststore.inc | 11 +++++ .../extra/gtk2/gtk+/gtk/gtkmessagedialog.inc | 9 ++++ packages/extra/gtk2/gtk+/gtk/gtkobject.inc | 3 ++ packages/extra/gtk2/gtk+/gtk/gtksignal.inc | 14 ++++++ .../extra/gtk2/gtk+/gtk/gtktextbuffer.inc | 14 ++++++ packages/extra/gtk2/gtk+/gtk/gtktreemodel.inc | 6 +++ packages/extra/gtk2/gtk+/gtk/gtktreestore.inc | 11 +++++ packages/extra/gtk2/gtk+/gtk/gtktreeview.inc | 5 ++ .../extra/gtk2/gtk+/gtk/gtktreeviewcolumn.inc | 10 ++++ packages/extra/gtk2/gtk+/gtk/gtkwidget.inc | 16 +++++++ packages/extra/gtk2/pango/pango-tabs.inc | 5 ++ tests/test/cg/tprintf2.pp | 48 +++++++++---------- 49 files changed, 356 insertions(+), 51 deletions(-) diff --git a/compiler/htypechk.pas b/compiler/htypechk.pas index 60abc3b20f..a5d28779b8 100644 --- a/compiler/htypechk.pas +++ b/compiler/htypechk.pas @@ -1941,7 +1941,9 @@ implementation { varargs are always equal, but not exact } if (po_varargs in hp^.data.procoptions) and - (currparanr>hp^.data.minparacount) then + (currparanr>hp^.data.minparacount) and + not is_array_of_const(def_from) and + not is_array_constructor(def_from) then begin eq:=te_equal; end diff --git a/compiler/ncal.pas b/compiler/ncal.pas index 7a57008f21..3bf6b4eead 100644 --- a/compiler/ncal.pas +++ b/compiler/ncal.pas @@ -1055,10 +1055,6 @@ type include(callnodeflags,cnf_uses_varargs); { Get arrayconstructor node and insert typeconvs } hp:=tarrayconstructornode(oldleft.left); - { if there is no formal array-of-const para in the declaration, } - { remove the array-of-const para } - if (po_varargs in procdefinition.procoptions) then - left:=tcallparanode(left).right; { Add c args parameters } { It could be an empty set } if assigned(hp) and @@ -1074,22 +1070,11 @@ type hp:=tarrayconstructornode(hp.right); end; end; - if not (po_varargs in procdefinition.procoptions) then - begin - { Remove value of old array of const parameter, but keep it - in the list because it is required for bind_parasym. - Generate a nothign to keep callparanoed.left valid } - oldleft.left.free; - oldleft.left:=cnothingnode.create; - end - else - begin - { in this case, there is no array of const parameter in the } - { function declaration, so remove all traces of it } - dec(paralength); - oldleft.right:=nil; - oldleft.free; - end; + { Remove value of old array of const parameter, but keep it + in the list because it is required for bind_parasym. + Generate a nothign to keep callparanoed.left valid } + oldleft.left.free; + oldleft.left:=cnothingnode.create; end; @@ -1923,10 +1908,8 @@ type { Change loading of array of const to varargs } if assigned(left) and - (((po_varargs in procdefinition.procoptions) and - (paralength > procdefinition.maxparacount)) or - (is_array_of_const(tparavarsym(procdefinition.paras[procdefinition.paras.count-1]).vartype.def) and - (procdefinition.proccalloption in [pocall_cppdecl,pocall_cdecl]))) then + is_array_of_const(tparavarsym(procdefinition.paras[procdefinition.paras.count-1]).vartype.def) and + (procdefinition.proccalloption in [pocall_cppdecl,pocall_cdecl]) then convert_carg_array_of_const; { bind parasyms to the callparanodes and insert hidden parameters } diff --git a/packages/base/libc/argph.inc b/packages/base/libc/argph.inc index b1733908a1..875daa00a4 100644 --- a/packages/base/libc/argph.inc +++ b/packages/base/libc/argph.inc @@ -123,10 +123,13 @@ procedure argp_state_help(__state:Pargp_state; __stream:PFILE; __flags:dword);cd procedure __argp_state_help(__state:Pargp_state; __stream:PFILE; __flags:dword);cdecl;external clib name '__argp_state_help'; procedure argp_usage(__state:Pargp_state);cdecl;external clib name 'argp_usage'; procedure __argp_usage(__state:Pargp_state);cdecl;external clib name '__argp_usage'; +procedure argp_error(__state:Pargp_state; __fmt:Pchar; args:array of const);cdecl;external clib name 'argp_error'; procedure argp_error(__state:Pargp_state; __fmt:Pchar);cdecl;varargs;external clib name 'argp_error'; procedure __argp_error(__state:Pargp_state; __fmt:Pchar; args:array of const);cdecl;external clib name '__argp_error'; procedure __argp_error(__state:Pargp_state; __fmt:Pchar);cdecl;varargs;external clib name '__argp_error'; +procedure argp_failure(__state:Pargp_state; __status:longint; __errnum:longint; __fmt:Pchar; args:array of const);cdecl;external clib name 'argp_failure'; procedure argp_failure(__state:Pargp_state; __status:longint; __errnum:longint; __fmt:Pchar);cdecl;varargs;external clib name 'argp_failure'; +procedure __argp_failure(__state:Pargp_state; __status:longint; __errnum:longint; __fmt:Pchar; args:array of const);cdecl;external clib name '__argp_failure'; procedure __argp_failure(__state:Pargp_state; __status:longint; __errnum:longint; __fmt:Pchar);cdecl;varargs;external clib name '__argp_failure'; function _option_is_short(__opt:Pargp_option):longint;cdecl;external clib name '_option_is_short'; function __option_is_short(__opt:Pargp_option):longint;cdecl;external clib name '__option_is_short'; diff --git a/packages/base/libc/fcntlh.inc b/packages/base/libc/fcntlh.inc index 77bab896a6..0fa62665ff 100644 --- a/packages/base/libc/fcntlh.inc +++ b/packages/base/libc/fcntlh.inc @@ -10,10 +10,13 @@ const SEEK_CUR = 1; SEEK_END = 2; +function fcntl(__fd:longint; __cmd:longint; args:array of const):longint;cdecl;external clib name 'fcntl'; function fcntl(__fd:longint; __cmd:longint):longint;cdecl;varargs;external clib name 'fcntl'; +function open(__file:Pchar; __oflag:longint; args:array of const):longint;cdecl;external clib name 'open'; function open(__file:Pchar; __oflag:longint):longint;cdecl;varargs;external clib name 'open'; +function open64(__file:Pchar; __oflag:longint; args:array of const):longint;cdecl;external clib name 'open64'; function open64(__file:Pchar; __oflag:longint):longint;cdecl;varargs;external clib name 'open64'; function creat(__file:Pchar; __mode:__mode_t):longint;cdecl;external clib name 'creat'; diff --git a/packages/base/libc/monetaryh.inc b/packages/base/libc/monetaryh.inc index 6fada774fd..0a6a0d49a0 100644 --- a/packages/base/libc/monetaryh.inc +++ b/packages/base/libc/monetaryh.inc @@ -1,6 +1,8 @@ +function strfmon(__s:Pchar; __maxsize:size_t; __format:Pchar; args:array of const):ssize_t;cdecl;external clib name 'strfmon'; function strfmon(__s:Pchar; __maxsize:size_t; __format:Pchar):ssize_t;cdecl;varargs;external clib name 'strfmon'; +function __strfmon_l(__s:Pchar; __maxsize:size_t; loc:__locale_t; __format:Pchar; args:array of const):ssize_t;cdecl;external clib name '__strfmon_l'; function __strfmon_l(__s:Pchar; __maxsize:size_t; loc:__locale_t; __format:Pchar):ssize_t;cdecl;varargs;external clib name '__strfmon_l'; diff --git a/packages/base/libc/semaphoreh.inc b/packages/base/libc/semaphoreh.inc index ea403cae34..1777c3e784 100644 --- a/packages/base/libc/semaphoreh.inc +++ b/packages/base/libc/semaphoreh.inc @@ -14,6 +14,7 @@ Const function sem_init(__sem:Psem_t; __pshared:longint; __value:dword):longint;cdecl;external threadslib name 'sem_init'; function sem_destroy(__sem:Psem_t):longint;cdecl;external threadslib name 'sem_destroy'; +function sem_open(__name:Pchar; __oflag:longint; args:array of const):Psem_t;cdecl;external threadslib name 'sem_open'; function sem_open(__name:Pchar; __oflag:longint):Psem_t;cdecl;varargs;external threadslib name 'sem_open'; function sem_close(__sem:Psem_t):longint;cdecl;external threadslib name 'sem_close'; function sem_unlink(__name:Pchar):longint;cdecl;external threadslib name 'sem_unlink'; diff --git a/packages/base/libc/sioctlh.inc b/packages/base/libc/sioctlh.inc index 295beeeb64..afb8719d62 100644 --- a/packages/base/libc/sioctlh.inc +++ b/packages/base/libc/sioctlh.inc @@ -1,4 +1,5 @@ +function ioctl(__fd:longint; __request:dword; args:array of const):longint;cdecl;external clib name 'ioctl'; function ioctl(__fd:longint; __request:dword):longint;cdecl;varargs;external clib name 'ioctl'; { --------------------------------------------------------------------- diff --git a/packages/base/libc/sptraceh.inc b/packages/base/libc/sptraceh.inc index 5f54c12a69..bd81b08bb1 100644 --- a/packages/base/libc/sptraceh.inc +++ b/packages/base/libc/sptraceh.inc @@ -44,6 +44,7 @@ Const PT_SETFPXREGS = PTRACE_SETFPXREGS; PT_SYSCALL = PTRACE_SYSCALL; +function ptrace(__request:__ptrace_request; args:array of const):longint;cdecl;external clib name 'ptrace'; function ptrace(__request:__ptrace_request):longint;cdecl;varargs;external clib name 'ptrace'; function ptrace(__request: __ptrace_request; PID: pid_t; Address: Pointer; Data: Longint): longint; cdecl; external clib name 'ptrace'; function ptrace(__request: __ptrace_request; PID: pid_t; Address: Pointer; Data: Longint; Addr2: Pointer): longint; cdecl; external clib name 'ptrace'; diff --git a/packages/base/libc/ssemh.inc b/packages/base/libc/ssemh.inc index b2f11d4be3..669f26fc52 100644 --- a/packages/base/libc/ssemh.inc +++ b/packages/base/libc/ssemh.inc @@ -8,6 +8,7 @@ type end; +function semctl(__semid:longint; __semnum:longint; __cmd:longint; args:array of const):longint;cdecl;external clib name 'semctl'; function semctl(__semid:longint; __semnum:longint; __cmd:longint):longint;varargs;cdecl;external clib name 'semctl'; function semget(__key:key_t; __nsems:longint; __semflg:longint):longint;cdecl;external clib name 'semget'; function semop(__semid:longint; __sops:psembuf; __nsops:size_t):longint;cdecl;external clib name 'semop'; diff --git a/packages/base/libc/stdioh.inc b/packages/base/libc/stdioh.inc index 2774b052e7..540b2e5dd6 100644 --- a/packages/base/libc/stdioh.inc +++ b/packages/base/libc/stdioh.inc @@ -52,15 +52,21 @@ function setvbuf(__stream:PFILE; __buf:Pchar; __modes:longint; __n:size_t):longi procedure setbuffer(__stream:PFILE; __buf:Pchar; __size:size_t);cdecl;external clib name 'setbuffer'; procedure setlinebuf(__stream:PFILE);cdecl;external clib name 'setlinebuf'; +function fprintf(__stream:PFILE; __format:Pchar; args:array of const):longint;cdecl;external clib name 'fprintf'; function fprintf(__stream:PFILE; __format:Pchar):longint;cdecl;varargs;external clib name 'fprintf'; +function printf(__format:Pchar; args:array of const):longint;cdecl;external clib name 'printf'; function printf(__format:Pchar):longint;cdecl;varargs;external clib name 'printf'; +function sprintf(__s:Pchar; __format:Pchar; args:array of const):longint;cdecl;external clib name 'sprintf'; function sprintf(__s:Pchar; __format:Pchar):longint;varargs;cdecl;external clib name 'sprintf'; function vfprintf(__s:PFILE; __format:Pchar; __arg:_G_va_list):longint;cdecl;external clib name 'vfprintf'; function vprintf(__format:Pchar; __arg:_G_va_list):longint;cdecl;external clib name 'vprintf'; function vsprintf(__s:Pchar; __format:Pchar; __arg:_G_va_list):longint;cdecl;external clib name 'vsprintf'; +function fscanf(__stream:PFILE; __format:Pchar; args:array of const):longint;cdecl;external clib name 'fscanf'; function fscanf(__stream:PFILE; __format:Pchar):longint;varargs;cdecl;external clib name 'fscanf'; +function scanf(__format:Pchar; args:array of const):longint;cdecl;external clib name 'scanf'; function scanf(__format:Pchar):longint;cdecl;varargs;external clib name 'scanf'; +function sscanf(__s:Pchar; __format:Pchar; args:array of const):longint;cdecl;external clib name 'sscanf'; function sscanf(__s:Pchar; __format:Pchar):longint;cdecl;varargs;external clib name 'sscanf'; function fgetc(__stream:PFILE):longint;cdecl;external clib name 'fgetc'; diff --git a/packages/base/libc/ucontexth.inc b/packages/base/libc/ucontexth.inc index 849eeee9a0..761b509b73 100644 --- a/packages/base/libc/ucontexth.inc +++ b/packages/base/libc/ucontexth.inc @@ -5,6 +5,7 @@ type function getcontext(__ucp:Pucontext_t):longint;cdecl;external clib name 'getcontext'; function setcontext(__ucp:Pucontext_t):longint;cdecl;external clib name 'setcontext'; function swapcontext(__oucp:Pucontext_t; __ucp:Pucontext_t):longint;cdecl;external clib name 'swapcontext'; +procedure makecontext(__ucp:Pucontext_t; __func:TMakeContextProc; __argc:longint; args:array of const);cdecl;external clib name 'makecontext'; procedure makecontext(__ucp:Pucontext_t; __func:TMakeContextProc; __argc:longint);cdecl;varargs;external clib name 'makecontext'; diff --git a/packages/base/libc/ulimith.inc b/packages/base/libc/ulimith.inc index 23c5f77132..0ee01a357a 100644 --- a/packages/base/libc/ulimith.inc +++ b/packages/base/libc/ulimith.inc @@ -6,6 +6,7 @@ Const __UL_GETOPENMAX = 4; +function ulimit(__cmd:longint; args:array of const):longint;cdecl;external clib name 'ulimit'; function ulimit(__cmd:longint):longint;cdecl;varargs;external clib name 'ulimit'; { --------------------------------------------------------------------- diff --git a/packages/base/libc/unistdh.inc b/packages/base/libc/unistdh.inc index 360d6c3909..3f468d3315 100644 --- a/packages/base/libc/unistdh.inc +++ b/packages/base/libc/unistdh.inc @@ -87,9 +87,12 @@ function execve(__path:Pchar; __argv:PPchar; __envp:PPchar):longint;cdecl;extern function fexecve(__fd:longint; __argv:PPchar; __envp:PPchar):longint;cdecl;external clib name 'fexecve'; function execv(__path:Pchar; __argv:PPchar):longint;cdecl;external clib name 'execv'; -function execle(__path:Pchar; __arg:Pchar):longint;cdecl;varargs;external clib name 'execle'; +function execle(__path:Pchar; __arg:Pchar; args:array of const):longint;cdecl;varargs;external clib name 'execle'; +function execle(__path:Pchar; __arg:Pchar):longint;cdecl;external clib name 'execle'; +function execl(__path:Pchar; __arg:Pchar; args:array of const):longint;cdecl;external clib name 'execl'; function execl(__path:Pchar; __arg:Pchar):longint;cdecl;varargs;external clib name 'execl'; function execvp(__file:Pchar; __argv:PPchar):longint;cdecl;external clib name 'execvp'; +function execlp(__file:Pchar; __arg:Pchar; args:array of const):longint;cdecl;external clib name 'execlp'; function execlp(__file:Pchar; __arg:Pchar):longint;cdecl;varargs;external clib name 'execlp'; function nice(__inc:longint):longint;cdecl;external clib name 'nice'; @@ -169,8 +172,10 @@ function getdtablesize:longint;cdecl;external clib name 'getdtablesize'; function brk(__addr:pointer):longint;cdecl;external clib name 'brk'; function sbrk(__delta:intptr_t):pointer;cdecl;external clib name 'sbrk'; +function syscall(__sysno:longint; args:array of const):longint;cdecl;external clib name 'syscall'; function syscall(__sysno:longint):longint;cdecl;varargs;external clib name 'syscall'; + function crypt(__key:Pchar; __salt:Pchar):Pchar;cdecl;external clib name 'crypt'; procedure encrypt(__block:Pchar; __edflag:longint);cdecl;external clib name 'encrypt'; procedure swab(__from:pointer; __to:pointer; __n:ssize_t);cdecl;external clib name 'swab'; diff --git a/packages/base/libc/wcharh.inc b/packages/base/libc/wcharh.inc index 49cdd84bbc..b87f91c4a8 100644 --- a/packages/base/libc/wcharh.inc +++ b/packages/base/libc/wcharh.inc @@ -78,14 +78,20 @@ function __wcstoull_internal(__nptr:Pwchar_t; __endptr:PPwchar_t; __base:longint function wcpcpy(__dest:Pwchar_t; __src:Pwchar_t):Pwchar_t;cdecl;external clib name 'wcpcpy'; function wcpncpy(__dest:Pwchar_t; __src:Pwchar_t; __n:size_t):Pwchar_t;cdecl;external clib name 'wcpncpy'; function fwide(__fp:P__FILE; __mode:longint):longint;cdecl;external clib name 'fwide'; +function fwprintf(__stream:P__FILE; __format:Pwchar_t; args:array of const):longint;cdecl;external clib name 'fwprintf'; function fwprintf(__stream:P__FILE; __format:Pwchar_t):longint;cdecl;varargs;external clib name 'fwprintf'; +function wprintf(__format:Pwchar_t; args:array of const):longint;cdecl;external clib name 'wprintf'; function wprintf(__format:Pwchar_t):longint;cdecl;varargs;external clib name 'wprintf'; +function swprintf(__s:Pwchar_t; __n:size_t; __format:Pwchar_t; args:array of const):longint;cdecl;external clib name 'swprintf'; function swprintf(__s:Pwchar_t; __n:size_t; __format:Pwchar_t):longint;cdecl;varargs;external clib name 'swprintf'; function vfwprintf(__s:P__FILE; __format:Pwchar_t; __arg:__gnuc_va_list):longint;cdecl;external clib name 'vfwprintf'; function vwprintf(__format:Pwchar_t; __arg:__gnuc_va_list):longint;cdecl;external clib name 'vwprintf'; function vswprintf(__s:Pwchar_t; __n:size_t; __format:Pwchar_t; __arg:__gnuc_va_list):longint;cdecl;external clib name 'vswprintf'; +function fwscanf(__stream:P__FILE; __format:Pwchar_t; args:array of const):longint;cdecl;external clib name 'fwscanf'; function fwscanf(__stream:P__FILE; __format:Pwchar_t):longint;cdecl;varargs;external clib name 'fwscanf'; +function wscanf(__format:Pwchar_t; args:array of const):longint;cdecl;external clib name 'wscanf'; function wscanf(__format:Pwchar_t):longint;cdecl;varargs;external clib name 'wscanf'; +function swscanf(__s:Pwchar_t; __format:Pwchar_t; args:array of const):longint;cdecl;external clib name 'swscanf'; function swscanf(__s:Pwchar_t; __format:Pwchar_t):longint;cdecl;varargs;external clib name 'swscanf'; function vfwscanf(__s:P__FILE; __format:Pwchar_t; __arg:__gnuc_va_list):longint;cdecl;external clib name 'vfwscanf'; function vwscanf(__format:Pwchar_t; __arg:__gnuc_va_list):longint;cdecl;external clib name 'vwscanf'; diff --git a/packages/base/sqlite/sqlite.pp b/packages/base/sqlite/sqlite.pp index d386929631..277ef1227f 100644 --- a/packages/base/sqlite/sqlite.pp +++ b/packages/base/sqlite/sqlite.pp @@ -121,6 +121,8 @@ Type function sqlite_get_table(_para1:Psqlite; sql:Pchar; resultp:PPPchar; nrow:Plongint; ncolumn:Plongint; errmsg:PPchar):longint;cdecl;external External_library name 'sqlite_get_table'; procedure sqlite_free_table(result:PPchar);cdecl;external External_library name 'sqlite_free_table'; + function sqlite_exec_printf(_para1:Psqlite; sqlFormat:Pchar; _para3:sqlite_callback; _para4:pointer; errmsg:PPchar; + args:array of const):longint;cdecl;external External_library name 'sqlite_exec_printf'; function sqlite_exec_printf(_para1:Psqlite; sqlFormat:Pchar; _para3:sqlite_callback; _para4:pointer; errmsg:PPchar):longint;cdecl;varargs;external External_library name 'sqlite_exec_printf'; function sqlite_exec_vprintf(_para1:Psqlite; sqlFormat:Pchar; _para3:sqlite_callback; _para4:pointer; errmsg:PPchar; ap:array of const):longint;cdecl;external External_library name 'sqlite_exec_vprintf'; @@ -130,6 +132,7 @@ Type errmsg:PPchar):longint;cdecl;varargs;external External_library name 'sqlite_get_table_printf'; function sqlite_get_table_vprintf(_para1:Psqlite; sqlFormat:Pchar; resultp:PPPchar; nrow:Plongint; ncolumn:Plongint; errmsg:PPchar; ap:array of const):longint;cdecl;external External_library name 'sqlite_get_table_vprintf'; + function sqlite_mprintf(_para1:Pchar; args:array of const):Pchar;cdecl;external External_library name 'sqlite_mprintf'; function sqlite_mprintf(_para1:Pchar):Pchar;cdecl;varargs;external External_library name 'sqlite_mprintf'; procedure sqlite_freemem(p:pointer);cdecl;external External_library name 'sqlite_freemem'; function sqlite_libversion:Pchar;cdecl;external External_library name 'sqlite_libversion'; diff --git a/packages/extra/gnome1/gconf/gconfclient/gconfchangeset.inc b/packages/extra/gnome1/gconf/gconfclient/gconfchangeset.inc index d7fcbaf23b..b640a19c26 100644 --- a/packages/extra/gnome1/gconf/gconfclient/gconfchangeset.inc +++ b/packages/extra/gnome1/gconf/gconfclient/gconfchangeset.inc @@ -10,6 +10,8 @@ type function gconf_engine_commit_change_set(conf:PGConfEngine; cs:PGConfChangeSet; remove_committed:gboolean; err:PPGError):gboolean;cdecl;external gconfclientdll name 'gconf_engine_commit_change_set'; function gconf_engine_reverse_change_set(conf:PGConfEngine; cs:PGConfChangeSet; err:PPGError):PGConfChangeSet;cdecl;external gconfclientdll name 'gconf_engine_reverse_change_set'; function gconf_engine_change_set_from_currentv(conf:PGConfEngine; keys:PPgchar; err:PPGError):PGConfChangeSet;cdecl;external gconfclientdll name 'gconf_engine_change_set_from_currentv'; +function gconf_engine_change_set_from_current(conf:PGConfEngine; err:PPGError; first_key:Pgchar; + args:array of const):PGConfChangeSet;cdecl;external gconfclientdll name 'gconf_engine_change_set_from_current'; function gconf_engine_change_set_from_current(conf:PGConfEngine; err:PPGError; first_key:Pgchar):PGConfChangeSet;cdecl;varargs;external gconfclientdll name 'gconf_engine_change_set_from_current'; function gconf_change_set_new:PGConfChangeSet;cdecl;external gconfclientdll name 'gconf_change_set_new'; procedure gconf_change_set_ref(cs:PGConfChangeSet);cdecl;external gconfclientdll name 'gconf_change_set_ref'; diff --git a/packages/extra/gnome1/gnome/libgnome/gnometriggers.inc b/packages/extra/gnome1/gnome/libgnome/gnometriggers.inc index b340dfc01c..dd21333d2e 100644 --- a/packages/extra/gnome1/gnome/libgnome/gnometriggers.inc +++ b/packages/extra/gnome1/gnome/libgnome/gnometriggers.inc @@ -23,8 +23,10 @@ type procedure gnome_triggers_init;cdecl;external libgnomedll name 'gnome_triggers_init'; function gnome_triggers_readfile(infilename:Pchar):gint;cdecl;external libgnomedll name 'gnome_triggers_readfile'; +procedure gnome_triggers_add_trigger(nt:PGnomeTrigger; args:array of const);cdecl;external libgnomedll name 'gnome_triggers_add_trigger'; procedure gnome_triggers_add_trigger(nt:PGnomeTrigger);cdecl;varargs;external libgnomedll name 'gnome_triggers_add_trigger'; procedure gnome_triggers_vadd_trigger(nt:PGnomeTrigger; supinfo:PPchar);cdecl;external libgnomedll name 'gnome_triggers_vadd_trigger'; +procedure gnome_triggers_do(msg:Pchar; level:Pchar; args:array of const);cdecl;external libgnomedll name 'gnome_triggers_do'; procedure gnome_triggers_do(msg:Pchar; level:Pchar);cdecl;varargs;external libgnomedll name 'gnome_triggers_do'; procedure gnome_triggers_vdo(msg:Pchar; level:Pchar; supinfo:PPchar);cdecl;external libgnomedll name 'gnome_triggers_vdo'; diff --git a/packages/extra/gnome1/gnome/libgnomeui/gnomedialog.inc b/packages/extra/gnome1/gnome/libgnomeui/gnomedialog.inc index 163fbe70e7..fd9886f8c6 100644 --- a/packages/extra/gnome1/gnome/libgnomeui/gnomedialog.inc +++ b/packages/extra/gnome1/gnome/libgnomeui/gnomedialog.inc @@ -38,6 +38,7 @@ function GNOME_IS_DIALOG(obj : Pointer) : Boolean; function GNOME_IS_DIALOG_CLASS(klass : Pointer) : Boolean; function gnome_dialog_get_type:TGtkType;cdecl;external libgnomeuidll name 'gnome_dialog_get_type'; +function gnome_dialog_new(title:Pgchar; args:array of const):PGtkWidget;cdecl;external libgnomeuidll name 'gnome_dialog_new'; function gnome_dialog_new(title:Pgchar):PGtkWidget;cdecl; varargs; external libgnomeuidll name 'gnome_dialog_new'; function gnome_dialog_newv(title:Pgchar; buttons:PPgchar):PGtkWidget;cdecl;external libgnomeuidll name 'gnome_dialog_newv'; procedure gnome_dialog_set_parent(dialog:PGnomeDialog; parent:PGtkWindow);cdecl;external libgnomeuidll name 'gnome_dialog_set_parent'; @@ -53,6 +54,7 @@ procedure gnome_dialog_close(dialog:PGnomeDialog);cdecl;external libgnomeuidll n procedure gnome_dialog_close_hides(dialog:PGnomeDialog; just_hide:gboolean);cdecl;external libgnomeuidll name 'gnome_dialog_close_hides'; procedure gnome_dialog_set_close(dialog:PGnomeDialog; click_closes:gboolean);cdecl;external libgnomeuidll name 'gnome_dialog_set_close'; procedure gnome_dialog_editable_enters(dialog:PGnomeDialog; editable:PGtkEditable);cdecl;external libgnomeuidll name 'gnome_dialog_editable_enters'; +procedure gnome_dialog_append_buttons(dialog:PGnomeDialog; first:Pgchar; args:array of const);cdecl;external libgnomeuidll name 'gnome_dialog_append_buttons'; procedure gnome_dialog_append_buttons(dialog:PGnomeDialog; first:Pgchar);cdecl; varargs; external libgnomeuidll name 'gnome_dialog_append_buttons'; procedure gnome_dialog_append_button(dialog:PGnomeDialog; name:Pgchar);cdecl;external libgnomeuidll name 'gnome_dialog_append_button'; procedure gnome_dialog_append_buttonsv(dialog:PGnomeDialog; buttons:PPgchar);cdecl;external libgnomeuidll name 'gnome_dialog_append_buttonsv'; diff --git a/packages/extra/gtk/gtk/gtksignal.pp b/packages/extra/gtk/gtk/gtksignal.pp index 82576db067..73545bf60a 100644 --- a/packages/extra/gtk/gtk/gtksignal.pp +++ b/packages/extra/gtk/gtk/gtksignal.pp @@ -60,10 +60,12 @@ function gtk_signal_add_emission_hook_full(signal_id:guint; hook_func:TGtkEmiss procedure gtk_signal_remove_emission_hook(signal_id:guint; hook_id:guint);cdecl;external gtkdll name 'gtk_signal_remove_emission_hook'; function gtk_signal_query(signal_id:guint):PGtkSignalQuery;cdecl;external gtkdll name 'gtk_signal_query'; procedure gtk_signal_init;cdecl;external gtkdll name 'gtk_signal_init'; +function gtk_signal_new(name:Pgchar; signal_flags:TGtkSignalRunType; object_type:TGtkType; function_offset:guint; marshaller:TGtkSignalMarshaller; return_val:TGtkType; nparams:guint; args:array of const):guint;cdecl;external gtkdll name 'gtk_signal_new'; function gtk_signal_new(name:Pgchar; signal_flags:TGtkSignalRunType; object_type:TGtkType; function_offset:guint; marshaller:TGtkSignalMarshaller; return_val:TGtkType; nparams:guint):guint;cdecl; varargs; external gtkdll name 'gtk_signal_new'; function gtk_signal_newv(name:Pgchar; signal_flags:TGtkSignalRunType; object_type:TGtkType; function_offset:guint; marshaller:TGtkSignalMarshaller; return_val:TGtkType; nparams:guint; params:PGtkType):guint;cdecl;external gtkdll name 'gtk_signal_newv'; procedure gtk_signal_emit(theobject:PGtkObject; signal_id:guint; args:array of const);cdecl;external gtkdll name 'gtk_signal_emit'; procedure gtk_signal_emit(theobject:PGtkObject; signal_id:guint);cdecl; varargs; external gtkdll name 'gtk_signal_emit'; +procedure gtk_signal_emit_by_name(theobject:PGtkObject; name:Pgchar; args:array of const);cdecl;external gtkdll name 'gtk_signal_emit_by_name'; procedure gtk_signal_emit_by_name(theobject:PGtkObject; name:Pgchar);cdecl; varargs; external gtkdll name 'gtk_signal_emit_by_name'; procedure gtk_signal_emitv(theobject:PGtkObject; signal_id:guint; params:PGtkArg);cdecl;external gtkdll name 'gtk_signal_emitv'; procedure gtk_signal_emitv_by_name(theobject:PGtkObject; name:Pgchar; params:PGtkArg);cdecl;external gtkdll name 'gtk_signal_emitv_by_name'; diff --git a/packages/extra/gtk2/glib/gerror.inc b/packages/extra/gtk2/glib/gerror.inc index b3e10b7073..da2538e741 100644 --- a/packages/extra/gtk2/glib/gerror.inc +++ b/packages/extra/gtk2/glib/gerror.inc @@ -12,7 +12,12 @@ message : Pgchar; end; +{$IFNDEF KYLIX} + function g_error_new(domain:TGQuark; code:gint; format:Pgchar; args:array of const):PGError;cdecl;overload;external gliblib name 'g_error_new_literal'; + function g_error_new(domain:TGQuark; code:gint; format:Pgchar):PGError;cdecl;overload;varargs;external gliblib name 'g_error_new_literal'; +{$ELSE} function g_error_new(domain:TGQuark; code:gint; format:Pgchar):PGError;varargs;cdecl;external gliblib name 'g_error_new_literal'; +{$ENDIF} function g_error_new_literal(domain:TGQuark; code:gint; message:Pgchar):PGError;cdecl;external gliblib name 'g_error_new_literal'; @@ -26,7 +31,12 @@ some sanity checks. } +{$IFNDEF KYLIX} + procedure g_set_error (err: PPGError; domain: TGQuark; code: gint; format: Pgchar; args: array of const);cdecl;overload;external gliblib name 'g_set_error'; + procedure g_set_error (err: PPGError; domain: TGQuark; code: gint; format: Pgchar);cdecl;overload;varargs;external gliblib name 'g_set_error'; +{$ELSE} procedure g_set_error (err: PPGError; domain: TGQuark; code: gint; format: Pgchar);varargs;cdecl;external gliblib name 'g_set_error'; +{$ENDIF} { if dest then dest := src; also has some sanity checks. } procedure g_propagate_error(dest:PPGError; src:PGError);cdecl;external gliblib name 'g_propagate_error'; diff --git a/packages/extra/gtk2/glib/gfileutils.inc b/packages/extra/gtk2/glib/gfileutils.inc index 4e449588b1..e380f62086 100644 --- a/packages/extra/gtk2/glib/gfileutils.inc +++ b/packages/extra/gtk2/glib/gfileutils.inc @@ -64,6 +64,13 @@ { Wrapper for g_mkstemp } function g_file_open_tmp(tmpl:Pchar; name_used:PPchar; error:PPGError):longint;cdecl;external gliblib name 'g_file_open_tmp'; +{$IFNDEF KYLIX} + function g_build_path(separator:Pgchar; first_element:Pgchar; args:array of const):Pgchar;cdecl;overload;external gliblib name 'g_build_path'; + function g_build_path(separator:Pgchar; first_element:Pgchar):Pgchar;cdecl;overload;varargs;external gliblib name 'g_build_path'; + function g_build_filename(first_element:Pgchar; args:array of const):Pgchar;cdecl;overload;external gliblib name 'g_build_filename'; + function g_build_filename(first_element:Pgchar):Pgchar;cdecl;overload;varargs;external gliblib name 'g_build_filename'; +{$ELSE} function g_build_path(separator:Pgchar; first_element:Pgchar):Pgchar;varargs;cdecl;external gliblib name 'g_build_path'; function g_build_filename(first_element:Pgchar):Pgchar;varargs;cdecl;external gliblib name 'g_build_filename'; +{$ENDIF} diff --git a/packages/extra/gtk2/glib/gmessages.inc b/packages/extra/gtk2/glib/gmessages.inc index 283b09b740..03ad036d5d 100644 --- a/packages/extra/gtk2/glib/gmessages.inc +++ b/packages/extra/gtk2/glib/gmessages.inc @@ -8,7 +8,11 @@ { calculate a string size, guarranteed to fit format + args. } +{$IFNDEF KYLIX} + function g_printf_string_upper_bound(format:Pgchar; args:array of const):gsize;cdecl;external gliblib name 'g_printf_string_upper_bound'; +{$ELSE} function g_printf_string_upper_bound(format:Pgchar):gsize;varargs;cdecl;external gliblib name 'g_printf_string_upper_bound'; +{$ENDIF} { Log level shift offset for user defined log levels (0-7 are used by GLib). @@ -52,8 +56,17 @@ procedure g_log_default_handler(log_domain:Pgchar; log_level:TGLogLevelFlags; TheMessage:Pgchar; unused_data:gpointer);cdecl;external gliblib name 'g_log_default_handler'; +{$IFNDEF KYLIX} + procedure g_log(log_domain:Pgchar; log_level:TGLogLevelFlags; format:Pgchar; args:array of const);cdecl;overload;external gliblib name 'g_log'; + procedure g_log(log_domain:Pgchar; log_level:TGLogLevelFlags; format:Pgchar);cdecl;overload;varargs;external gliblib name 'g_log'; + + procedure g_logv(log_domain:Pgchar; log_level:TGLogLevelFlags; format:Pgchar; args:array of const);cdecl;overload;external gliblib name 'g_logv'; + procedure g_logv(log_domain:Pgchar; log_level:TGLogLevelFlags; format:Pgchar);cdecl;overload;varargs;external gliblib name 'g_logv'; +{$ELSE} procedure g_log(log_domain:Pgchar; log_level:TGLogLevelFlags; format:Pgchar);varargs;cdecl;external gliblib name 'g_log'; procedure g_logv(log_domain:Pgchar; log_level:TGLogLevelFlags; format:Pgchar);varargs;cdecl;external gliblib name 'g_logv'; +{$ENDIF} + function g_log_set_fatal_mask(log_domain:Pgchar; fatal_mask:TGLogLevelFlags):TGLogLevelFlags;cdecl;external gliblib name 'g_log_set_fatal_mask'; @@ -88,12 +101,22 @@ type TGPrintFunc = procedure (_string: pgchar); +{$IFNDEF KYLIX} + procedure g_print(format:Pgchar; args:array of const);cdecl;overload;external gliblib name 'g_print'; + procedure g_print(format:Pgchar);cdecl;overload;varargs;external gliblib name 'g_print'; +{$ELSE} procedure g_print(format:Pgchar);varargs;cdecl;external gliblib name 'g_print'; +{$ENDIF} function g_set_print_handler(func:TGPrintFunc):TGPrintFunc;cdecl;external gliblib name 'g_set_print_handler'; +{$IFNDEF KYLIX} + procedure g_printerr(format:Pgchar; args:array of const);cdecl;overload;external gliblib name 'g_printerr'; + procedure g_printerr(format:Pgchar);cdecl;overload;varargs;external gliblib name 'g_printerr'; +{$ELSE} procedure g_printerr(format:Pgchar);varargs;cdecl;external gliblib name 'g_printerr'; +{$ENDIF} function g_set_printerr_handler(func:TGPrintFunc):TGPrintFunc;cdecl;external gliblib name 'g_set_printerr_handler'; diff --git a/packages/extra/gtk2/glib/gobject.inc b/packages/extra/gtk2/glib/gobject.inc index 6502f69390..399b4dd8dd 100644 --- a/packages/extra/gtk2/glib/gobject.inc +++ b/packages/extra/gtk2/glib/gobject.inc @@ -64,6 +64,22 @@ function G_VALUE_HOLDS_OBJECT(value : Pointer) : boolean; procedure g_object_class_install_property(oclass:PGObjectClass; property_id:guint; pspec:PGParamSpec); cdecl; external gobjectlib; function g_object_class_find_property(oclass:PGObjectClass; property_name:Pgchar):PGParamSpec; cdecl; external gobjectlib; function g_object_class_list_properties(oclass:PGObjectClass; n_properties:Pguint):PPGParamSpec; cdecl; external gobjectlib; +{$IFNDEF KYLIX} +function g_object_new(object_type:GType; first_property_name:Pgchar; args:array of const):gpointer; cdecl; overload; external gobjectlib; +function g_object_new(object_type:GType; first_property_name:Pgchar):gpointer; cdecl; overload; varargs; external gobjectlib; +function g_object_newv(object_type:GType; n_parameters:guint; parameters:PGParameter):gpointer; cdecl; external gobjectlib; +function g_object_new_valist(object_type:GType; first_property_name:Pgchar; var_args: array of const):PGObject; cdecl; external gobjectlib; +procedure g_object_set(anObject:gpointer; first_property_name:Pgchar; args:array of const); cdecl; overload; external gobjectlib; +procedure g_object_set(anObject:gpointer; first_property_name:Pgchar); cdecl; overload; varargs; external gobjectlib; +procedure g_object_get(anObject:gpointer; first_property_name:Pgchar; args:array of const); cdecl; overload; external gobjectlib; +procedure g_object_get(anObject:gpointer; first_property_name:Pgchar); cdecl; overload; varargs; external gobjectlib; +function g_object_connect(anObject:gpointer; signal_spec:Pgchar; args:array of const):gpointer; cdecl; overload; external gobjectlib; +function g_object_connect(anObject:gpointer; signal_spec:Pgchar):gpointer; cdecl; overload; varargs; external gobjectlib; +procedure g_object_disconnect(anObject:gpointer; signal_spec:Pgchar; args:array of const); cdecl; overload; external gobjectlib; +procedure g_object_disconnect(anObject:gpointer; signal_spec:Pgchar); cdecl; overload; varargs; external gobjectlib; +procedure g_object_set_valist(anObject:PGObject; first_property_name:Pgchar; var_args: array of const); cdecl; external gobjectlib; +procedure g_object_get_valist(anObject:PGObject; first_property_name:Pgchar; var_args: array of const); cdecl; external gobjectlib; +{$ELSE} function g_object_new(object_type:GType; first_property_name:Pgchar):gpointer; varargs; cdecl; external gobjectlib; function g_object_newv(object_type:GType; n_parameters:guint; parameters:PGParameter):gpointer; varargs; cdecl; external gobjectlib; function g_object_new_valist(object_type:GType; first_property_name:Pgchar):PGObject; varargs; cdecl; external gobjectlib; @@ -73,6 +89,7 @@ function g_object_connect(anObject:gpointer; signal_spec:Pgchar):gpointer; varar procedure g_object_disconnect(anObject:gpointer; signal_spec:Pgchar); varargs; cdecl; external gobjectlib; procedure g_object_set_valist(anObject:PGObject; first_property_name:Pgchar); varargs; cdecl; external gobjectlib; procedure g_object_get_valist(anObject:PGObject; first_property_name:Pgchar); varargs; cdecl; external gobjectlib; +{$ENDIF} procedure g_object_set_property(anObject:PGObject; property_name:Pgchar; value:PGValue); cdecl; external gobjectlib; procedure g_object_get_property(anObject:PGObject; property_name:Pgchar; value:PGValue); cdecl; external gobjectlib; procedure g_object_freeze_notify(anObject:PGObject); cdecl; external gobjectlib; diff --git a/packages/extra/gtk2/glib/grel.inc b/packages/extra/gtk2/glib/grel.inc index 39bf87b9ae..9c8c394fb2 100644 --- a/packages/extra/gtk2/glib/grel.inc +++ b/packages/extra/gtk2/glib/grel.inc @@ -40,7 +40,12 @@ procedure g_relation_index(relation:PGRelation; field:gint; hash_func:TGHashFunc; key_equal_func:TGEqualFunc);cdecl;external gliblib name 'g_relation_index'; +{$IFNDEF KYLIX} + procedure g_relation_insert(relation:PGRelation; args:array of const);cdecl;overload;external gliblib name 'g_relation_insert'; + procedure g_relation_insert(relation:PGRelation);cdecl;overload;varargs;external gliblib name 'g_relation_insert'; +{$ELSE} procedure g_relation_insert(relation:PGRelation);varargs;cdecl;external gliblib name 'g_relation_insert'; +{$ENDIF} function g_relation_delete(relation:PGRelation; key:gconstpointer; field:gint):gint;cdecl;external gliblib name 'g_relation_delete'; @@ -48,7 +53,12 @@ function g_relation_count(relation:PGRelation; key:gconstpointer; field:gint):gint;cdecl;external gliblib name 'g_relation_count'; +{$IFNDEF KYLIX} + function g_relation_exists(relation:PGRelation; args:array of const):gboolean;cdecl;overload;external gliblib name 'g_relation_exists'; + function g_relation_exists(relation:PGRelation):gboolean;cdecl;overload;varargs;external gliblib name 'g_relation_exists'; +{$ELSE} function g_relation_exists(relation:PGRelation):gboolean;varargs;cdecl;external gliblib name 'g_relation_exists'; +{$ENDIF} procedure g_relation_print(relation:PGRelation);cdecl;external gliblib name 'g_relation_print'; diff --git a/packages/extra/gtk2/glib/gscanner.inc b/packages/extra/gtk2/glib/gscanner.inc index 92af81d7f3..3736589469 100644 --- a/packages/extra/gtk2/glib/gscanner.inc +++ b/packages/extra/gtk2/glib/gscanner.inc @@ -298,8 +298,16 @@ _message:Pgchar; is_error:gint);cdecl;external gliblib name 'g_scanner_unexp_token'; +{$IFNDEF KYLIX} + procedure g_scanner_error(scanner:PGScanner; format:Pgchar; args:array of const);cdecl;overload;external gliblib name 'g_scanner_error'; + procedure g_scanner_error(scanner:PGScanner; format:Pgchar);cdecl;overload;varargs;external gliblib name 'g_scanner_error'; + + procedure g_scanner_warn(scanner:PGScanner; format:Pgchar; args:array of const);cdecl;overload;external gliblib name 'g_scanner_warn'; + procedure g_scanner_warn(scanner:PGScanner; format:Pgchar);cdecl;overload;varargs;external gliblib name 'g_scanner_warn'; +{$ELSE} procedure g_scanner_error(scanner:PGScanner; format:Pgchar);varargs;cdecl;external gliblib name 'g_scanner_error'; procedure g_scanner_warn(scanner:PGScanner; format:Pgchar);varargs;cdecl;external gliblib name 'g_scanner_warn'; +{$ENDIF} {$ifndef G_DISABLE_DEPRECATED} // { keep downward source compatibility } diff --git a/packages/extra/gtk2/glib/gsignal.inc b/packages/extra/gtk2/glib/gsignal.inc index 9a631be9db..949bf4651a 100644 --- a/packages/extra/gtk2/glib/gsignal.inc +++ b/packages/extra/gtk2/glib/gsignal.inc @@ -74,14 +74,31 @@ const function g_signal_newv(signal_name:Pgchar; itype:GType; signal_flags:TGSignalFlags; class_closure:PGClosure; accumulator:TGSignalAccumulator; accu_data:gpointer; c_marshaller:TGSignalCMarshaller; return_type:GType; n_params:guint; param_types:PGType):guint; cdecl; external gobjectlib; +{$IFNDEF KYLIX} +function g_signal_new_valist(signal_name:Pgchar; itype:GType; signal_flags:TGSignalFlags; class_closure:PGClosure; accumulator:TGSignalAccumulator; + accu_data:gpointer; c_marshaller:TGSignalCMarshaller; return_type:GType; n_params:guint; args: array of const):guint; cdecl; external gobjectlib; +function g_signal_new(signal_name:Pgchar; itype:GType; signal_flags:TGSignalFlags; class_offset:guint; accumulator:TGSignalAccumulator; + accu_data:gpointer; c_marshaller:TGSignalCMarshaller; return_type:GType; n_params:guint; args:array of const):guint; cdecl; overload; external gobjectlib; +function g_signal_new(signal_name:Pgchar; itype:GType; signal_flags:TGSignalFlags; class_offset:guint; accumulator:TGSignalAccumulator; + accu_data:gpointer; c_marshaller:TGSignalCMarshaller; return_type:GType; n_params:guint):guint; cdecl; overload; varargs; external gobjectlib; +{$ELSE} function g_signal_new_valist(signal_name:Pgchar; itype:GType; signal_flags:TGSignalFlags; class_closure:PGClosure; accumulator:TGSignalAccumulator; accu_data:gpointer; c_marshaller:TGSignalCMarshaller; return_type:GType; n_params:guint):guint; varargs; cdecl; external gobjectlib; function g_signal_new(signal_name:Pgchar; itype:GType; signal_flags:TGSignalFlags; class_offset:guint; accumulator:TGSignalAccumulator; accu_data:gpointer; c_marshaller:TGSignalCMarshaller; return_type:GType; n_params:guint):guint; varargs; cdecl; external gobjectlib; +{$ENDIF} procedure g_signal_emitv(instance_and_params:PGValue; signal_id:guint; detail:TGQuark; return_value:PGValue); cdecl; external gobjectlib; +{$IFNDEF KYLIX} +procedure g_signal_emit_valist(instance:gpointer; signal_id:guint; detail:TGQuark; var_args: array of const); cdecl; external gobjectlib; +procedure g_signal_emit(instance:gpointer; signal_id:guint; detail:TGQuark; args:array of const); cdecl; overload; external gobjectlib; +procedure g_signal_emit(instance:gpointer; signal_id:guint; detail:TGQuark); cdecl; overload; varargs; external gobjectlib; +procedure g_signal_emit_by_name(instance:gpointer; detailed_signal:Pgchar; args:array of const); cdecl; overload; external gobjectlib; +procedure g_signal_emit_by_name(instance:gpointer; detailed_signal:Pgchar); cdecl; overload; varargs; external gobjectlib; +{$ELSE} procedure g_signal_emit_valist(instance:gpointer; signal_id:guint; detail:TGQuark); varargs; cdecl; external gobjectlib; procedure g_signal_emit(instance:gpointer; signal_id:guint; detail:TGQuark); varargs; cdecl; external gobjectlib; procedure g_signal_emit_by_name(instance:gpointer; detailed_signal:Pgchar); varargs; cdecl; external gobjectlib; +{$ENDIF} function g_signal_lookup(name:Pgchar; itype:GType):guint; cdecl; external gobjectlib; function g_signal_name(signal_id:guint):Pgchar; cdecl; external gobjectlib; procedure g_signal_query(signal_id:guint; query:PGSignalQuery); cdecl; external gobjectlib; diff --git a/packages/extra/gtk2/glib/gstrfuncs.inc b/packages/extra/gtk2/glib/gstrfuncs.inc index 3892447896..4b14cbcd6b 100644 --- a/packages/extra/gtk2/glib/gstrfuncs.inc +++ b/packages/extra/gtk2/glib/gstrfuncs.inc @@ -102,12 +102,26 @@ function g_strup(_string:Pgchar):Pgchar; cdecl; external gliblib; ought to be freed with g_free from the caller at some point. } function g_strdup(str:Pgchar):Pgchar; cdecl; external gliblib; +{$IFNDEF KYLIX} +function g_strdup_printf(format:Pgchar; args:array of const):Pgchar; cdecl; overload; external gliblib; +function g_strdup_printf(format:Pgchar):Pgchar; cdecl; overload; varargs; external gliblib; +function g_strdup_vprintf(format:Pgchar; args: array of const):Pgchar; cdecl; external gliblib; +{$ELSE} function g_strdup_printf(format:Pgchar):Pgchar; varargs; cdecl; external gliblib; function g_strdup_vprintf(format:Pgchar):Pgchar; varargs; cdecl; external gliblib; +{$ENDIF} function g_strndup(str:Pgchar; n:gsize):Pgchar; cdecl; external gliblib; function g_strnfill(length:gsize; fill_char:gchar):Pgchar; cdecl; external gliblib; +{$IFNDEF KYLIX} +function g_strconcat(string1:Pgchar; args:array of const):Pgchar; cdecl; overload; external gliblib; +function g_strconcat(string1:Pgchar):Pgchar; cdecl; overload; varargs; external gliblib; +{ NULL terminated } +function g_strjoin(separator:Pgchar; args:array of const):Pgchar; cdecl; overload; external gliblib; +function g_strjoin(separator:Pgchar):Pgchar; cdecl; overload; varargs; external gliblib; +{$ELSE} function g_strconcat(string1:Pgchar):Pgchar; varargs; cdecl; external gliblib; function g_strjoin(separator:Pgchar):Pgchar; varargs; cdecl; external gliblib; +{$ENDIF} { NULL terminated } { Make a copy of a string interpreting C string -style escape sequences. Inverse of g_strescape. The recognized sequences are \b diff --git a/packages/extra/gtk2/glib/gstring.inc b/packages/extra/gtk2/glib/gstring.inc index 5810afcd26..174baa45e0 100644 --- a/packages/extra/gtk2/glib/gstring.inc +++ b/packages/extra/gtk2/glib/gstring.inc @@ -75,8 +75,16 @@ function g_string_ascii_up(_string:PGString):PGString;cdecl;external gliblib name 'g_string_ascii_up'; +{$IFNDEF KYLIX} + procedure g_string_printf(_string:PGString; format:Pgchar; args:array of const);cdecl;overload;external gliblib name 'g_string_printf'; + procedure g_string_printf(_string:PGString; format:Pgchar);cdecl;overload;varargs;external gliblib name 'g_string_printf'; + + procedure g_string_append_printf(_string:PGString; format:Pgchar; args:array of const);cdecl;overload;external gliblib name 'g_string_append_printf'; + procedure g_string_append_printf(_string:PGString; format:Pgchar);cdecl;varargs;overload;external gliblib name 'g_string_append_printf'; +{$ELSE} procedure g_string_printf(_string:PGString; format:Pgchar);varargs;cdecl;external gliblib name 'g_string_printf'; procedure g_string_append_printf(_string:PGString; format:Pgchar);varargs;cdecl;external gliblib name 'g_string_append_printf'; +{$ENDIF} {DEPRECATED functions} diff --git a/packages/extra/gtk2/glib/gutils.inc b/packages/extra/gtk2/glib/gutils.inc index 30a71008f6..406b1b7ab0 100644 --- a/packages/extra/gtk2/glib/gutils.inc +++ b/packages/extra/gtk2/glib/gutils.inc @@ -52,8 +52,14 @@ function g_parse_debug_string(_string:Pgchar; keys:PGDebugKey; nkeys:guint):guint;cdecl;external gliblib name 'g_parse_debug_string'; +{$IFNDEF KYLIX} + function g_snprintf(_string:Pgchar; n:gulong; format:Pgchar; args:array of const):gint;cdecl;overload;external gliblib name 'g_snprintf'; + function g_snprintf(_string:Pgchar; n:gulong; format:Pgchar):gint;cdecl;overload;varargs;external gliblib name 'g_snprintf'; + function g_vsnprintf(_string:Pgchar; n:gulong; format:Pgchar; args:array of const):gint;cdecl;external gliblib name 'g_vsnprintf'; +{$ELSE} function g_snprintf(_string:Pgchar; n:gulong; format:Pgchar):gint;varargs;cdecl;external gliblib name 'g_snprintf'; function g_vsnprintf(_string:Pgchar; n:gulong; format:Pgchar):gint;varargs;cdecl;external gliblib name 'g_vsnprintf'; +{$ENDIF} { Check if a file name is an absolute path } diff --git a/packages/extra/gtk2/gtk+/gtk/gtkbindings.inc b/packages/extra/gtk2/gtk+/gtk/gtkbindings.inc index 4c96177b03..d8895db0e4 100644 --- a/packages/extra/gtk2/gtk+/gtk/gtkbindings.inc +++ b/packages/extra/gtk2/gtk+/gtk/gtkbindings.inc @@ -85,7 +85,13 @@ function gtk_bindings_activate(anObject:PGtkObject; keyval:guint; modifiers:TGdk function gtk_binding_set_activate(binding_set:PGtkBindingSet; keyval:guint; modifiers:TGdkModifierType; anObject:PGtkObject):gboolean; cdecl; external gtklib; procedure gtk_binding_entry_clear(binding_set:PGtkBindingSet; keyval:guint; modifiers:TGdkModifierType); cdecl; external gtklib; +{$IFNDEF KYLIX} +procedure gtk_binding_entry_add_signal(binding_set:PGtkBindingSet; keyval:guint; modifiers:TGdkModifierType; signal_name:Pgchar; n_args:guint; + args:array of const); cdecl; overload; external gtklib; +procedure gtk_binding_entry_add_signal(binding_set:PGtkBindingSet; keyval:guint; modifiers:TGdkModifierType; signal_name:Pgchar; n_args:guint); cdecl; overload; varargs; external gtklib; +{$ELSE} procedure gtk_binding_entry_add_signal(binding_set:PGtkBindingSet; keyval:guint; modifiers:TGdkModifierType; signal_name:Pgchar; n_args:guint); varargs; cdecl; external gtklib; +{$ENDIF} procedure gtk_binding_set_add_path(binding_set:PGtkBindingSet; path_type:TGtkPathType; path_pattern:Pgchar; priority:TGtkPathPriorityType); cdecl; external gtklib; { Non-public methods } procedure gtk_binding_entry_remove(binding_set:PGtkBindingSet; keyval:guint; modifiers:TGdkModifierType); cdecl; external gtklib; diff --git a/packages/extra/gtk2/gtk+/gtk/gtkcelllayout.inc b/packages/extra/gtk2/gtk+/gtk/gtkcelllayout.inc index 6c83ca2cc9..e1d5bfaae0 100644 --- a/packages/extra/gtk2/gtk+/gtk/gtkcelllayout.inc +++ b/packages/extra/gtk2/gtk+/gtk/gtkcelllayout.inc @@ -40,8 +40,10 @@ procedure gtk_cell_layout_pack_end(cell_layout:PGtkCellLayout; cell:PGtkCellRend procedure gtk_cell_layout_clear(cell_layout:PGtkCellLayout);cdecl;external gtklib name 'gtk_cell_layout_clear'; +procedure gtk_cell_layout_set_attributes(cell_layout:PGtkCellLayout; cell:PGtkCellRenderer; args:array of const);cdecl;overload;external gtklib name 'gtk_cell_layout_set_attributes'; procedure gtk_cell_layout_set_attributes(cell_layout:PGtkCellLayout; cell:PGtkCellRenderer);cdecl;overload;varargs;external gtklib name 'gtk_cell_layout_set_attributes'; + procedure gtk_cell_layout_add_attribute(cell_layout:PGtkCellLayout; cell:PGtkCellRenderer; attribute:Pgchar; column:gint);cdecl;external gtklib name 'gtk_cell_layout_add_attribute'; procedure gtk_cell_layout_set_cell_data_func(cell_layout:PGtkCellLayout; cell:PGtkCellRenderer; func:TGtkCellLayoutDataFunc; func_data:gpointer; destroy:TGDestroyNotify);cdecl;external gtklib name 'gtk_cell_layout_set_cell_data_func'; diff --git a/packages/extra/gtk2/gtk+/gtk/gtkclist.inc b/packages/extra/gtk2/gtk+/gtk/gtkclist.inc index eae52819d9..05bdc967ad 100644 --- a/packages/extra/gtk2/gtk+/gtk/gtkclist.inc +++ b/packages/extra/gtk2/gtk+/gtk/gtkclist.inc @@ -337,7 +337,11 @@ procedure set_selectable(var a : TGtkCListRow; __selectable : guint); function gtk_clist_get_type:TGtkType; cdecl; external gtklib; { create a new GtkCList } function gtk_clist_new(columns:gint):PGtkWidget; cdecl; external gtklib; +{$IFNDEF KYLIX} +function gtk_clist_new_with_titles(columns:gint; titles:array of Pgchar):PGtkWidget; cdecl; external gtklib; +{$ELSE} function gtk_clist_new_with_titles(columns:gint):PGtkWidget; varargs; cdecl; external gtklib; +{$ENDIF} { set adjustments of clist } procedure gtk_clist_set_hadjustment(clist:PGtkCList; adjustment:PGtkAdjustment); cdecl; external gtklib; procedure gtk_clist_set_vadjustment(clist:PGtkCList; adjustment:PGtkAdjustment); cdecl; external gtklib; @@ -450,12 +454,21 @@ function gtk_clist_get_selectable(clist:PGtkCList; row:gint):gboolean; cdecl; ex { prepend/append returns the index of the row you just added, making it easier to append and modify a row } +{$IFNDEF KYLIX} +function gtk_clist_prepend(clist:PGtkCList; text:PPgchar):gint; cdecl; external gtklib; +function gtk_clist_append(clist:PGtkCList; text:PPgchar):gint; cdecl; external gtklib; +{$ELSE} function gtk_clist_prepend(clist:PGtkCList):gint; varargs; cdecl; external gtklib; function gtk_clist_append(clist:PGtkCList):gint; varargs; cdecl; external gtklib; +{$ENDIF} { inserts a row at index row and returns the row where it was actually inserted (may be different from "row" in auto_sort mode) } +{$IFNDEF KYLIX} +function gtk_clist_insert(clist:PGtkCList; row:gint; text:PPgchar):gint; cdecl; external gtklib; +{$ELSE} function gtk_clist_insert(clist:PGtkCList; row:gint):gint; varargs; cdecl; external gtklib; +{$ENDIF} { removes row at index row } procedure gtk_clist_remove(clist:PGtkCList; row:gint); cdecl; external gtklib; { sets a arbitrary data pointer for a given row } diff --git a/packages/extra/gtk2/gtk+/gtk/gtkcontainer.inc b/packages/extra/gtk2/gtk+/gtk/gtkcontainer.inc index 5482f45880..49e29dbb79 100644 --- a/packages/extra/gtk2/gtk+/gtk/gtkcontainer.inc +++ b/packages/extra/gtk2/gtk+/gtk/gtkcontainer.inc @@ -107,11 +107,22 @@ function gtk_container_child_type(container:PGtkContainer):TGtkType; cdecl; exte procedure gtk_container_class_install_child_property(cclass:PGtkContainerClass; property_id:guint; pspec:PGParamSpec); cdecl; external gtklib; function gtk_container_class_find_child_property(cclass:PGObjectClass; property_name:Pgchar):PGParamSpec; cdecl; external gtklib; function gtk_container_class_list_child_properties(cclass:PGObjectClass; n_properties:Pguint):PPGParamSpec; cdecl; external gtklib; +{$IFNDEF KYLIX} +procedure gtk_container_add_with_properties(container:PGtkContainer; widget:PGtkWidget; first_prop_name:Pgchar; args:array of const); cdecl; overload; external gtklib; +procedure gtk_container_add_with_properties(container:PGtkContainer; widget:PGtkWidget; first_prop_name:Pgchar); cdecl; overload; varargs; external gtklib; +procedure gtk_container_child_set(container:PGtkContainer; child:PGtkWidget; first_prop_name:Pgchar; args:array of const); cdecl; overload; external gtklib; +procedure gtk_container_child_set(container:PGtkContainer; child:PGtkWidget; first_prop_name:Pgchar); cdecl; overload; varargs; external gtklib; +procedure gtk_container_child_get(container:PGtkContainer; child:PGtkWidget; first_prop_name:Pgchar; args:array of const); cdecl; overload; external gtklib; +procedure gtk_container_child_get(container:PGtkContainer; child:PGtkWidget; first_prop_name:Pgchar); overload; cdecl; varargs; external gtklib; +procedure gtk_container_child_set_valist(container:PGtkContainer; child:PGtkWidget; first_property_name:Pgchar; var_args: array of const); cdecl; external gtklib; +procedure gtk_container_child_get_valist(container:PGtkContainer; child:PGtkWidget; first_property_name:Pgchar; var_args: array of const); cdecl; external gtklib; +{$ELSE} procedure gtk_container_add_with_properties(container:PGtkContainer; widget:PGtkWidget; first_prop_name:Pgchar); varargs; cdecl; external gtklib; procedure gtk_container_child_set(container:PGtkContainer; child:PGtkWidget; first_prop_name:Pgchar); varargs; cdecl; external gtklib; procedure gtk_container_child_get(container:PGtkContainer; child:PGtkWidget; first_prop_name:Pgchar); varargs; cdecl; external gtklib; procedure gtk_container_child_set_valist(container:PGtkContainer; child:PGtkWidget; first_property_name:Pgchar); varargs; cdecl; external gtklib; procedure gtk_container_child_get_valist(container:PGtkContainer; child:PGtkWidget; first_property_name:Pgchar); varargs; cdecl; external gtklib; +{$ENDIF} procedure gtk_container_child_set_property(container:PGtkContainer; child:PGtkWidget; property_name:Pgchar; value:PGValue); cdecl; external gtklib; procedure gtk_container_child_get_property(container:PGtkContainer; child:PGtkWidget; property_name:Pgchar; value:PGValue); cdecl; external gtklib; procedure GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID(anObject: pointer; property_id: guint; pspec : pointer); diff --git a/packages/extra/gtk2/gtk+/gtk/gtkctree.inc b/packages/extra/gtk2/gtk+/gtk/gtkctree.inc index 8786c705c5..9e3a8682d1 100644 --- a/packages/extra/gtk2/gtk+/gtk/gtkctree.inc +++ b/packages/extra/gtk2/gtk+/gtk/gtkctree.inc @@ -135,7 +135,11 @@ procedure set_expanded(var a : TGtkCTreeRow; __expanded : guint); overload; } function gtk_ctree_get_type:TGtkType; cdecl; external gtklib; +{$IFNDEF KYLIX} +function gtk_ctree_new_with_titles(columns:gint; tree_column:gint; titles:array of Pgchar):PGtkWidget; cdecl; external gtklib; +{$ELSE} function gtk_ctree_new_with_titles(columns:gint; tree_column:gint):PGtkWidget; varargs; cdecl; external gtklib; +{$ENDIF} function gtk_ctree_new(columns:gint; tree_column:gint):PGtkWidget; cdecl; external gtklib; function gtk_ctree_insert_node(ctree:PGtkCTree; parent:PGtkCTreeNode; sibling:PGtkCTreeNode; text:array of Pgchar; spacing:guint8; pixmap_closed:PGdkPixmap; mask_closed:PGdkBitmap; pixmap_opened:PGdkPixmap; mask_opened:PGdkBitmap; is_leaf:gboolean; diff --git a/packages/extra/gtk2/gtk+/gtk/gtkcurve.inc b/packages/extra/gtk2/gtk+/gtk/gtkcurve.inc index 1843f8ad96..46d7a439d6 100644 --- a/packages/extra/gtk2/gtk+/gtk/gtkcurve.inc +++ b/packages/extra/gtk2/gtk+/gtk/gtkcurve.inc @@ -73,8 +73,13 @@ function gtk_curve_new:PGtkWidget; cdecl; external gtklib; procedure gtk_curve_reset(curve:PGtkCurve); cdecl; external gtklib; procedure gtk_curve_set_gamma(curve:PGtkCurve; gamma:gfloat); cdecl; external gtklib; procedure gtk_curve_set_range(curve:PGtkCurve; min_x:gfloat; max_x:gfloat; min_y:gfloat; max_y:gfloat); cdecl; external gtklib; +{$IFNDEF KYLIX} +procedure gtk_curve_get_vector(curve:PGtkCurve; veclen:longint; vector:array of gfloat); cdecl; external gtklib; +procedure gtk_curve_set_vector(curve:PGtkCurve; veclen:longint; vector:array of gfloat); cdecl; external gtklib; +{$ELSE} procedure gtk_curve_get_vector(curve:PGtkCurve; veclen:longint); varargs; cdecl; external gtklib; procedure gtk_curve_set_vector(curve:PGtkCurve; veclen:longint); varargs; cdecl; external gtklib; +{$ENDIF} procedure gtk_curve_set_curve_type(curve:PGtkCurve; _type:TGtkCurveType); cdecl; external gtklib; {$ENDIF read_interface_rest} diff --git a/packages/extra/gtk2/gtk+/gtk/gtkdialog.inc b/packages/extra/gtk2/gtk+/gtk/gtkdialog.inc index 7c4e8d7198..6aec2d3104 100644 --- a/packages/extra/gtk2/gtk+/gtk/gtkdialog.inc +++ b/packages/extra/gtk2/gtk+/gtk/gtkdialog.inc @@ -93,10 +93,20 @@ function GTK_DIALOG_GET_CLASS(obj: pointer) : PGtkDialogClass; function gtk_dialog_get_type:TGtkType; cdecl; external gtklib; function gtk_dialog_new:PGtkWidget; cdecl; external gtklib; +{$IFNDEF KYLIX} +function gtk_dialog_new_with_buttons(title:Pgchar; parent:PGtkWindow; flags:TGtkDialogFlags; first_button_text:Pgchar; args:array of const):PGtkWidget; cdecl; overload; external gtklib; +function gtk_dialog_new_with_buttons(title:Pgchar; parent:PGtkWindow; flags:TGtkDialogFlags; first_button_text:Pgchar):PGtkWidget; cdecl; overload; varargs; external gtklib; +{$ELSE} function gtk_dialog_new_with_buttons(title:Pgchar; parent:PGtkWindow; flags:TGtkDialogFlags; first_button_text:Pgchar):PGtkWidget; varargs; cdecl; external gtklib; +{$ENDIF} procedure gtk_dialog_add_action_widget(dialog:PGtkDialog; child:PGtkWidget; response_id:gint); cdecl; external gtklib; function gtk_dialog_add_button(dialog:PGtkDialog; button_text:Pgchar; response_id:gint):PGtkWidget; cdecl; external gtklib; +{$IFNDEF KYLIX} +procedure gtk_dialog_add_buttons(dialog:PGtkDialog; first_button_text:Pgchar; args:array of const); overload; cdecl; external gtklib; +procedure gtk_dialog_add_buttons(dialog:PGtkDialog; first_button_text:Pgchar); cdecl; overload; varargs; external gtklib; +{$ELSE} procedure gtk_dialog_add_buttons(dialog:PGtkDialog; first_button_text:Pgchar); varargs; cdecl; external gtklib; +{$ENDIF} procedure gtk_dialog_set_response_sensitive(dialog:PGtkDialog; response_id:gint; setting:gboolean); cdecl; external gtklib; procedure gtk_dialog_set_default_response(dialog:PGtkDialog; response_id:gint); cdecl; external gtklib; procedure gtk_dialog_set_has_separator(dialog:PGtkDialog; setting:gboolean); cdecl; external gtklib; diff --git a/packages/extra/gtk2/gtk+/gtk/gtkfilechooserdialog.inc b/packages/extra/gtk2/gtk+/gtk/gtkfilechooserdialog.inc index c4a7bf9eec..ca5d0aac54 100644 --- a/packages/extra/gtk2/gtk+/gtk/gtkfilechooserdialog.inc +++ b/packages/extra/gtk2/gtk+/gtk/gtkfilechooserdialog.inc @@ -31,9 +31,12 @@ function GTK_FILE_CHOOSER_DIALOG_GET_CLASS(obj : pointer) : PGtkFileChooserDialo function gtk_file_chooser_dialog_get_type:GType;cdecl;external gtklib name 'gtk_file_chooser_dialog_get_type'; +function gtk_file_chooser_dialog_new(title:Pgchar; parent:PGtkWindow; action:TGtkFileChooserAction; first_button_text:Pgchar; args:array of const):PGtkWidget;cdecl;overload;external gtklib name 'gtk_file_chooser_dialog_new'; function gtk_file_chooser_dialog_new(title:Pgchar; parent:PGtkWindow; action:TGtkFileChooserAction; first_button_text:Pgchar):PGtkWidget;cdecl;overload;varargs;external gtklib name 'gtk_file_chooser_dialog_new'; -function gtk_file_chooser_dialog_new_with_backend(title:Pgchar; parent:PGtkWindow; action:TGtkFileChooserAction; backend:Pgchar; first_button_text:Pgchar):PGtkWidget;cdecl;overload;varargs;external gtklib name 'gtk_file_chooser_dialog_new_with_backend'; +function gtk_file_chooser_dialog_new_with_backend(title:Pgchar; parent:PGtkWindow; action:TGtkFileChooserAction; backend:Pgchar; first_button_text:Pgchar; + args:array of const):PGtkWidget;cdecl;overload;external gtklib name 'gtk_file_chooser_dialog_new_with_backend'; +function gtk_file_chooser_dialog_new_with_backend(title:Pgchar; parent:PGtkWindow; action:TGtkFileChooserAction; backend:Pgchar; first_button_text:Pgchar):PGtkWidget;cdecl;overload;external gtklib name 'gtk_file_chooser_dialog_new_with_backend'; {$endif} {read_interface_rest} diff --git a/packages/extra/gtk2/gtk+/gtk/gtkliststore.inc b/packages/extra/gtk2/gtk+/gtk/gtkliststore.inc index 65699a230e..121c9bd67c 100644 --- a/packages/extra/gtk2/gtk+/gtk/gtkliststore.inc +++ b/packages/extra/gtk2/gtk+/gtk/gtkliststore.inc @@ -54,13 +54,24 @@ function GTK_LIST_STORE_GET_CLASS(obj: pointer) : PGtkListStoreClass; function columns_dirty(var a : TGtkListStore) : guint; overload; procedure set_columns_dirty(var a : TGtkListStore; __columns_dirty : guint); overload; function gtk_list_store_get_type:TGtkType; cdecl; external gtklib; +{$IFNDEF KYLIX} +function gtk_list_store_new(n_columns:gint; args:array of const):PGtkListStore; cdecl; overload; external gtklib; +function gtk_list_store_new(n_columns:gint):PGtkListStore; cdecl; overload; varargs; external gtklib; +{$ELSE} function gtk_list_store_new(n_columns:gint):PGtkListStore; varargs; cdecl; external gtklib; +{$ENDIF} function gtk_list_store_newv(n_columns:gint; types:PGType):PGtkListStore; cdecl; external gtklib; procedure gtk_list_store_set_column_types(list_store:PGtkListStore; n_columns:gint; types:PGType); cdecl; external gtklib; { NOTE: use gtk_tree_model_get to get values from a GtkListStore } procedure gtk_list_store_set_value(list_store:PGtkListStore; iter:PGtkTreeIter; column:gint; value:PGValue); cdecl; external gtklib; +{$IFNDEF KYLIX} +procedure gtk_list_store_set(list_store:PGtkListStore; iter:PGtkTreeIter; args:array of const); cdecl; overload; external gtklib; +procedure gtk_list_store_set(list_store:PGtkListStore; iter:PGtkTreeIter); cdecl; overload; varargs; external gtklib; +procedure gtk_list_store_set_valist(list_store:PGtkListStore; iter:PGtkTreeIter; var_args:array of const); cdecl; external gtklib; +{$ELSE} procedure gtk_list_store_set(list_store:PGtkListStore; iter:PGtkTreeIter); varargs; cdecl; external gtklib; procedure gtk_list_store_set_valist(list_store:PGtkListStore; iter:PGtkTreeIter); varargs; cdecl; external gtklib; +{$ENDIF} procedure gtk_list_store_remove(list_store:PGtkListStore; iter:PGtkTreeIter); cdecl; external gtklib; procedure gtk_list_store_insert(list_store:PGtkListStore; iter:PGtkTreeIter; position:gint); cdecl; external gtklib; procedure gtk_list_store_insert_before(list_store:PGtkListStore; iter:PGtkTreeIter; sibling:PGtkTreeIter); cdecl; external gtklib; diff --git a/packages/extra/gtk2/gtk+/gtk/gtkmessagedialog.inc b/packages/extra/gtk2/gtk+/gtk/gtkmessagedialog.inc index 87917ee397..5ec958b2d0 100644 --- a/packages/extra/gtk2/gtk+/gtk/gtkmessagedialog.inc +++ b/packages/extra/gtk2/gtk+/gtk/gtkmessagedialog.inc @@ -57,9 +57,18 @@ function GTK_IS_MESSAGE_DIALOG_CLASS(klass: pointer) : boolean; function GTK_MESSAGE_DIALOG_GET_CLASS(obj: pointer) : PGtkMessageDialogClass; function gtk_message_dialog_get_type:TGtkType; cdecl; external gtklib; +{$IFNDEF KYLIX} +function gtk_message_dialog_new(parent:PGtkWindow; flags:TGtkDialogFlags; + _type:TGtkMessageType; buttons:TGtkButtonsType; message_format:Pgchar; + args:array of const):PGtkWidget; cdecl; overload; external gtklib; +function gtk_message_dialog_new(parent:PGtkWindow; flags:TGtkDialogFlags; + _type:TGtkMessageType; buttons:TGtkButtonsType; + message_format:Pgchar):PGtkWidget; cdecl; overload; varargs; external gtklib; +{$ELSE} function gtk_message_dialog_new(parent:PGtkWindow; flags:TGtkDialogFlags; _type:TGtkMessageType; buttons:TGtkButtonsType; message_format:Pgchar):PGtkWidget; varargs; cdecl; external gtklib; +{$ENDIF} {$ENDIF read_interface_rest} //------------------------------------------------------------------------------ diff --git a/packages/extra/gtk2/gtk+/gtk/gtkobject.inc b/packages/extra/gtk2/gtk+/gtk/gtkobject.inc index d20d977174..0187a31bf8 100644 --- a/packages/extra/gtk2/gtk+/gtk/gtkobject.inc +++ b/packages/extra/gtk2/gtk+/gtk/gtkobject.inc @@ -110,6 +110,7 @@ procedure GTK_OBJECT_UNSET_FLAGS(obj: pointer; flag: guint32); { Application-level methods } function gtk_object_get_type:TGtkType; cdecl; external gtklib; +function gtk_object_new(_type:TGtkType; first_property_name:Pgchar; args:array of const):PGtkObject; cdecl; overload; external gtklib; function gtk_object_new(_type:TGtkType; first_property_name:Pgchar):PGtkObject; cdecl; overload; varargs; external gtklib; procedure gtk_object_sink(anObject:PGtkObject); cdecl; external gtklib; procedure gtk_object_destroy(anObject:PGtkObject); cdecl; external gtklib; @@ -158,7 +159,9 @@ function gtk_object_data_force_id(_string:Pgchar):TGQuark; const GTK_ARG_READWRITE = GTK_ARG_READABLE or GTK_ARG_WRITABLE; +procedure gtk_object_get(anObject:PGtkObject; first_property_name:Pgchar; args:array of const); cdecl; overload; external gtklib; procedure gtk_object_get(anObject:PGtkObject; first_property_name:Pgchar); cdecl; overload; varargs; external gtklib; +procedure gtk_object_set(anObject:PGtkObject; first_property_name:Pgchar; args:array of const); cdecl; overload; external gtklib; procedure gtk_object_set(anObject:PGtkObject; first_property_name:Pgchar); cdecl; overload; varargs; external gtklib; procedure gtk_object_add_arg_type(arg_name:Pgchar; arg_type:TGtkType; arg_flags:guint; arg_id:guint); cdecl; external gtklib; {$endif} diff --git a/packages/extra/gtk2/gtk+/gtk/gtksignal.inc b/packages/extra/gtk2/gtk+/gtk/gtksignal.inc index 803da857c3..330afa66ae 100644 --- a/packages/extra/gtk2/gtk+/gtk/gtksignal.inc +++ b/packages/extra/gtk2/gtk+/gtk/gtksignal.inc @@ -51,16 +51,30 @@ function gtk_signal_handler_pending_by_func(anObject:PGtkObject; { --- compat functions --- } function gtk_signal_newv(name:Pgchar; signal_flags:TGtkSignalRunType; object_type:TGtkType; function_offset:guint; marshaller:TGtkSignalMarshaller; return_val:TGtkType; n_args:guint; args:PGtkType):guint; cdecl; external gtklib; +{$IFNDEF KYLIX} +function gtk_signal_new(name:Pgchar; signal_flags:TGtkSignalRunType; object_type:TGtkType; function_offset:guint; marshaller:TGtkSignalMarshaller; + return_val:TGtkType; n_args:guint; args:array of const):guint; cdecl; overload; external gtklib; +function gtk_signal_new(name:Pgchar; signal_flags:TGtkSignalRunType; object_type:TGtkType; function_offset:guint; marshaller:TGtkSignalMarshaller; + return_val:TGtkType; n_args:guint):guint; cdecl; varargs; overload; external gtklib; +{$ELSE} function gtk_signal_new(name:Pgchar; signal_flags:TGtkSignalRunType; object_type:TGtkType; function_offset:guint; marshaller:TGtkSignalMarshaller; return_val:TGtkType; n_args:guint):guint; varargs; cdecl; external gtklib; +{$ENDIF} procedure gtk_signal_emit_stop_by_name(anObject:PGtkObject; name:Pgchar); cdecl; external gtklib; procedure gtk_signal_connect_object_while_alive(anObject:PGtkObject; name:Pgchar; func:TGtkSignalFunc; alive_object:PGtkObject); cdecl; external gtklib; procedure gtk_signal_connect_while_alive(anObject:PGtkObject; name:Pgchar; func:TGtkSignalFunc; func_data:gpointer; alive_object:PGtkObject); cdecl; external gtklib; function gtk_signal_connect_full(anObject:PGtkObject; name:Pgchar; func:TGtkSignalFunc; unsupported:TGtkCallbackMarshal; data:gpointer; destroy_func:TGtkDestroyNotify; object_signal:gint; after:gint):gulong; cdecl; external gtklib; procedure gtk_signal_emitv(anObject:PGtkObject; signal_id:guint; args:PGtkArg); cdecl; external gtklib; +{$IFNDEF KYLIX} +procedure gtk_signal_emit(anObject:PGtkObject; signal_id:guint; args:array of const); cdecl; overload; external gtklib; +procedure gtk_signal_emit(anObject:PGtkObject; signal_id:guint); cdecl; overload; varargs; external gtklib; +procedure gtk_signal_emit_by_name(anObject:PGtkObject; name:Pgchar; args:array of const); cdecl; overload; external gtklib; +procedure gtk_signal_emit_by_name(anObject:PGtkObject; name:Pgchar); cdecl; overload; varargs; external gtklib; +{$ELSE} procedure gtk_signal_emit(anObject:PGtkObject; signal_id:guint); varargs; cdecl; external gtklib; procedure gtk_signal_emit_by_name(anObject:PGtkObject; name:Pgchar); varargs; cdecl; external gtklib; +{$ENDIF} procedure gtk_signal_emitv_by_name(anObject:PGtkObject; name:Pgchar; args:PGtkArg); cdecl; external gtklib; procedure gtk_signal_compat_matched(anObject:PGtkObject; func:TGtkSignalFunc; data:gpointer; match:TGSignalMatchType; action:guint); cdecl; external gtklib; {$endif} diff --git a/packages/extra/gtk2/gtk+/gtk/gtktextbuffer.inc b/packages/extra/gtk2/gtk+/gtk/gtktextbuffer.inc index e21f504923..66d86f2aea 100644 --- a/packages/extra/gtk2/gtk+/gtk/gtktextbuffer.inc +++ b/packages/extra/gtk2/gtk+/gtk/gtktextbuffer.inc @@ -91,8 +91,17 @@ function gtk_text_buffer_insert_interactive(buffer:PGtkTextBuffer; iter:PGtkText function gtk_text_buffer_insert_interactive_at_cursor(buffer:PGtkTextBuffer; text:Pgchar; len:gint; default_editable:gboolean):gboolean; cdecl; external gtklib; procedure gtk_text_buffer_insert_range(buffer:PGtkTextBuffer; iter:PGtkTextIter; start:PGtkTextIter; theEnd:PGtkTextIter); cdecl; external gtklib; function gtk_text_buffer_insert_range_interactive(buffer:PGtkTextBuffer; iter:PGtkTextIter; start:PGtkTextIter; theEnd:PGtkTextIter; default_editable:gboolean):gboolean; cdecl; external gtklib; +{$IFNDEF KYLIX} +procedure gtk_text_buffer_insert_with_tags(buffer:PGtkTextBuffer; iter:PGtkTextIter; text:Pgchar; len:gint; first_tag:PGtkTextTag; + args:array of const); cdecl; overload; external gtklib; +procedure gtk_text_buffer_insert_with_tags(buffer:PGtkTextBuffer; iter:PGtkTextIter; text:Pgchar; len:gint; first_tag:PGtkTextTag); cdecl; overload; varargs; external gtklib; +procedure gtk_text_buffer_insert_with_tags_by_name(buffer:PGtkTextBuffer; iter:PGtkTextIter; text:Pgchar; len:gint; first_tag_name:Pgchar; + args:array of const); cdecl; overload; external gtklib; +procedure gtk_text_buffer_insert_with_tags_by_name(buffer:PGtkTextBuffer; iter:PGtkTextIter; text:Pgchar; len:gint; first_tag_name:Pgchar); cdecl; overload; varargs; external gtklib; +{$ELSE} procedure gtk_text_buffer_insert_with_tags(buffer:PGtkTextBuffer; iter:PGtkTextIter; text:Pgchar; len:gint; first_tag:PGtkTextTag); varargs; cdecl; external gtklib; procedure gtk_text_buffer_insert_with_tags_by_name(buffer:PGtkTextBuffer; iter:PGtkTextIter; text:Pgchar; len:gint; first_tag_name:Pgchar); varargs; cdecl; external gtklib; +{$ENDIF} { Delete from the buffer } procedure gtk_text_buffer_delete(buffer:PGtkTextBuffer; start:PGtkTextIter; theEnd:PGtkTextIter); cdecl; external gtklib; function gtk_text_buffer_delete_interactive(buffer:PGtkTextBuffer; start_iter:PGtkTextIter; end_iter:PGtkTextIter; default_editable:gboolean):gboolean; cdecl; external gtklib; @@ -125,7 +134,12 @@ procedure gtk_text_buffer_remove_all_tags(buffer:PGtkTextBuffer; start:PGtkTextI { You can either ignore the return value, or use it to set the attributes of the tag. tag_name can be NULL } +{$IFNDEF KYLIX} +function gtk_text_buffer_create_tag(buffer:PGtkTextBuffer; tag_name:Pgchar; first_property_name:Pgchar; args:array of const):PGtkTextTag; cdecl; overload; external gtklib; +function gtk_text_buffer_create_tag(buffer:PGtkTextBuffer; tag_name:Pgchar; first_property_name:Pgchar):PGtkTextTag; cdecl; overload; external gtklib; +{$ELSE} function gtk_text_buffer_create_tag(buffer:PGtkTextBuffer; tag_name:Pgchar; first_property_name:Pgchar):PGtkTextTag; varargs; cdecl; external gtklib; +{$ENDIF} { Obtain iterators pointed at various places, then you can move the iterator around using the GtkTextIter operators } diff --git a/packages/extra/gtk2/gtk+/gtk/gtktreemodel.inc b/packages/extra/gtk2/gtk+/gtk/gtktreemodel.inc index b05c57c8de..c48b3c7c3e 100644 --- a/packages/extra/gtk2/gtk+/gtk/gtktreemodel.inc +++ b/packages/extra/gtk2/gtk+/gtk/gtktreemodel.inc @@ -131,8 +131,14 @@ function gtk_tree_model_iter_nth_child(tree_model:PGtkTreeModel; iter:PGtkTreeIt function gtk_tree_model_iter_parent(tree_model:PGtkTreeModel; iter:PGtkTreeIter; child:PGtkTreeIter):gboolean; cdecl; external gtklib; procedure gtk_tree_model_ref_node(tree_model:PGtkTreeModel; iter:PGtkTreeIter); cdecl; external gtklib; procedure gtk_tree_model_unref_node(tree_model:PGtkTreeModel; iter:PGtkTreeIter); cdecl; external gtklib; +{$IFNDEF KYLIX} +procedure gtk_tree_model_get(tree_model:PGtkTreeModel; iter:PGtkTreeIter; args:array of const); cdecl; overload; external gtklib; +procedure gtk_tree_model_get(tree_model:PGtkTreeModel; iter:PGtkTreeIter); cdecl; overload; varargs; external gtklib; +procedure gtk_tree_model_get_valist(tree_model:PGtkTreeModel; iter:PGtkTreeIter; var_args: array of const); cdecl; varargs; external gtklib; +{$ELSE} procedure gtk_tree_model_get(tree_model:PGtkTreeModel; iter:PGtkTreeIter); varargs; cdecl; external gtklib; procedure gtk_tree_model_get_valist(tree_model:PGtkTreeModel; iter:PGtkTreeIter); varargs; cdecl; external gtklib; +{$ENDIF} procedure gtk_tree_model_foreach(model:PGtkTreeModel; func:TGtkTreeModelForeachFunc; user_data:gpointer); cdecl; external gtklib; { Signals } procedure gtk_tree_model_row_changed(tree_model:PGtkTreeModel; path:PGtkTreePath; iter:PGtkTreeIter); cdecl; external gtklib; diff --git a/packages/extra/gtk2/gtk+/gtk/gtktreestore.inc b/packages/extra/gtk2/gtk+/gtk/gtktreestore.inc index 7ecf6d0163..f45d7d6efe 100644 --- a/packages/extra/gtk2/gtk+/gtk/gtktreestore.inc +++ b/packages/extra/gtk2/gtk+/gtk/gtktreestore.inc @@ -56,13 +56,24 @@ procedure set_columns_dirty(var a : TGtkTreeStore; __columns_dirty : guint); ove function gtk_tree_store_get_type:TGtkType; cdecl; external gtklib; +{$IFNDEF KYLIX} +function gtk_tree_store_new(n_columns:gint):PGtkTreeStore; cdecl; overload; external gtklib; +function gtk_tree_store_new(n_columns:gint; args:array of const):PGtkTreeStore; cdecl; overload; varargs; external gtklib; +{$ELSE} function gtk_tree_store_new(n_columns:gint):PGtkTreeStore; varargs; cdecl; external gtklib; +{$ENDIF} function gtk_tree_store_newv(n_columns:gint; types:PGType):PGtkTreeStore; cdecl; external gtklib; procedure gtk_tree_store_set_column_types(tree_store:PGtkTreeStore; n_columns:gint; types:PGType); cdecl; external gtklib; { NOTE: use gtk_tree_model_get to get values from a GtkTreeStore } procedure gtk_tree_store_set_value(tree_store:PGtkTreeStore; iter:PGtkTreeIter; column:gint; value:PGValue); cdecl; external gtklib; +{$IFNDEF KYLIX} +procedure gtk_tree_store_set(tree_store:PGtkTreeStore; iter:PGtkTreeIter; args:array of const); cdecl; overload; external gtklib; +procedure gtk_tree_store_set(tree_store:PGtkTreeStore; iter:PGtkTreeIter); cdecl; overload; varargs; external gtklib; +procedure gtk_tree_store_set_valist(tree_store:PGtkTreeStore; iter:PGtkTreeIter; var_args: array of const); cdecl; external gtklib; +{$ELSE} procedure gtk_tree_store_set(tree_store:PGtkTreeStore; iter:PGtkTreeIter); varargs; cdecl; external gtklib; procedure gtk_tree_store_set_valist(tree_store:PGtkTreeStore; iter:PGtkTreeIter); varargs; cdecl; external gtklib; +{$ENDIF} procedure gtk_tree_store_remove(tree_store:PGtkTreeStore; iter:PGtkTreeIter); cdecl; external gtklib; procedure gtk_tree_store_insert(tree_store:PGtkTreeStore; iter:PGtkTreeIter; parent:PGtkTreeIter; position:gint); cdecl; external gtklib; procedure gtk_tree_store_insert_before(tree_store:PGtkTreeStore; iter:PGtkTreeIter; parent:PGtkTreeIter; sibling:PGtkTreeIter); cdecl; external gtklib; diff --git a/packages/extra/gtk2/gtk+/gtk/gtktreeview.inc b/packages/extra/gtk2/gtk+/gtk/gtktreeview.inc index d03f17eecd..d7df7f265f 100644 --- a/packages/extra/gtk2/gtk+/gtk/gtktreeview.inc +++ b/packages/extra/gtk2/gtk+/gtk/gtktreeview.inc @@ -100,7 +100,12 @@ function gtk_tree_view_get_rules_hint(tree_view:PGtkTreeView):gboolean; cdecl; e function gtk_tree_view_append_column(tree_view:PGtkTreeView; column:PGtkTreeViewColumn):gint; cdecl; external gtklib; function gtk_tree_view_remove_column(tree_view:PGtkTreeView; column:PGtkTreeViewColumn):gint; cdecl; external gtklib; function gtk_tree_view_insert_column(tree_view:PGtkTreeView; column:PGtkTreeViewColumn; position:gint):gint; cdecl; external gtklib; +{$IFNDEF KYLIX} +function gtk_tree_view_insert_column_with_attributes(tree_view:PGtkTreeView; position:gint; title:Pgchar; cell:PGtkCellRenderer; args:array of const):gint; cdecl; overload; external gtklib; +function gtk_tree_view_insert_column_with_attributes(tree_view:PGtkTreeView; position:gint; title:Pgchar; cell:PGtkCellRenderer):gint; cdecl; overload; varargs; external gtklib; +{$ELSE} function gtk_tree_view_insert_column_with_attributes(tree_view:PGtkTreeView; position:gint; title:Pgchar; cell:PGtkCellRenderer):gint; varargs; cdecl; external gtklib; +{$ENDIF} function gtk_tree_view_insert_column_with_data_func(tree_view:PGtkTreeView; position:gint; title:Pgchar; cell:PGtkCellRenderer; func:TGtkTreeCellDataFunc; data:gpointer; dnotify:TGDestroyNotify):gint; cdecl; external gtklib; function gtk_tree_view_get_column(tree_view:PGtkTreeView; n:gint):PGtkTreeViewColumn; cdecl; external gtklib; diff --git a/packages/extra/gtk2/gtk+/gtk/gtktreeviewcolumn.inc b/packages/extra/gtk2/gtk+/gtk/gtktreeviewcolumn.inc index 15fb9a7dfe..cde9f56fbb 100644 --- a/packages/extra/gtk2/gtk+/gtk/gtktreeviewcolumn.inc +++ b/packages/extra/gtk2/gtk+/gtk/gtktreeviewcolumn.inc @@ -119,13 +119,23 @@ procedure set_use_resized_width(var a : TGtkTreeViewColumn; __use_resized_width function gtk_tree_view_column_get_type:TGtkType; cdecl; external gtklib; function gtk_tree_view_column_new:PGtkTreeViewColumn; cdecl; external gtklib; +{$IFNDEF KYLIX} +function gtk_tree_view_column_new_with_attributes(title:Pgchar; cell:PGtkCellRenderer; args:array of const):PGtkTreeViewColumn; cdecl; overload; external gtklib; +function gtk_tree_view_column_new_with_attributes(title:Pgchar; cell:PGtkCellRenderer):PGtkTreeViewColumn; cdecl; overload; varargs; external gtklib; +{$ELSE} function gtk_tree_view_column_new_with_attributes(title:Pgchar; cell:PGtkCellRenderer):PGtkTreeViewColumn; varargs; cdecl; external gtklib; +{$ENDIF} procedure gtk_tree_view_column_pack_start(tree_column:PGtkTreeViewColumn; cell:PGtkCellRenderer; expand:gboolean); cdecl; external gtklib; procedure gtk_tree_view_column_pack_end(tree_column:PGtkTreeViewColumn; cell:PGtkCellRenderer; expand:gboolean); cdecl; external gtklib; procedure gtk_tree_view_column_clear(tree_column:PGtkTreeViewColumn); cdecl; external gtklib; function gtk_tree_view_column_get_cell_renderers(tree_column:PGtkTreeViewColumn):PGList; cdecl; external gtklib; procedure gtk_tree_view_column_add_attribute(tree_column:PGtkTreeViewColumn; cell_renderer:PGtkCellRenderer; attribute:Pgchar; column:gint); cdecl; external gtklib; +{$IFNDEF KYLIX} +procedure gtk_tree_view_column_set_attributes(tree_column:PGtkTreeViewColumn; cell_renderer:PGtkCellRenderer; args:array of const); cdecl; overload; external gtklib; +procedure gtk_tree_view_column_set_attributes(tree_column:PGtkTreeViewColumn; cell_renderer:PGtkCellRenderer); cdecl; overload; varargs; external gtklib; +{$ELSE} procedure gtk_tree_view_column_set_attributes(tree_column:PGtkTreeViewColumn; cell_renderer:PGtkCellRenderer); varargs; cdecl; external gtklib; +{$ENDIF} procedure gtk_tree_view_column_set_cell_data_func(tree_column:PGtkTreeViewColumn; cell_renderer:PGtkCellRenderer; func:TGtkTreeCellDataFunc; func_data:gpointer; destroy:TGtkDestroyNotify); cdecl; external gtklib; procedure gtk_tree_view_column_clear_attributes(tree_column:PGtkTreeViewColumn; cell_renderer:PGtkCellRenderer); cdecl; external gtklib; procedure gtk_tree_view_column_set_spacing(tree_column:PGtkTreeViewColumn; spacing:gint); cdecl; external gtklib; diff --git a/packages/extra/gtk2/gtk+/gtk/gtkwidget.inc b/packages/extra/gtk2/gtk+/gtk/gtkwidget.inc index 5cfb6ba79a..3613a81019 100644 --- a/packages/extra/gtk2/gtk+/gtk/gtkwidget.inc +++ b/packages/extra/gtk2/gtk+/gtk/gtkwidget.inc @@ -317,14 +317,24 @@ procedure set_y_set(var a : TGtkWidgetAuxInfo; __y_set : guint); function gtk_widget_get_type:TGtkType; cdecl; external gtklib; +{$IFNDEF KYLIX} +function gtk_widget_new(_type:TGtkType; first_property_name:Pgchar; args:array of const):PGtkWidget; cdecl; overload; external gtklib; +function gtk_widget_new(_type:TGtkType; first_property_name:Pgchar):PGtkWidget; cdecl; overload; varargs; external gtklib; +{$ELSE} function gtk_widget_new(_type:TGtkType; first_property_name:Pgchar):PGtkWidget; varargs; cdecl; external gtklib; +{$ENDIF} function gtk_widget_ref(widget:PGtkWidget):PGtkWidget; cdecl; external gtklib; procedure gtk_widget_unref(widget:PGtkWidget); cdecl; external gtklib; procedure gtk_widget_destroy(widget:PGtkWidget); cdecl; external gtklib; procedure gtk_widget_destroyed(widget:PGtkWidget; var widget_pointer:PGtkWidget); cdecl; external gtklib; {$ifndef GTK_DISABLE_DEPRECATED} +{$IFNDEF KYLIX} +procedure gtk_widget_set(widget:PGtkWidget; first_property_name:Pgchar; args:array of const); cdecl; overload; external gtklib; +procedure gtk_widget_set(widget:PGtkWidget; first_property_name:Pgchar); cdecl; overload; varargs; external gtklib; +{$ELSE} procedure gtk_widget_set(widget:PGtkWidget; first_property_name:Pgchar); varargs; cdecl; external gtklib; +{$ENDIF} {$endif} { GTK_DISABLE_DEPRECATED } @@ -486,8 +496,14 @@ procedure gtk_widget_class_install_style_property_parser(klass:PGtkWidgetClass; function gtk_widget_class_find_style_property(klass:PGtkWidgetClass; property_name:Pgchar):PGParamSpec; cdecl; external gtklib; function gtk_widget_class_list_style_properties(klass:PGtkWidgetClass; n_properties:Pguint):PPGParamSpec; cdecl; external gtklib; procedure gtk_widget_style_get_property(widget:PGtkWidget; property_name:Pgchar; value:PGValue); cdecl; external gtklib; +{$IFNDEF KYLIX} +procedure gtk_widget_style_get_valist(widget:PGtkWidget; first_property_name:Pgchar; var_args: array of const); cdecl; external gtklib; +procedure gtk_widget_style_get(widget:PGtkWidget; first_property_name:Pgchar; args:array of const); cdecl; overload; external gtklib; +procedure gtk_widget_style_get(widget:PGtkWidget; first_property_name:Pgchar); cdecl; overload; varargs; external gtklib; +{$ELSE} procedure gtk_widget_style_get_valist(widget:PGtkWidget; first_property_name:Pgchar); varargs; cdecl; external gtklib; procedure gtk_widget_style_get(widget:PGtkWidget; first_property_name:Pgchar); varargs; cdecl; external gtklib; +{$ENDIF} { Set certain default values to be used at widget creation time. } procedure gtk_widget_set_default_colormap(colormap:PGdkColormap); cdecl; external gtklib; diff --git a/packages/extra/gtk2/pango/pango-tabs.inc b/packages/extra/gtk2/pango/pango-tabs.inc index 85f69565b2..5d7e3c33aa 100644 --- a/packages/extra/gtk2/pango/pango-tabs.inc +++ b/packages/extra/gtk2/pango/pango-tabs.inc @@ -19,7 +19,12 @@ function PANGO_TYPE_TAB_ARRAY : GType; function pango_tab_array_new(initial_size:gint; positions_in_pixels:gboolean):PPangoTabArray; cdecl; external pangolib; +{$IFNDEF KYLIX} +function pango_tab_array_new_with_positions(size:gint; positions_in_pixels:gboolean; first_alignment:TPangoTabAlign; first_position:gint; args:array of const):PPangoTabArray; cdecl; overload; external pangolib; +function pango_tab_array_new_with_positions(size:gint; positions_in_pixels:gboolean; first_alignment:TPangoTabAlign; first_position:gint):PPangoTabArray; cdecl; overload; varargs; external pangolib; +{$ELSE} function pango_tab_array_new_with_positions(size:gint; positions_in_pixels:gboolean; first_alignment:TPangoTabAlign; first_position:gint):PPangoTabArray; varargs; cdecl; external pangolib; +{$ENDIF} function pango_tab_array_get_type:GType; cdecl; external pangolib; function pango_tab_array_copy(src:PPangoTabArray):PPangoTabArray; cdecl; external pangolib; procedure pango_tab_array_free(tab_array:PPangoTabArray); cdecl; external pangolib; diff --git a/tests/test/cg/tprintf2.pp b/tests/test/cg/tprintf2.pp index a50254e34d..0bcff2f481 100644 --- a/tests/test/cg/tprintf2.pp +++ b/tests/test/cg/tprintf2.pp @@ -56,8 +56,8 @@ begin printf('Simple test without arg'+lineending); Writeln('Testing with single pchar argument'); - printf('Text containing "%s" text'+lineending,[s]); - sprintf(p,'Text containing "%s" text'+lineending,[s]); + printf('Text containing "%s" text'+lineending,s); + sprintf(p,'Text containing "%s" text'+lineending,s); if strpos(p,'g "Enclosed text" ')=nil then begin writeln('The output of sprintf for pchar is wrong: ',p); @@ -65,8 +65,8 @@ begin end; Writeln('Testing with single longint argument'); - printf('Text containing longint: %d'+lineending,[l]); - sprintf(p,'Text containing longint: %d'+lineending,[l]); + printf('Text containing longint: %d'+lineending,l); + sprintf(p,'Text containing longint: %d'+lineending,l); if strpos(p,'longint: 45')=nil then begin writeln('The output of sprintf for longint is wrong: ',p); @@ -74,8 +74,8 @@ begin end; Writeln('Testing with single int64 argument'); - printf('Text containing int64: %'+int64prefix+'d'+lineending,[ll]); - sprintf(p,'Text containing int64: %'+int64prefix+'d'+lineending,[ll]); + printf('Text containing int64: %'+int64prefix+'d'+lineending,ll); + sprintf(p,'Text containing int64: %'+int64prefix+'d'+lineending,ll); if strpos(p,'int64: 345')=nil then begin writeln('The output of sprintf for int64 is wrong: ',p); @@ -83,8 +83,8 @@ begin end; Writeln('Testing with single single argument'); - printf('Text containing single: %f'+lineending,[si]); - sprintf(p,'Text containing single: %f'+lineending,[si]); + printf('Text containing single: %f'+lineending,si); + sprintf(p,'Text containing single: %f'+lineending,si); if strpos(p,'single: 32.1')=nil then begin writeln('The output of sprintf for double is wrong: ',p); @@ -92,8 +92,8 @@ begin end; Writeln('Testing with single double argument'); - printf('Text containing double: %lf'+lineending,[d]); - sprintf(p,'Text containing double: %lf'+lineending,[d]); + printf('Text containing double: %lf'+lineending,d); + sprintf(p,'Text containing double: %lf'+lineending,d); if strpos(p,'double: 45.4')=nil then begin writeln('The output of sprintf for double is wrong: ',p); @@ -101,8 +101,8 @@ begin end; {$ifdef FPC_HAS_TYPE_EXTENDED} - printf('Text containing long double: %Lf'+lineending,[e]); - sprintf(p,'Text containing long double: %Lf'+lineending,[e]); + printf('Text containing long double: %Lf'+lineending,e); + sprintf(p,'Text containing long double: %Lf'+lineending,e); if strpos(p,'long double: 74.7')=nil then begin writeln('The output of sprintf for long double is wrong:',p); @@ -111,8 +111,8 @@ begin {$endif FPC_HAS_TYPE_EXTENDED} Writeln('Testing with combined pchar argument'); - printf('Text containing "%s" and "%s" text'+lineending,[s,s2]); - sprintf(p,'Text containing "%s" and "%s" text'+lineending,[s,s2]); + printf('Text containing "%s" and "%s" text'+lineending,s,s2); + sprintf(p,'Text containing "%s" and "%s" text'+lineending,s,s2); if strpos(p,'g "Enclosed text" and "next"')=nil then begin writeln('The output of sprintf for two pchars is wrong: ',p); @@ -120,8 +120,8 @@ begin end; Writeln('Testing with single longint argument and pchar'); - printf('Text containing longint: %d"%s"'+lineending,[l,s2]); - sprintf(p,'Text containing longint: %d"%s"'+lineending,[l,s2]); + printf('Text containing longint: %d"%s"'+lineending,l,s2); + sprintf(p,'Text containing longint: %d"%s"'+lineending,l,s2); if strpos(p,'longint: 45"next"')=nil then begin writeln('The output of sprintf for longint is wrong: ',p); @@ -129,8 +129,8 @@ begin end; Writeln('Testing with single int64 argument and pchar'); - printf('Text containing int64: %'+int64prefix+'d"%s"'+lineending,[ll,s2]); - sprintf(p,'Text containing int64: %'+int64prefix+'d"%s"'+lineending,[ll,s2]); + printf('Text containing int64: %'+int64prefix+'d"%s"'+lineending,ll,s2); + sprintf(p,'Text containing int64: %'+int64prefix+'d"%s"'+lineending,ll,s2); if strpos(p,'int64: 345"next"')=nil then begin writeln('The output of sprintf for int64 is wrong: ',p); @@ -138,8 +138,8 @@ begin end; Writeln('Testing with single single argument'); - printf('Text containing single: %f"%s"'+lineending,[si,s2]); - sprintf(p,'Text containing single: %f"%s"'+lineending,[si,s2]); + printf('Text containing single: %f"%s"'+lineending,si,s2); + sprintf(p,'Text containing single: %f"%s"'+lineending,si,s2); if (strpos(p,'single: 32.1')=nil) or (strpos(p,'"next"')=nil) then begin @@ -148,8 +148,8 @@ begin end; Writeln('Testing with single double argument'); - printf('Text containing double: %lf"%s"'+lineending,[d,s2]); - sprintf(p,'Text containing double: %lf"%s"'+lineending,[d,s2]); + printf('Text containing double: %lf"%s"'+lineending,d,s2); + sprintf(p,'Text containing double: %lf"%s"'+lineending,d,s2); if (strpos(p,'double: 45.4')=nil) or (strpos(p,'"next"')=nil) then begin @@ -158,8 +158,8 @@ begin end; {$ifdef FPC_HAS_TYPE_EXTENDED} - printf('Text containing long double: %Lf"%s"'+lineending,[e,s2]); - sprintf(p,'Text containing long double: %Lf"%s"'+lineending,[e,s2]); + printf('Text containing long double: %Lf"%s"'+lineending,e,s2); + sprintf(p,'Text containing long double: %Lf"%s"'+lineending,e,s2); if (strpos(p,'long double: 74.7')=nil) or (strpos(p,'"next"')=nil) then begin