diff options
Diffstat (limited to 'Master/tlpkg/tlperl/lib/Tk')
24 files changed, 1116 insertions, 1045 deletions
diff --git a/Master/tlpkg/tlperl/lib/Tk/Balloon.pod b/Master/tlpkg/tlperl/lib/Tk/Balloon.pod index c5afb91e089..9188a9e25a4 100644 --- a/Master/tlpkg/tlperl/lib/Tk/Balloon.pod +++ b/Master/tlpkg/tlperl/lib/Tk/Balloon.pod @@ -70,6 +70,17 @@ assumed that the balloon is to be attached to the B<Canvas> as a whole. You can have separate status and balloon messages just like normal balloons. +=head2 Balloons and HLists + +If the balloon is attached to a B<HList> widget and the message +arguments are hash references, then each hash key should correspond to +a HList path and the associated value will correspond to the message +for that HList item. The balloon message will then be shown for the +current item (the one at the position of the mouse). Otherwise it is +assumed that the balloon is to be attached to the B<HList> as a whole. +You can have separate status and balloon messages just like normal +balloons. + =head2 Balloon Position By default, the balloon pops up at the lower right side of the client. diff --git a/Master/tlpkg/tlperl/lib/Tk/Config.pm b/Master/tlpkg/tlperl/lib/Tk/Config.pm index 7dc7f199f3b..8d4f62868cc 100644 --- a/Master/tlpkg/tlperl/lib/Tk/Config.pm +++ b/Master/tlpkg/tlperl/lib/Tk/Config.pm @@ -2,7 +2,7 @@ package Tk::Config; require Exporter; use base qw(Exporter); -$VERSION = '804.029'; +$VERSION = '804.03'; $inc = '-I$(TKDIR) -I$(TKDIR)/pTk/mTk/xlib'; $define = ''; $xlib = ''; diff --git a/Master/tlpkg/tlperl/lib/Tk/Event.pm b/Master/tlpkg/tlperl/lib/Tk/Event.pm index d8c3bc7ba92..dec4aaad3d7 100644 --- a/Master/tlpkg/tlperl/lib/Tk/Event.pm +++ b/Master/tlpkg/tlperl/lib/Tk/Event.pm @@ -2,7 +2,7 @@ package Tk::Event; use vars qw($VERSION $XS_VERSION @EXPORT_OK); END { CleanupGlue() } $VERSION = '4.024'; # was: sprintf '4.%03d', q$Revision: #15 $ =~ /\D(\d+)\s*$/; -$XS_VERSION = '804.029'; +$XS_VERSION = '804.030'; $XS_VERSION = eval $XS_VERSION; use base qw(Exporter); use XSLoader; diff --git a/Master/tlpkg/tlperl/lib/Tk/FBox.pm b/Master/tlpkg/tlperl/lib/Tk/FBox.pm index 3aa025fbe2c..ef867a7e097 100644 --- a/Master/tlpkg/tlperl/lib/Tk/FBox.pm +++ b/Master/tlpkg/tlperl/lib/Tk/FBox.pm @@ -559,7 +559,7 @@ sub ResolveFile { # If the file has no extension, append the default. Be careful not # to do this for directories, otherwise typing a dirname in the box # will give back "dirname.extension" instead of trying to change dir. - if (!-d $path && $path !~ /\..+$/s && defined $defaultext) { + if (!-d $path && $text !~ /\..+$/s && defined $defaultext) { $path = "$path$defaultext"; } # Cannot just test for existance here as non-existing files are diff --git a/Master/tlpkg/tlperl/lib/Tk/HList.pm b/Master/tlpkg/tlperl/lib/Tk/HList.pm index d259ca9ce24..7761f097373 100644 --- a/Master/tlpkg/tlperl/lib/Tk/HList.pm +++ b/Master/tlpkg/tlperl/lib/Tk/HList.pm @@ -680,6 +680,29 @@ sub children @info; } -1; - +sub BalloonInfo +{ + my ($listbox,$balloon,$X,$Y,@opt) = @_; + my $e = $listbox->XEvent; + return if !$e; + my $path = $listbox->GetNearest($e->y, 1); + $path = '' unless defined($path); + foreach my $opt (@opt) + { + my $info = $balloon->GetOption($opt,$listbox); + if ($opt =~ /^-(statusmsg|balloonmsg)$/ + && UNIVERSAL::isa($info,'HASH')) + { + $balloon->Subclient($path); + if (defined $info->{$path}) + { + return $info->{$path}; + } + return ''; + } + return $info if (defined $info); + } + return ''; +} +1; diff --git a/Master/tlpkg/tlperl/lib/Tk/Image.pm b/Master/tlpkg/tlperl/lib/Tk/Image.pm index 0f41c387fc2..2c47a13d749 100644 --- a/Master/tlpkg/tlperl/lib/Tk/Image.pm +++ b/Master/tlpkg/tlperl/lib/Tk/Image.pm @@ -38,7 +38,7 @@ sub ClassInit require Tk::Submethods; -Direct Tk::Submethods ('image' => [qw(delete width height type)]); +Direct Tk::Submethods ('image' => [qw(delete width height inuse type)]); sub Tk::Widget::imageNames { diff --git a/Master/tlpkg/tlperl/lib/Tk/Image.pod b/Master/tlpkg/tlperl/lib/Tk/Image.pod index 9a9b6b6b646..797ecc23cbf 100644 --- a/Master/tlpkg/tlperl/lib/Tk/Image.pod +++ b/Master/tlpkg/tlperl/lib/Tk/Image.pod @@ -65,10 +65,10 @@ the existing instances will use the new image. Returns a decimal string giving the height of image I<name> in pixels. -=item I<$widget>-E<gt>B<imageInuse>( 'name' ); +=item I<$image>-E<gt>B<inuse> -Returns a boolean value indicating whether or not the image -given by I<name> is in use by any widgets. +Returns a boolean value indicating whether or not the image is in use +by any widgets. =item I<$widget>-E<gt>B<imageNames> diff --git a/Master/tlpkg/tlperl/lib/Tk/MainWindow.pm b/Master/tlpkg/tlperl/lib/Tk/MainWindow.pm index 5dc08d027d7..207b0d1fbb5 100644 --- a/Master/tlpkg/tlperl/lib/Tk/MainWindow.pm +++ b/Master/tlpkg/tlperl/lib/Tk/MainWindow.pm @@ -8,7 +8,7 @@ BEGIN { @MainWindow::ISA = 'Tk::MainWindow' } use strict; use vars qw($VERSION); -$VERSION = '4.014'; # was: sprintf '4.%03d', q$Revision: #12 $ =~ /\D(\d+)\s*$/; +$VERSION = '4.015'; # was: sprintf '4.%03d', q$Revision: #12 $ =~ /\D(\d+)\s*$/; use Tk::CmdLine; use Tk qw(catch); @@ -18,8 +18,6 @@ use Carp; $| = 1; -my $pid = $$; - my %Windows = (); sub CreateArgs diff --git a/Master/tlpkg/tlperl/lib/Tk/Pane.pm b/Master/tlpkg/tlperl/lib/Tk/Pane.pm index 36c5203a42d..fa63b1a64f9 100644 --- a/Master/tlpkg/tlperl/lib/Tk/Pane.pm +++ b/Master/tlpkg/tlperl/lib/Tk/Pane.pm @@ -409,7 +409,7 @@ Tk::Pane - A window panner use Tk::Pane; - $pane = $mw->Scrolled(Pane, Name => 'fred', + $pane = $mw->Scrolled("Pane", Name => 'fred', -scrollbars => 'soe', -sticky => 'we', -gridded => 'y' diff --git a/Master/tlpkg/tlperl/lib/Tk/ProgressBar.pm b/Master/tlpkg/tlperl/lib/Tk/ProgressBar.pm index f41abff6fdc..33d97fb3b94 100644 --- a/Master/tlpkg/tlperl/lib/Tk/ProgressBar.pm +++ b/Master/tlpkg/tlperl/lib/Tk/ProgressBar.pm @@ -1,7 +1,7 @@ package Tk::ProgressBar; use vars qw($VERSION); -$VERSION = '4.014'; # was: sprintf '4.%03d', q$Revision: #10 $ =~ /\D(\d+)\s*$/; +$VERSION = '4.015'; # was: sprintf '4.%03d', q$Revision: #10 $ =~ /\D(\d+)\s*$/; use Tk; use Tk::Canvas; @@ -21,6 +21,10 @@ sub ClassInit { $mw->bind($class,'<Configure>', ['_layoutRequest',1]); } +my $LAYOUT_REQUEST_NONE = 0; +my $LAYOUT_REQUEST_COLORS = 1; +my $LAYOUT_REQUEST_VALUE = 2; +my $LAYOUT_REQUEST_GEOM = 4; sub Populate { my($c,$args) = @_; @@ -46,10 +50,26 @@ sub Populate { -troughcolor => [PASSIVE => 'troughColor', 'Background', 'grey55'], ); - _layoutRequest($c,1); + $c->_layoutRequest($LAYOUT_REQUEST_COLORS); $c->OnDestroy(['Destroyed' => $c]); } +sub ConfigChanged { + my($c, $changed) = @_; + for my $k (qw(from to blocks padx pady gap colors resolution troughcolor)) { + if (exists $changed->{"-$k"}) { + $c->_layoutRequest($LAYOUT_REQUEST_COLORS); + last; + } + } + for my $k (qw(borderwidth length width)) { + if (exists $changed->{"-$k"}) { + $c->_layoutRequest($LAYOUT_REQUEST_GEOM); + last; + } + } +} + sub anchor { my $c = shift; my $var = \$c->{Configure}{'-anchor'}; @@ -91,7 +111,7 @@ sub _arrange { my($minv,$maxv) = $from < $to ? ($from,$to) : ($to,$from); - if($w == 1 && $h == 1) { + if(($w == 1 && $h == 1) || ($why & $LAYOUT_REQUEST_GEOM)) { my $bw = $c->cget('-borderwidth'); my $defw = 10 + $y*2 + $bw *2; my $defl = ($maxv - $minv) + $x*2 + $bw*2; @@ -101,7 +121,6 @@ sub _arrange { ($w,$h) = ($h,$w) if $horz; $c->GeometryRequest($w,$h); - $c->parent->update; $c->update; $w = $c->Width; @@ -128,7 +147,7 @@ sub _arrange { $gap = 0; } - if($why & 1) { + if($why & $LAYOUT_REQUEST_COLORS) { my $colors = $c->{Configure}{'-colors'} || []; my $bdir = $from < $to ? $dir : 0 - $dir; @@ -289,7 +308,7 @@ sub value { if(@_) { my $value = shift; $$val = defined($value) ? $value : $c->{Configure}{'-from'}; - _layoutRequest($c,2); + $c->_layoutRequest($LAYOUT_REQUEST_VALUE); } $old; @@ -308,7 +327,7 @@ sub variable { $c->{'-variable'} = $varref; $c->traceVariable($varref, 'w', sub { $c->value($_[1]) }); $$varref = $oldval; - _layoutRequest($c,2); + $c->_layoutRequest($LAYOUT_REQUEST_VALUE); } $oldval; } diff --git a/Master/tlpkg/tlperl/lib/Tk/Text.pod b/Master/tlpkg/tlperl/lib/Tk/Text.pod index 3f266979ed3..200cda9b033 100644 --- a/Master/tlpkg/tlperl/lib/Tk/Text.pod +++ b/Master/tlpkg/tlperl/lib/Tk/Text.pod @@ -14,7 +14,7 @@ Tk::Text - Create and manipulate Text widgets =head1 SYNOPSIS -B<text> $text ?I<options>? +I<$text> = I<$parent>-E<gt>B<Text>(?I<options>?); B<-background> B<-highlightbackground> B<-insertontime> B<-selectborderwidth> B<-borderwidth> B<-highlightcolor> B<-insertwidth> B<-selectforeground> diff --git a/Master/tlpkg/tlperl/lib/Tk/TixGrid.pod b/Master/tlpkg/tlperl/lib/Tk/TixGrid.pod index 23aa4468bfa..93484db0076 100644 --- a/Master/tlpkg/tlperl/lib/Tk/TixGrid.pod +++ b/Master/tlpkg/tlperl/lib/Tk/TixGrid.pod @@ -181,15 +181,15 @@ following. =over 8 -=item B<x_region> +=item B<x_margin> The horizontal margin. -=item B<y_region> +=item B<y_margin> The vertical margin. -=item B<s_region> +=item B<s_margin> The area in the top left corner where the horizontal and vertical margins are joined. diff --git a/Master/tlpkg/tlperl/lib/Tk/Widget.pm b/Master/tlpkg/tlperl/lib/Tk/Widget.pm index 4d20f96066a..96cd136b245 100644 --- a/Master/tlpkg/tlperl/lib/Tk/Widget.pm +++ b/Master/tlpkg/tlperl/lib/Tk/Widget.pm @@ -63,7 +63,7 @@ sub False { 0 } use Tk::Submethods( 'grab' => [qw(current status release -global)], 'focus' => [qw(-force -lastfor)], 'pack' => [qw(configure forget info propagate slaves)], - 'grid' => [qw(bbox columnconfigure configure forget info location propagate rowconfigure size slaves)], + 'grid' => [qw(bbox columnconfigure configure forget info location propagate remove rowconfigure size slaves)], 'form' => [qw(check configure forget grid info slaves)], 'event' => [qw(add delete generate info)], 'place' => [qw(configure forget info slaves)], @@ -1225,7 +1225,7 @@ sub grid { local $SIG{'__DIE__'} = \&Carp::croak; my $w = shift; - if (@_ && $_[0] =~ /^(?:bbox|columnconfigure|configure|forget|info|location|propagate|rowconfigure|size|slaves)$/x) + if (@_ && $_[0] =~ /^(?:bbox|columnconfigure|configure|forget|info|location|propagate|remove|rowconfigure|size|slaves)$/x) { my $opt = shift; Tk::grid($opt,$w,@_); diff --git a/Master/tlpkg/tlperl/lib/Tk/X11/X.h b/Master/tlpkg/tlperl/lib/Tk/X11/X.h index 95db07f903f..a1cf10c8a90 100644 --- a/Master/tlpkg/tlperl/lib/Tk/X11/X.h +++ b/Master/tlpkg/tlperl/lib/Tk/X11/X.h @@ -40,7 +40,7 @@ SOFTWARE. /* Resources */ -#ifdef _WIN64 +#if defined(_WIN64) && defined(_MSC_VER) typedef __int64 XID; #else typedef unsigned long XID; diff --git a/Master/tlpkg/tlperl/lib/Tk/demos/widget_lib/Ball.pm b/Master/tlpkg/tlperl/lib/Tk/demos/widget_lib/Ball.pm index c05605e4aaa..0f85f121091 100644 --- a/Master/tlpkg/tlperl/lib/Tk/demos/widget_lib/Ball.pm +++ b/Master/tlpkg/tlperl/lib/Tk/demos/widget_lib/Ball.pm @@ -1,5 +1,6 @@ -package Ball; +package # hide from CPAN indexer + Ball; # Ball.pm, a class module that allows concurrent simulation (canvas) instances. # @@ -18,7 +19,7 @@ package Ball; # Tidied up by SOL. use vars qw/$VERSION/; -$VERSION = '4.004'; # $Id: //depot/Tkutf8/demos/demos/widget_lib/Ball.pm#4 $ +$VERSION = '4.005'; # $Id: //depot/Tkutf8/demos/demos/widget_lib/Ball.pm#4 $ use Tk::Canvas; use Tk::Widget; diff --git a/Master/tlpkg/tlperl/lib/Tk/demos/widget_lib/Plot.pm b/Master/tlpkg/tlperl/lib/Tk/demos/widget_lib/Plot.pm index c5416b0e535..25ace4a805b 100644 --- a/Master/tlpkg/tlperl/lib/Tk/demos/widget_lib/Plot.pm +++ b/Master/tlpkg/tlperl/lib/Tk/demos/widget_lib/Plot.pm @@ -1,5 +1,6 @@ -package Plot; +package # hide from CPAN indexer + Plot; # Class "Plot": constructor, methods, destructor, global class data, # etcetera. @@ -12,7 +13,7 @@ package Plot; require 5.005_03; use vars qw/$VERSION @ISA/; -$VERSION = '4.008'; # sprintf '4.%03d', q$Revision: #7 $ =~ /\D(\d+)\s*$/; +$VERSION = '4.009'; # sprintf '4.%03d', q$Revision: #7 $ =~ /\D(\d+)\s*$/; use Tk::Frame; use base qw/Tk::Frame/; diff --git a/Master/tlpkg/tlperl/lib/Tk/demos/widtrib/all.pl b/Master/tlpkg/tlperl/lib/Tk/demos/widtrib/all.pl index 2152465c462..482bb46ea5b 100644 --- a/Master/tlpkg/tlperl/lib/Tk/demos/widtrib/all.pl +++ b/Master/tlpkg/tlperl/lib/Tk/demos/widtrib/all.pl @@ -27,7 +27,7 @@ All Tk widgets at a glance in one Toplevel. The left column contains the class name, the middle column a sample representation of this widget, and the right column a button to the widget's Pod (requires Tk::Pod from CPAN). -There are two sections: core Tk modules which come with stock Tk $Tk::VERSION and a sample of non-standard Tk modules from CPAN. The non-standard modules are only displayed if installed, otherwise they are skipped. +There are three sections: core Tk modules and Tix modules which come with stock Tk $Tk::VERSION and a sample of non-standard Tk modules from CPAN. The non-standard modules are only displayed if installed, otherwise they are skipped. EOF -geometry_manager => 'pack', -title => 'All widgets', @@ -74,6 +74,7 @@ EOF -width => rand(4)+1, ); } + $w->configure(-scrollregion => [$w->bbox("all")]); }, }, {class => 'Checkbutton', w_args => [-text => 'This is a checkbutton']}, @@ -113,7 +114,22 @@ EOF {class => 'TextList', w_args => [@txt_geom], action => $insert_lb, scrolled => 'oe'}, {class => 'TextUndo', w_args => [@txt_geom], action => $insert_txt, scrolled => 'oe'}, # XXX Toplevel - qw(FloatEntry HList IconList InputO + + {separator => 'Tix modules'}, + + 'FloatEntry', + {class => 'HList', action => sub { + my $w = shift; + my $b = $w->Balloon; + my %binfo; + for my $path ('1', '1.1', '1.2', '2', '2.1') { + $w->add($path, -text => $path); + $binfo{$path} = "BalloonInfo: $path"; + } + $b->attach($w, -balloonposition => "mouse", -msg => \%binfo); + }, + }, + qw(IconList InputO LabEntry LabFrame LabRadio NBFrame Optionmenu Panedwindow ProgressBar TList Table Tiler TixGrid Tree diff --git a/Master/tlpkg/tlperl/lib/Tk/pTk/Lang.t b/Master/tlpkg/tlperl/lib/Tk/pTk/Lang.t index b9a1f287c25..030a20c1174 100644 --- a/Master/tlpkg/tlperl/lib/Tk/pTk/Lang.t +++ b/Master/tlpkg/tlperl/lib/Tk/pTk/Lang.t @@ -1,217 +1,217 @@ -#ifdef _LANG
-VVAR(Tcl_ObjCmdProc *,LangOptionCommand,V_LangOptionCommand)
-#if !defined(TCL_EVENT_IMPLEMENT) || defined(Var)
-VVAR(Tcl_ObjType,tclIntType,V_tclIntType)
-#endif /* #if !defined(TCL_EVENT_IMPLEMENT) || defined(Var) */
-#ifndef LangCmpArg
-VFUNC(int,LangCmpArg,V_LangCmpArg,_ANSI_ARGS_((CONST Tcl_Obj *,CONST Tcl_Obj *)))
-#endif /* #ifndef LangCmpArg */
-
-#ifndef LangCmpOpt
-VFUNC(int,LangCmpOpt,V_LangCmpOpt,_ANSI_ARGS_((CONST char *opt,CONST char *arg,size_t length)))
-#endif /* #ifndef LangCmpOpt */
-
-#ifndef LangConfigObj
-VFUNC(int,LangConfigObj,V_LangConfigObj,_ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj **save,
- Tcl_Obj *obj, int type)))
-#endif /* #ifndef LangConfigObj */
-
-#ifndef LangCopyArg
-VFUNC(Tcl_Obj *,LangCopyArg,V_LangCopyArg,_ANSI_ARGS_((Tcl_Obj *)))
-#endif /* #ifndef LangCopyArg */
-
-#ifndef LangDoCallback
-VFUNC(int,LangDoCallback,V_LangDoCallback,_ANSI_ARGS_((Tcl_Interp *,LangCallback *,int result,int argc,...)))
-#endif /* #ifndef LangDoCallback */
-
-#ifndef LangDumpVec
-VFUNC(void,LangDumpVec,V_LangDumpVec,_ANSI_ARGS_((CONST char *tag, int argc, Tcl_Obj **vec)))
-#endif /* #ifndef LangDumpVec */
-
-#ifndef LangEventHook
-VFUNC(int,LangEventHook,V_LangEventHook,_ANSI_ARGS_((int flags)))
-#endif /* #ifndef LangEventHook */
-
-#ifndef LangFontRank
-VFUNC(unsigned int,LangFontRank,V_LangFontRank,_ANSI_ARGS_((unsigned int suggested,
- int ch, CONST char *gotName,
- CONST char *wantFoundary,
- CONST struct TkFontAttributes *wantAttrib,
- CONST char *wantEncoding,
- CONST char *gotFoundary,
- CONST struct TkFontAttributes *gotAttrib,
- CONST char *gotEncoding)))
-#endif /* #ifndef LangFontRank */
-
-#ifndef LangFreeArg
-VFUNC(void,LangFreeArg,V_LangFreeArg,_ANSI_ARGS_((Tcl_Obj *,Tcl_FreeProc *freeProc)))
-#endif /* #ifndef LangFreeArg */
-
-#ifndef LangFreeVar
-VFUNC(void,LangFreeVar,V_LangFreeVar,_ANSI_ARGS_((Var)))
-#endif /* #ifndef LangFreeVar */
-
-#ifndef LangLibraryDir
-VFUNC(char *,LangLibraryDir,V_LangLibraryDir,_ANSI_ARGS_((void)))
-#endif /* #ifndef LangLibraryDir */
-
-#ifndef LangMethodCall
-VFUNC(int,LangMethodCall,V_LangMethodCall,_ANSI_ARGS_((Tcl_Interp *,Tcl_Obj *,char *,int result,int argc,...)))
-#endif /* #ifndef LangMethodCall */
-
-#ifndef LangNull
-VFUNC(int,LangNull,V_LangNull,_ANSI_ARGS_((Tcl_Obj *)))
-#endif /* #ifndef LangNull */
-
-#ifndef LangSaveVar
-VFUNC(int,LangSaveVar,V_LangSaveVar,_ANSI_ARGS_((Tcl_Interp *,Tcl_Obj *,Var *,int type)))
-#endif /* #ifndef LangSaveVar */
-
-#ifndef LangSetDefault
-VFUNC(void,LangSetDefault,V_LangSetDefault,_ANSI_ARGS_((Tcl_Obj **,CONST char *)))
-#endif /* #ifndef LangSetDefault */
-
-#ifndef LangSetDouble
-VFUNC(void,LangSetDouble,V_LangSetDouble,_ANSI_ARGS_((Tcl_Obj **,double)))
-#endif /* #ifndef LangSetDouble */
-
-#ifndef LangSetInt
-VFUNC(void,LangSetInt,V_LangSetInt,_ANSI_ARGS_((Tcl_Obj **,int)))
-#endif /* #ifndef LangSetInt */
-
-#ifndef LangSetObj
-VFUNC(void,LangSetObj,V_LangSetObj,_ANSI_ARGS_((Tcl_Obj **,Tcl_Obj *)))
-#endif /* #ifndef LangSetObj */
-
-#ifndef LangSetString
-VFUNC(void,LangSetString,V_LangSetString,_ANSI_ARGS_((Tcl_Obj **,CONST char *)))
-#endif /* #ifndef LangSetString */
-
-#ifndef LangSetVar
-VFUNC(void,LangSetVar,V_LangSetVar,_ANSI_ARGS_((Tcl_Obj **,Var)))
-#endif /* #ifndef LangSetVar */
-
-#ifndef Lang_BuildInImages
-VFUNC(void,Lang_BuildInImages,V_Lang_BuildInImages,_ANSI_ARGS_((void)))
-#endif /* #ifndef Lang_BuildInImages */
-
-#ifndef Lang_CallWithArgs
-VFUNC(int,Lang_CallWithArgs,V_Lang_CallWithArgs,_ANSI_ARGS_((Tcl_Interp *interp,
- char *sub, int argc, Tcl_Obj *CONST *argv)))
-#endif /* #ifndef Lang_CallWithArgs */
-
-#ifndef Lang_CreateEncoding
-VFUNC(Tcl_Encoding,Lang_CreateEncoding,V_Lang_CreateEncoding,_ANSI_ARGS_((
- CONST char *encodingName,
- Tcl_EncodingConvertProc *toUtfProc,
- Tcl_EncodingConvertProc *fromUtfProc,
- Tcl_EncodingFreeProc *freeProc,
- ClientData clientData,
- int nullSize)))
-#endif /* #ifndef Lang_CreateEncoding */
-
-#ifndef Lang_CreateObject
-VFUNC(Tcl_Command,Lang_CreateObject,V_Lang_CreateObject,_ANSI_ARGS_((Tcl_Interp *interp,
- char *cmdName, Tcl_ObjCmdProc *proc,
- ClientData clientData,
- Tcl_CmdDeleteProc *deleteProc)))
-#endif /* #ifndef Lang_CreateObject */
-
-#ifndef Lang_DeleteObject
-VFUNC(void,Lang_DeleteObject,V_Lang_DeleteObject,_ANSI_ARGS_((Tcl_Interp *,Tcl_Command)))
-#endif /* #ifndef Lang_DeleteObject */
-
-#ifndef Lang_FreeRegExp
-VFUNC(void,Lang_FreeRegExp,V_Lang_FreeRegExp,_ANSI_ARGS_((Tcl_RegExp re)))
-#endif /* #ifndef Lang_FreeRegExp */
-
-#ifndef Lang_GetErrorCode
-VFUNC(char *,Lang_GetErrorCode,V_Lang_GetErrorCode,_ANSI_ARGS_((Tcl_Interp *interp)))
-#endif /* #ifndef Lang_GetErrorCode */
-
-#ifndef Lang_GetErrorInfo
-VFUNC(char *,Lang_GetErrorInfo,V_Lang_GetErrorInfo,_ANSI_ARGS_((Tcl_Interp *interp)))
-#endif /* #ifndef Lang_GetErrorInfo */
-
-#ifndef Lang_SetBinaryResult
-VFUNC(void,Lang_SetBinaryResult,V_Lang_SetBinaryResult,_ANSI_ARGS_((Tcl_Interp *interp,
- char *string, int len, Tcl_FreeProc *freeProc)))
-#endif /* #ifndef Lang_SetBinaryResult */
-
-#ifndef Lang_SetErrorCode
-VFUNC(void,Lang_SetErrorCode,V_Lang_SetErrorCode,_ANSI_ARGS_((Tcl_Interp *interp,char *code)))
-#endif /* #ifndef Lang_SetErrorCode */
-
-#ifndef Lang_TraceVar
-VFUNC(int,Lang_TraceVar,V_Lang_TraceVar,_ANSI_ARGS_((Tcl_Interp * interp,
- Tcl_Obj *varRef, int flags,
- Lang_VarTraceProc * proc,
- ClientData clientData)))
-#endif /* #ifndef Lang_TraceVar */
-
-#ifndef Lang_UntraceVar
-VFUNC(void,Lang_UntraceVar,V_Lang_UntraceVar,_ANSI_ARGS_((Tcl_Interp * interp,
- Tcl_Obj * varRef, int flags,
- Lang_VarTraceProc * proc,
- ClientData clientData)))
-#endif /* #ifndef Lang_UntraceVar */
-
-#ifndef TclObjGetType
-VFUNC(Tcl_ObjType *,TclObjGetType,V_TclObjGetType,_ANSI_ARGS_((Tcl_Obj *objPtr)))
-#endif /* #ifndef TclObjGetType */
-
-#ifndef TclObjInternal
-VFUNC(Tcl_InternalRep *,TclObjInternal,V_TclObjInternal,_ANSI_ARGS_((Tcl_Obj *objPtr)))
-#endif /* #ifndef TclObjInternal */
-
-#ifndef TclObjLength
-VFUNC(int,TclObjLength,V_TclObjLength,_ANSI_ARGS_((Tcl_Obj *objPtr)))
-#endif /* #ifndef TclObjLength */
-
-#ifndef TclObjSetType
-VFUNC(void,TclObjSetType,V_TclObjSetType,_ANSI_ARGS_((Tcl_Obj *objPtr,Tcl_ObjType *newType)))
-#endif /* #ifndef TclObjSetType */
-
-#ifndef Tcl_AfterObjCmd
-VFUNC(int,Tcl_AfterObjCmd,V_Tcl_AfterObjCmd,_ANSI_ARGS_((ClientData clientData,
- Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])))
-#endif /* #ifndef Tcl_AfterObjCmd */
-
-#ifndef Tcl_DStringLength
-VFUNC(int,Tcl_DStringLength,V_Tcl_DStringLength,_ANSI_ARGS_((Tcl_DString *dString)))
-#endif /* #ifndef Tcl_DStringLength */
-
-#ifndef Tcl_DStringValue
-VFUNC(char *,Tcl_DStringValue,V_Tcl_DStringValue,_ANSI_ARGS_((Tcl_DString *dString)))
-#endif /* #ifndef Tcl_DStringValue */
-
-#ifndef Tcl_DecrRefCount
-VFUNC(void,Tcl_DecrRefCount,V_Tcl_DecrRefCount,_ANSI_ARGS_((Tcl_Obj *objPtr)))
-#endif /* #ifndef Tcl_DecrRefCount */
-
-#ifndef Tcl_DoubleResults
-VFUNC(void,Tcl_DoubleResults,V_Tcl_DoubleResults,_ANSI_ARGS_((Tcl_Interp *interp,int,int,...)))
-#endif /* #ifndef Tcl_DoubleResults */
-
-#ifndef Tcl_IncrRefCount
-VFUNC(void,Tcl_IncrRefCount,V_Tcl_IncrRefCount,_ANSI_ARGS_((Tcl_Obj *objPtr)))
-#endif /* #ifndef Tcl_IncrRefCount */
-
-#ifndef Tcl_IntResults
-VFUNC(void,Tcl_IntResults,V_Tcl_IntResults,_ANSI_ARGS_((Tcl_Interp *interp,int,int,...)))
-#endif /* #ifndef Tcl_IntResults */
-
-#ifndef Tcl_IsShared
-VFUNC(int,Tcl_IsShared,V_Tcl_IsShared,_ANSI_ARGS_((Tcl_Obj *objPtr)))
-#endif /* #ifndef Tcl_IsShared */
-
-#ifndef Tcl_SprintfResult
-VFUNC(void,Tcl_SprintfResult,V_Tcl_SprintfResult,_ANSI_ARGS_((Tcl_Interp *,char *,...)))
-#endif /* #ifndef Tcl_SprintfResult */
-
-#ifndef Tk_PropertyCmd
-VFUNC(int,Tk_PropertyCmd,V_Tk_PropertyCmd,_ANSI_ARGS_((ClientData clientData,
- Tcl_Interp *interp, int argc, Tcl_Obj **objv)))
-#endif /* #ifndef Tk_PropertyCmd */
-
-#endif /* _LANG */
+#ifdef _LANG +VVAR(Tcl_ObjCmdProc *,LangOptionCommand,V_LangOptionCommand) +#if !defined(TCL_EVENT_IMPLEMENT) || defined(Var) +VVAR(Tcl_ObjType,tclIntType,V_tclIntType) +#endif /* #if !defined(TCL_EVENT_IMPLEMENT) || defined(Var) */ +#ifndef LangCmpArg +VFUNC(int,LangCmpArg,V_LangCmpArg,_ANSI_ARGS_((CONST Tcl_Obj *,CONST Tcl_Obj *))) +#endif /* #ifndef LangCmpArg */ + +#ifndef LangCmpOpt +VFUNC(int,LangCmpOpt,V_LangCmpOpt,_ANSI_ARGS_((CONST char *opt,CONST char *arg,size_t length))) +#endif /* #ifndef LangCmpOpt */ + +#ifndef LangConfigObj +VFUNC(int,LangConfigObj,V_LangConfigObj,_ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj **save, + Tcl_Obj *obj, int type))) +#endif /* #ifndef LangConfigObj */ + +#ifndef LangCopyArg +VFUNC(Tcl_Obj *,LangCopyArg,V_LangCopyArg,_ANSI_ARGS_((Tcl_Obj *))) +#endif /* #ifndef LangCopyArg */ + +#ifndef LangDoCallback +VFUNC(int,LangDoCallback,V_LangDoCallback,_ANSI_ARGS_((Tcl_Interp *,LangCallback *,int result,int argc,...))) +#endif /* #ifndef LangDoCallback */ + +#ifndef LangDumpVec +VFUNC(void,LangDumpVec,V_LangDumpVec,_ANSI_ARGS_((CONST char *tag, int argc, Tcl_Obj **vec))) +#endif /* #ifndef LangDumpVec */ + +#ifndef LangEventHook +VFUNC(int,LangEventHook,V_LangEventHook,_ANSI_ARGS_((int flags))) +#endif /* #ifndef LangEventHook */ + +#ifndef LangFontRank +VFUNC(unsigned int,LangFontRank,V_LangFontRank,_ANSI_ARGS_((unsigned int suggested, + int ch, CONST char *gotName, + CONST char *wantFoundary, + CONST struct TkFontAttributes *wantAttrib, + CONST char *wantEncoding, + CONST char *gotFoundary, + CONST struct TkFontAttributes *gotAttrib, + CONST char *gotEncoding))) +#endif /* #ifndef LangFontRank */ + +#ifndef LangFreeArg +VFUNC(void,LangFreeArg,V_LangFreeArg,_ANSI_ARGS_((Tcl_Obj *,Tcl_FreeProc *freeProc))) +#endif /* #ifndef LangFreeArg */ + +#ifndef LangFreeVar +VFUNC(void,LangFreeVar,V_LangFreeVar,_ANSI_ARGS_((Var))) +#endif /* #ifndef LangFreeVar */ + +#ifndef LangLibraryDir +VFUNC(char *,LangLibraryDir,V_LangLibraryDir,_ANSI_ARGS_((void))) +#endif /* #ifndef LangLibraryDir */ + +#ifndef LangMethodCall +VFUNC(int,LangMethodCall,V_LangMethodCall,_ANSI_ARGS_((Tcl_Interp *,Tcl_Obj *,char *,int result,int argc,...))) +#endif /* #ifndef LangMethodCall */ + +#ifndef LangNull +VFUNC(int,LangNull,V_LangNull,_ANSI_ARGS_((Tcl_Obj *))) +#endif /* #ifndef LangNull */ + +#ifndef LangSaveVar +VFUNC(int,LangSaveVar,V_LangSaveVar,_ANSI_ARGS_((Tcl_Interp *,Tcl_Obj *,Var *,int type))) +#endif /* #ifndef LangSaveVar */ + +#ifndef LangSetDefault +VFUNC(void,LangSetDefault,V_LangSetDefault,_ANSI_ARGS_((Tcl_Obj **,CONST char *))) +#endif /* #ifndef LangSetDefault */ + +#ifndef LangSetDouble +VFUNC(void,LangSetDouble,V_LangSetDouble,_ANSI_ARGS_((Tcl_Obj **,double))) +#endif /* #ifndef LangSetDouble */ + +#ifndef LangSetInt +VFUNC(void,LangSetInt,V_LangSetInt,_ANSI_ARGS_((Tcl_Obj **,int))) +#endif /* #ifndef LangSetInt */ + +#ifndef LangSetObj +VFUNC(void,LangSetObj,V_LangSetObj,_ANSI_ARGS_((Tcl_Obj **,Tcl_Obj *))) +#endif /* #ifndef LangSetObj */ + +#ifndef LangSetString +VFUNC(void,LangSetString,V_LangSetString,_ANSI_ARGS_((Tcl_Obj **,CONST char *))) +#endif /* #ifndef LangSetString */ + +#ifndef LangSetVar +VFUNC(void,LangSetVar,V_LangSetVar,_ANSI_ARGS_((Tcl_Obj **,Var))) +#endif /* #ifndef LangSetVar */ + +#ifndef Lang_BuildInImages +VFUNC(void,Lang_BuildInImages,V_Lang_BuildInImages,_ANSI_ARGS_((void))) +#endif /* #ifndef Lang_BuildInImages */ + +#ifndef Lang_CallWithArgs +VFUNC(int,Lang_CallWithArgs,V_Lang_CallWithArgs,_ANSI_ARGS_((Tcl_Interp *interp, + char *sub, int argc, Tcl_Obj *CONST *argv))) +#endif /* #ifndef Lang_CallWithArgs */ + +#ifndef Lang_CreateEncoding +VFUNC(Tcl_Encoding,Lang_CreateEncoding,V_Lang_CreateEncoding,_ANSI_ARGS_(( + CONST char *encodingName, + Tcl_EncodingConvertProc *toUtfProc, + Tcl_EncodingConvertProc *fromUtfProc, + Tcl_EncodingFreeProc *freeProc, + ClientData clientData, + int nullSize))) +#endif /* #ifndef Lang_CreateEncoding */ + +#ifndef Lang_CreateObject +VFUNC(Tcl_Command,Lang_CreateObject,V_Lang_CreateObject,_ANSI_ARGS_((Tcl_Interp *interp, + char *cmdName, Tcl_ObjCmdProc *proc, + ClientData clientData, + Tcl_CmdDeleteProc *deleteProc))) +#endif /* #ifndef Lang_CreateObject */ + +#ifndef Lang_DeleteObject +VFUNC(void,Lang_DeleteObject,V_Lang_DeleteObject,_ANSI_ARGS_((Tcl_Interp *,Tcl_Command))) +#endif /* #ifndef Lang_DeleteObject */ + +#ifndef Lang_FreeRegExp +VFUNC(void,Lang_FreeRegExp,V_Lang_FreeRegExp,_ANSI_ARGS_((Tcl_RegExp re))) +#endif /* #ifndef Lang_FreeRegExp */ + +#ifndef Lang_GetErrorCode +VFUNC(char *,Lang_GetErrorCode,V_Lang_GetErrorCode,_ANSI_ARGS_((Tcl_Interp *interp))) +#endif /* #ifndef Lang_GetErrorCode */ + +#ifndef Lang_GetErrorInfo +VFUNC(char *,Lang_GetErrorInfo,V_Lang_GetErrorInfo,_ANSI_ARGS_((Tcl_Interp *interp))) +#endif /* #ifndef Lang_GetErrorInfo */ + +#ifndef Lang_SetBinaryResult +VFUNC(void,Lang_SetBinaryResult,V_Lang_SetBinaryResult,_ANSI_ARGS_((Tcl_Interp *interp, + char *string, int len, Tcl_FreeProc *freeProc))) +#endif /* #ifndef Lang_SetBinaryResult */ + +#ifndef Lang_SetErrorCode +VFUNC(void,Lang_SetErrorCode,V_Lang_SetErrorCode,_ANSI_ARGS_((Tcl_Interp *interp,char *code))) +#endif /* #ifndef Lang_SetErrorCode */ + +#ifndef Lang_TraceVar +VFUNC(int,Lang_TraceVar,V_Lang_TraceVar,_ANSI_ARGS_((Tcl_Interp * interp, + Tcl_Obj *varRef, int flags, + Lang_VarTraceProc * proc, + ClientData clientData))) +#endif /* #ifndef Lang_TraceVar */ + +#ifndef Lang_UntraceVar +VFUNC(void,Lang_UntraceVar,V_Lang_UntraceVar,_ANSI_ARGS_((Tcl_Interp * interp, + Tcl_Obj * varRef, int flags, + Lang_VarTraceProc * proc, + ClientData clientData))) +#endif /* #ifndef Lang_UntraceVar */ + +#ifndef TclObjGetType +VFUNC(Tcl_ObjType *,TclObjGetType,V_TclObjGetType,_ANSI_ARGS_((Tcl_Obj *objPtr))) +#endif /* #ifndef TclObjGetType */ + +#ifndef TclObjInternal +VFUNC(Tcl_InternalRep *,TclObjInternal,V_TclObjInternal,_ANSI_ARGS_((Tcl_Obj *objPtr))) +#endif /* #ifndef TclObjInternal */ + +#ifndef TclObjLength +VFUNC(int,TclObjLength,V_TclObjLength,_ANSI_ARGS_((Tcl_Obj *objPtr))) +#endif /* #ifndef TclObjLength */ + +#ifndef TclObjSetType +VFUNC(void,TclObjSetType,V_TclObjSetType,_ANSI_ARGS_((Tcl_Obj *objPtr,Tcl_ObjType *newType))) +#endif /* #ifndef TclObjSetType */ + +#ifndef Tcl_AfterObjCmd +VFUNC(int,Tcl_AfterObjCmd,V_Tcl_AfterObjCmd,_ANSI_ARGS_((ClientData clientData, + Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]))) +#endif /* #ifndef Tcl_AfterObjCmd */ + +#ifndef Tcl_DStringLength +VFUNC(int,Tcl_DStringLength,V_Tcl_DStringLength,_ANSI_ARGS_((Tcl_DString *dString))) +#endif /* #ifndef Tcl_DStringLength */ + +#ifndef Tcl_DStringValue +VFUNC(char *,Tcl_DStringValue,V_Tcl_DStringValue,_ANSI_ARGS_((Tcl_DString *dString))) +#endif /* #ifndef Tcl_DStringValue */ + +#ifndef Tcl_DecrRefCount +VFUNC(void,Tcl_DecrRefCount,V_Tcl_DecrRefCount,_ANSI_ARGS_((Tcl_Obj *objPtr))) +#endif /* #ifndef Tcl_DecrRefCount */ + +#ifndef Tcl_DoubleResults +VFUNC(void,Tcl_DoubleResults,V_Tcl_DoubleResults,_ANSI_ARGS_((Tcl_Interp *interp,int,int,...))) +#endif /* #ifndef Tcl_DoubleResults */ + +#ifndef Tcl_IncrRefCount +VFUNC(void,Tcl_IncrRefCount,V_Tcl_IncrRefCount,_ANSI_ARGS_((Tcl_Obj *objPtr))) +#endif /* #ifndef Tcl_IncrRefCount */ + +#ifndef Tcl_IntResults +VFUNC(void,Tcl_IntResults,V_Tcl_IntResults,_ANSI_ARGS_((Tcl_Interp *interp,int,int,...))) +#endif /* #ifndef Tcl_IntResults */ + +#ifndef Tcl_IsShared +VFUNC(int,Tcl_IsShared,V_Tcl_IsShared,_ANSI_ARGS_((Tcl_Obj *objPtr))) +#endif /* #ifndef Tcl_IsShared */ + +#ifndef Tcl_SprintfResult +VFUNC(void,Tcl_SprintfResult,V_Tcl_SprintfResult,_ANSI_ARGS_((Tcl_Interp *,char *,...))) +#endif /* #ifndef Tcl_SprintfResult */ + +#ifndef Tk_PropertyCmd +VFUNC(int,Tk_PropertyCmd,V_Tk_PropertyCmd,_ANSI_ARGS_((ClientData clientData, + Tcl_Interp *interp, int argc, Tcl_Obj **objv))) +#endif /* #ifndef Tk_PropertyCmd */ + +#endif /* _LANG */ diff --git a/Master/tlpkg/tlperl/lib/Tk/pTk/Tcl-pTk b/Master/tlpkg/tlperl/lib/Tk/pTk/Tcl-pTk index cc72e16b6c5..424d69e5ec2 100644 --- a/Master/tlpkg/tlperl/lib/Tk/pTk/Tcl-pTk +++ b/Master/tlpkg/tlperl/lib/Tk/pTk/Tcl-pTk @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl -w +#!/usr/bin/perl -w use open IO => ':bytes'; # Avoid UTF-8 issues with some perl5.8.0 (RedHat) use Carp; my $verbose = 0; diff --git a/Master/tlpkg/tlperl/lib/Tk/pTk/Xlib.h b/Master/tlpkg/tlperl/lib/Tk/pTk/Xlib.h index 1cfc929fc71..6645407459b 100644 --- a/Master/tlpkg/tlperl/lib/Tk/pTk/Xlib.h +++ b/Master/tlpkg/tlperl/lib/Tk/pTk/Xlib.h @@ -1,6 +1,7 @@ #ifndef _XLIB #define _XLIB #ifndef _XLIB_H_ +#ifndef _X11_XLIB_H_ extern XFontStruct *XLoadQueryFont _ANSI_ARGS_((Display *, const char *)); extern XModifierKeymap *XGetModifierMapping _ANSI_ARGS_((Display *)); extern XImage *XCreateImage _ANSI_ARGS_((Display *, Visual *, unsigned int, int, int, char *, unsigned int, unsigned int, int, int)); @@ -143,6 +144,7 @@ extern int XFreeFontNames _ANSI_ARGS_((char **)); extern Window XGetSelectionOwner _ANSI_ARGS_((Display *, Atom)); extern int XRectInRegion _ANSI_ARGS_((Region,int,int,unsigned,unsigned)); extern int XSubtractRegion _ANSI_ARGS_((Region, Region, Region)); +#endif /* _X11_XLIB_H_ */ #endif /* _XLIB_H_ */ extern int _XInitImageFuncPtrs _ANSI_ARGS_((XImage *image)); #endif /* _XLIB */ diff --git a/Master/tlpkg/tlperl/lib/Tk/pTk/Xlib.t b/Master/tlpkg/tlperl/lib/Tk/pTk/Xlib.t index 324678aa634..a193fc5e3ee 100644 --- a/Master/tlpkg/tlperl/lib/Tk/pTk/Xlib.t +++ b/Master/tlpkg/tlperl/lib/Tk/pTk/Xlib.t @@ -1,657 +1,657 @@ -#ifdef _XLIB
-#if (defined(__WIN32__) || defined(__PM__)) && !defined(DO_X_EXCLUDE)
-# define DO_X_EXCLUDE
-#endif
-#ifndef DO_X_EXCLUDE
-#ifndef XAllocClassHint
-VFUNC(XClassHint *,XAllocClassHint,V_XAllocClassHint,_ANSI_ARGS_((void)))
-#endif /* #ifndef XAllocClassHint */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef XAllocColor
-VFUNC(int,XAllocColor,V_XAllocColor,_ANSI_ARGS_((Display *, Colormap, XColor *)))
-#endif /* #ifndef XAllocColor */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XAllocNamedColor
-VFUNC(int,XAllocNamedColor,V_XAllocNamedColor,_ANSI_ARGS_((Display *, Colormap, const char *, XColor *, XColor *)))
-#endif /* #ifndef XAllocNamedColor */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XAllocSizeHints
-VFUNC(XSizeHints *,XAllocSizeHints,V_XAllocSizeHints,_ANSI_ARGS_((void)))
-#endif /* #ifndef XAllocSizeHints */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef XBell
-VFUNC(int,XBell,V_XBell,_ANSI_ARGS_((Display *, int)))
-#endif /* #ifndef XBell */
-
-#ifndef XChangeGC
-VFUNC(int,XChangeGC,V_XChangeGC,_ANSI_ARGS_(( Display*, GC, unsigned long, XGCValues *)))
-#endif /* #ifndef XChangeGC */
-
-#ifndef XChangeProperty
-VFUNC(int,XChangeProperty,V_XChangeProperty,_ANSI_ARGS_((Display *, Window, Atom, Atom, int, int, const unsigned char *, int)))
-#endif /* #ifndef XChangeProperty */
-
-#ifndef XChangeWindowAttributes
-VFUNC(int,XChangeWindowAttributes,V_XChangeWindowAttributes,_ANSI_ARGS_((Display *, Window, long unsigned int, XSetWindowAttributes *)))
-#endif /* #ifndef XChangeWindowAttributes */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XCheckIfEvent
-VFUNC(int,XCheckIfEvent,V_XCheckIfEvent,_ANSI_ARGS_((Display *, XEvent *, int (*) (Display *, XEvent *, char *), char *)))
-#endif /* #ifndef XCheckIfEvent */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XCheckWindowEvent
-VFUNC(int,XCheckWindowEvent,V_XCheckWindowEvent,_ANSI_ARGS_((Display *, Window, long int, XEvent *)))
-#endif /* #ifndef XCheckWindowEvent */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef XClearWindow
-VFUNC(int,XClearWindow,V_XClearWindow,_ANSI_ARGS_((Display *, Window)))
-#endif /* #ifndef XClearWindow */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XClipBox
-VFUNC(int,XClipBox,V_XClipBox,_ANSI_ARGS_((Region, XRectangle *)))
-#endif /* #ifndef XClipBox */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef XConfigureWindow
-VFUNC(int,XConfigureWindow,V_XConfigureWindow,_ANSI_ARGS_((Display *, Window, unsigned int, XWindowChanges *)))
-#endif /* #ifndef XConfigureWindow */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XConvertSelection
-VFUNC(int,XConvertSelection,V_XConvertSelection,_ANSI_ARGS_((Display *, Atom, Atom, Atom, Window, Time)))
-#endif /* #ifndef XConvertSelection */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef XCopyArea
-VFUNC(int,XCopyArea,V_XCopyArea,_ANSI_ARGS_((Display *, Drawable, Drawable, GC, int, int, unsigned int, unsigned int, int, int)))
-#endif /* #ifndef XCopyArea */
-
-#ifndef XCopyPlane
-VFUNC(int,XCopyPlane,V_XCopyPlane,_ANSI_ARGS_((Display *, Drawable, Drawable, GC, int, int, unsigned int, unsigned int, int, int, long unsigned int)))
-#endif /* #ifndef XCopyPlane */
-
-#ifndef XCreateBitmapFromData
-VFUNC(Pixmap,XCreateBitmapFromData,V_XCreateBitmapFromData,_ANSI_ARGS_((Display *, Drawable, const char *, unsigned int, unsigned int)))
-#endif /* #ifndef XCreateBitmapFromData */
-
-#ifndef XCreateColormap
-VFUNC(Colormap,XCreateColormap,V_XCreateColormap,_ANSI_ARGS_((Display *, Window, Visual *, int)))
-#endif /* #ifndef XCreateColormap */
-
-#ifndef XCreateGC
-VFUNC(GC,XCreateGC,V_XCreateGC,_ANSI_ARGS_((Display *, Drawable, long unsigned int, XGCValues *)))
-#endif /* #ifndef XCreateGC */
-
-#ifndef XCreateGlyphCursor
-VFUNC(Cursor,XCreateGlyphCursor,V_XCreateGlyphCursor,_ANSI_ARGS_((Display *, Font, Font, unsigned int, unsigned int, XColor const *, XColor const *)))
-#endif /* #ifndef XCreateGlyphCursor */
-
-#ifndef XCreateImage
-VFUNC(XImage *,XCreateImage,V_XCreateImage,_ANSI_ARGS_((Display *, Visual *, unsigned int, int, int, char *, unsigned int, unsigned int, int, int)))
-#endif /* #ifndef XCreateImage */
-
-#ifndef XCreatePixmapCursor
-VFUNC(Cursor,XCreatePixmapCursor,V_XCreatePixmapCursor,_ANSI_ARGS_((Display *, Pixmap, Pixmap, XColor *, XColor *, unsigned int, unsigned int)))
-#endif /* #ifndef XCreatePixmapCursor */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XCreateRegion
-VFUNC(Region,XCreateRegion,V_XCreateRegion,_ANSI_ARGS_((void)))
-#endif /* #ifndef XCreateRegion */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XCreateWindow
-VFUNC(Window,XCreateWindow,V_XCreateWindow,_ANSI_ARGS_((Display *, Window, int, int, unsigned int, unsigned int, unsigned int, int, unsigned int, Visual *, long unsigned int, XSetWindowAttributes *)))
-#endif /* #ifndef XCreateWindow */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XDefaultColormap
-VFUNC(Colormap,XDefaultColormap,V_XDefaultColormap,_ANSI_ARGS_((Display *, int)))
-#endif /* #ifndef XDefaultColormap */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XDefaultDepth
-VFUNC(int,XDefaultDepth,V_XDefaultDepth,_ANSI_ARGS_((Display *, int)))
-#endif /* #ifndef XDefaultDepth */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XDefaultScreen
-VFUNC(int,XDefaultScreen,V_XDefaultScreen,_ANSI_ARGS_((Display *)))
-#endif /* #ifndef XDefaultScreen */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XDefaultVisual
-VFUNC(Visual *,XDefaultVisual,V_XDefaultVisual,_ANSI_ARGS_((Display *, int)))
-#endif /* #ifndef XDefaultVisual */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef XDefineCursor
-VFUNC(int,XDefineCursor,V_XDefineCursor,_ANSI_ARGS_((Display *, Window, Cursor)))
-#endif /* #ifndef XDefineCursor */
-
-#ifndef XDeleteProperty
-VFUNC(int,XDeleteProperty,V_XDeleteProperty,_ANSI_ARGS_((Display *, Window, Atom)))
-#endif /* #ifndef XDeleteProperty */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XDestroyRegion
-VFUNC(int,XDestroyRegion,V_XDestroyRegion,_ANSI_ARGS_((Region)))
-#endif /* #ifndef XDestroyRegion */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef XDestroyWindow
-VFUNC(int,XDestroyWindow,V_XDestroyWindow,_ANSI_ARGS_((Display *, Window)))
-#endif /* #ifndef XDestroyWindow */
-
-#ifndef XDrawArc
-VFUNC(int,XDrawArc,V_XDrawArc,_ANSI_ARGS_((Display *, Drawable, GC, int, int, unsigned int, unsigned int, int, int)))
-#endif /* #ifndef XDrawArc */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XDrawImageString
-VFUNC(int,XDrawImageString,V_XDrawImageString,_ANSI_ARGS_((Display *, Drawable, GC, int, int, const char *, int)))
-#endif /* #ifndef XDrawImageString */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef XDrawLine
-VFUNC(int,XDrawLine,V_XDrawLine,_ANSI_ARGS_((Display *, Drawable, GC, int, int, int, int)))
-#endif /* #ifndef XDrawLine */
-
-#ifndef XDrawLines
-VFUNC(int,XDrawLines,V_XDrawLines,_ANSI_ARGS_((Display *, Drawable, GC, XPoint *, int, int)))
-#endif /* #ifndef XDrawLines */
-
-#ifndef XDrawPoints
-VFUNC(int,XDrawPoints,V_XDrawPoints,_ANSI_ARGS_(( Display*, Drawable, GC, XPoint*, int, int)))
-#endif /* #ifndef XDrawPoints */
-
-#ifndef XDrawRectangle
-VFUNC(int,XDrawRectangle,V_XDrawRectangle,_ANSI_ARGS_((Display *, Drawable, GC, int, int, unsigned int, unsigned int)))
-#endif /* #ifndef XDrawRectangle */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XDrawString
-VFUNC(int,XDrawString,V_XDrawString,_ANSI_ARGS_((Display *, Drawable, GC, int, int, const char *, int)))
-#endif /* #ifndef XDrawString */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XEventsQueued
-VFUNC(int,XEventsQueued,V_XEventsQueued,_ANSI_ARGS_((Display *, int)))
-#endif /* #ifndef XEventsQueued */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef XFillArc
-VFUNC(int,XFillArc,V_XFillArc,_ANSI_ARGS_((Display *, Drawable, GC, int, int, unsigned int, unsigned int, int, int)))
-#endif /* #ifndef XFillArc */
-
-#ifndef XFillPolygon
-VFUNC(int,XFillPolygon,V_XFillPolygon,_ANSI_ARGS_((Display *, Drawable, GC, XPoint *, int, int, int)))
-#endif /* #ifndef XFillPolygon */
-
-#ifndef XFillRectangle
-VFUNC(int,XFillRectangle,V_XFillRectangle,_ANSI_ARGS_((Display *, Drawable, GC, int, int, unsigned int, unsigned int)))
-#endif /* #ifndef XFillRectangle */
-
-#ifndef XFillRectangles
-VFUNC(int,XFillRectangles,V_XFillRectangles,_ANSI_ARGS_((Display *, Drawable, GC, XRectangle *, int)))
-#endif /* #ifndef XFillRectangles */
-
-#ifndef XFlush
-VFUNC(int,XFlush,V_XFlush,_ANSI_ARGS_((Display *)))
-#endif /* #ifndef XFlush */
-
-#ifndef XFree
-VFUNC(int,XFree,V_XFree,_ANSI_ARGS_((XFree_arg_t *)))
-#endif /* #ifndef XFree */
-
-#ifndef XFreeColormap
-VFUNC(int,XFreeColormap,V_XFreeColormap,_ANSI_ARGS_((Display *, Colormap)))
-#endif /* #ifndef XFreeColormap */
-
-#ifndef XFreeColors
-VFUNC(int,XFreeColors,V_XFreeColors,_ANSI_ARGS_((Display *, Colormap, long unsigned int *, int, long unsigned int)))
-#endif /* #ifndef XFreeColors */
-
-#ifndef XFreeCursor
-VFUNC(int,XFreeCursor,V_XFreeCursor,_ANSI_ARGS_((Display *, Cursor)))
-#endif /* #ifndef XFreeCursor */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XFreeFont
-VFUNC(int,XFreeFont,V_XFreeFont,_ANSI_ARGS_((Display *, XFontStruct *)))
-#endif /* #ifndef XFreeFont */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XFreeFontNames
-VFUNC(int,XFreeFontNames,V_XFreeFontNames,_ANSI_ARGS_((char **)))
-#endif /* #ifndef XFreeFontNames */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef XFreeGC
-VFUNC(int,XFreeGC,V_XFreeGC,_ANSI_ARGS_((Display *, GC)))
-#endif /* #ifndef XFreeGC */
-
-#ifndef XFreeModifiermap
-VFUNC(int,XFreeModifiermap,V_XFreeModifiermap,_ANSI_ARGS_((XModifierKeymap *)))
-#endif /* #ifndef XFreeModifiermap */
-
-#ifndef XGContextFromGC
-VFUNC(GContext,XGContextFromGC,V_XGContextFromGC,_ANSI_ARGS_((GC)))
-#endif /* #ifndef XGContextFromGC */
-
-#ifndef XGetAtomName
-VFUNC(char *,XGetAtomName,V_XGetAtomName,_ANSI_ARGS_((Display *, Atom)))
-#endif /* #ifndef XGetAtomName */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XGetFontProperty
-VFUNC(int,XGetFontProperty,V_XGetFontProperty,_ANSI_ARGS_((XFontStruct *, Atom, long unsigned int *)))
-#endif /* #ifndef XGetFontProperty */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef XGetGeometry
-VFUNC(int,XGetGeometry,V_XGetGeometry,_ANSI_ARGS_((Display *, Drawable, Window *, int *, int *, unsigned int *, unsigned int *, unsigned int *, unsigned int *)))
-#endif /* #ifndef XGetGeometry */
-
-#ifndef XGetImage
-VFUNC(XImage *,XGetImage,V_XGetImage,_ANSI_ARGS_((Display *, Drawable, int, int, unsigned int, unsigned int, long unsigned int, int)))
-#endif /* #ifndef XGetImage */
-
-#ifndef XGetInputFocus
-VFUNC(int,XGetInputFocus,V_XGetInputFocus,_ANSI_ARGS_((Display *, Window *, int *)))
-#endif /* #ifndef XGetInputFocus */
-
-#ifndef XGetModifierMapping
-VFUNC(XModifierKeymap *,XGetModifierMapping,V_XGetModifierMapping,_ANSI_ARGS_((Display *)))
-#endif /* #ifndef XGetModifierMapping */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XGetSelectionOwner
-VFUNC(Window,XGetSelectionOwner,V_XGetSelectionOwner,_ANSI_ARGS_((Display *, Atom)))
-#endif /* #ifndef XGetSelectionOwner */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef XGetVisualInfo
-VFUNC(XVisualInfo *,XGetVisualInfo,V_XGetVisualInfo,_ANSI_ARGS_((Display *, long int, XVisualInfo *, int *)))
-#endif /* #ifndef XGetVisualInfo */
-
-#ifndef XGetWMColormapWindows
-VFUNC(int,XGetWMColormapWindows,V_XGetWMColormapWindows,_ANSI_ARGS_((Display *, Window, Window **, int *)))
-#endif /* #ifndef XGetWMColormapWindows */
-
-#ifndef XGetWindowAttributes
-VFUNC(int,XGetWindowAttributes,V_XGetWindowAttributes,_ANSI_ARGS_((Display *, Window, XWindowAttributes *)))
-#endif /* #ifndef XGetWindowAttributes */
-
-#ifndef XGetWindowProperty
-VFUNC(int,XGetWindowProperty,V_XGetWindowProperty,_ANSI_ARGS_((Display *, Window, Atom, long int, long int, int, Atom, Atom *, int *, long unsigned int *, long unsigned int *, unsigned char **)))
-#endif /* #ifndef XGetWindowProperty */
-
-#ifndef XGrabKeyboard
-VFUNC(int,XGrabKeyboard,V_XGrabKeyboard,_ANSI_ARGS_((Display *, Window, int, int, int, Time)))
-#endif /* #ifndef XGrabKeyboard */
-
-#ifndef XGrabPointer
-VFUNC(int,XGrabPointer,V_XGrabPointer,_ANSI_ARGS_((Display *, Window, int, unsigned int, int, int, Window, Cursor, Time)))
-#endif /* #ifndef XGrabPointer */
-
-#ifndef XGrabServer
-VFUNC(int,XGrabServer,V_XGrabServer,_ANSI_ARGS_((Display *)))
-#endif /* #ifndef XGrabServer */
-
-#ifndef XIconifyWindow
-VFUNC(int,XIconifyWindow,V_XIconifyWindow,_ANSI_ARGS_((Display *, Window, int)))
-#endif /* #ifndef XIconifyWindow */
-
-#ifndef XInternAtom
-VFUNC(Atom,XInternAtom,V_XInternAtom,_ANSI_ARGS_((Display *, const char *, int)))
-#endif /* #ifndef XInternAtom */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XIntersectRegion
-VFUNC(int,XIntersectRegion,V_XIntersectRegion,_ANSI_ARGS_((Region, Region, Region)))
-#endif /* #ifndef XIntersectRegion */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef XKeycodeToKeysym
-VFUNC(KeySym,XKeycodeToKeysym,V_XKeycodeToKeysym,_ANSI_ARGS_((Display *, unsigned int, int)))
-#endif /* #ifndef XKeycodeToKeysym */
-
-#ifndef XKeysymToString
-VFUNC(char *,XKeysymToString,V_XKeysymToString,_ANSI_ARGS_((KeySym)))
-#endif /* #ifndef XKeysymToString */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XListFonts
-VFUNC(char **,XListFonts,V_XListFonts,_ANSI_ARGS_(( Display*, const char *, int, int *)))
-#endif /* #ifndef XListFonts */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef XListHosts
-VFUNC(XHostAddress *,XListHosts,V_XListHosts,_ANSI_ARGS_((Display *, int *, int *)))
-#endif /* #ifndef XListHosts */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XListProperties
-VFUNC(Atom *,XListProperties,V_XListProperties,_ANSI_ARGS_((Display *, Window, int *)))
-#endif /* #ifndef XListProperties */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XLoadFont
-VFUNC(Font,XLoadFont,V_XLoadFont,_ANSI_ARGS_((Display *, const char *)))
-#endif /* #ifndef XLoadFont */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XLoadQueryFont
-VFUNC(XFontStruct *,XLoadQueryFont,V_XLoadQueryFont,_ANSI_ARGS_((Display *, const char *)))
-#endif /* #ifndef XLoadQueryFont */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef XLookupColor
-VFUNC(int,XLookupColor,V_XLookupColor,_ANSI_ARGS_((Display *, Colormap, const char *, XColor *, XColor *)))
-#endif /* #ifndef XLookupColor */
-
-#ifndef XLookupString
-VFUNC(int,XLookupString,V_XLookupString,_ANSI_ARGS_((XKeyEvent *, char *, int, KeySym *, XComposeStatus *)))
-#endif /* #ifndef XLookupString */
-
-#ifndef XLowerWindow
-VFUNC(int,XLowerWindow,V_XLowerWindow,_ANSI_ARGS_((Display *, Window)))
-#endif /* #ifndef XLowerWindow */
-
-#ifndef XMapWindow
-VFUNC(int,XMapWindow,V_XMapWindow,_ANSI_ARGS_((Display *, Window)))
-#endif /* #ifndef XMapWindow */
-
-#ifndef XMoveResizeWindow
-VFUNC(int,XMoveResizeWindow,V_XMoveResizeWindow,_ANSI_ARGS_((Display *, Window, int, int, unsigned int, unsigned int)))
-#endif /* #ifndef XMoveResizeWindow */
-
-#ifndef XMoveWindow
-VFUNC(int,XMoveWindow,V_XMoveWindow,_ANSI_ARGS_((Display *, Window, int, int)))
-#endif /* #ifndef XMoveWindow */
-
-#ifndef XNextEvent
-VFUNC(int,XNextEvent,V_XNextEvent,_ANSI_ARGS_((Display *, XEvent *)))
-#endif /* #ifndef XNextEvent */
-
-#ifndef XNoOp
-VFUNC(int,XNoOp,V_XNoOp,_ANSI_ARGS_((Display *)))
-#endif /* #ifndef XNoOp */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XOpenDisplay
-VFUNC(Display *,XOpenDisplay,V_XOpenDisplay,_ANSI_ARGS_((const char *)))
-#endif /* #ifndef XOpenDisplay */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef XParseColor
-VFUNC(int,XParseColor,V_XParseColor,_ANSI_ARGS_((Display *, Colormap, const char *, XColor *)))
-#endif /* #ifndef XParseColor */
-
-#ifndef XPutBackEvent
-VFUNC(int,XPutBackEvent,V_XPutBackEvent,_ANSI_ARGS_((Display *, XEvent *)))
-#endif /* #ifndef XPutBackEvent */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XPutImage
-VFUNC(int,XPutImage,V_XPutImage,_ANSI_ARGS_((Display *, Drawable, GC, XImage *, int, int, int, int, unsigned int, unsigned int)))
-#endif /* #ifndef XPutImage */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef XQueryColors
-VFUNC(int,XQueryColors,V_XQueryColors,_ANSI_ARGS_((Display *, Colormap, XColor *, int)))
-#endif /* #ifndef XQueryColors */
-
-#ifndef XQueryPointer
-VFUNC(int,XQueryPointer,V_XQueryPointer,_ANSI_ARGS_((Display *, Window, Window *, Window *, int *, int *, int *, int *, unsigned int *)))
-#endif /* #ifndef XQueryPointer */
-
-#ifndef XQueryTree
-VFUNC(int,XQueryTree,V_XQueryTree,_ANSI_ARGS_((Display *, Window, Window *, Window *, Window **, unsigned int *)))
-#endif /* #ifndef XQueryTree */
-
-#ifndef XRaiseWindow
-VFUNC(int,XRaiseWindow,V_XRaiseWindow,_ANSI_ARGS_((Display *, Window)))
-#endif /* #ifndef XRaiseWindow */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XReadBitmapFile
-VFUNC(int,XReadBitmapFile,V_XReadBitmapFile,_ANSI_ARGS_((Display *, Drawable, const char *, unsigned int *, unsigned int *, Pixmap *, int *, int *)))
-#endif /* #ifndef XReadBitmapFile */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef XRectInRegion
-VFUNC(int,XRectInRegion,V_XRectInRegion,_ANSI_ARGS_((Region,int,int,unsigned,unsigned)))
-#endif /* #ifndef XRectInRegion */
-
-#ifndef XRefreshKeyboardMapping
-VFUNC(int,XRefreshKeyboardMapping,V_XRefreshKeyboardMapping,_ANSI_ARGS_((XMappingEvent *)))
-#endif /* #ifndef XRefreshKeyboardMapping */
-
-#ifndef XResizeWindow
-VFUNC(int,XResizeWindow,V_XResizeWindow,_ANSI_ARGS_((Display *, Window, unsigned int, unsigned int)))
-#endif /* #ifndef XResizeWindow */
-
-#ifndef XRootWindow
-VFUNC(Window,XRootWindow,V_XRootWindow,_ANSI_ARGS_((Display *, int)))
-#endif /* #ifndef XRootWindow */
-
-#ifndef XSelectInput
-VFUNC(int,XSelectInput,V_XSelectInput,_ANSI_ARGS_((Display *, Window, long int)))
-#endif /* #ifndef XSelectInput */
-
-#ifndef XSendEvent
-VFUNC(int,XSendEvent,V_XSendEvent,_ANSI_ARGS_((Display *, Window, int, long int, XEvent *)))
-#endif /* #ifndef XSendEvent */
-
-#ifndef XSetBackground
-VFUNC(int,XSetBackground,V_XSetBackground,_ANSI_ARGS_((Display *, GC, unsigned long)))
-#endif /* #ifndef XSetBackground */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XSetClassHint
-VFUNC(int,XSetClassHint,V_XSetClassHint,_ANSI_ARGS_((Display *, Window, XClassHint *)))
-#endif /* #ifndef XSetClassHint */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef XSetClipMask
-VFUNC(int,XSetClipMask,V_XSetClipMask,_ANSI_ARGS_((Display *, GC, Pixmap)))
-#endif /* #ifndef XSetClipMask */
-
-#ifndef XSetClipOrigin
-VFUNC(int,XSetClipOrigin,V_XSetClipOrigin,_ANSI_ARGS_((Display *, GC, int, int)))
-#endif /* #ifndef XSetClipOrigin */
-
-#ifndef XSetCommand
-VFUNC(int,XSetCommand,V_XSetCommand,_ANSI_ARGS_((Display *, Window, char **, int)))
-#endif /* #ifndef XSetCommand */
-
-#ifndef XSetDashes
-VFUNC(int,XSetDashes,V_XSetDashes,_ANSI_ARGS_((Display *, GC, int, const char *, int)))
-#endif /* #ifndef XSetDashes */
-
-#ifndef XSetErrorHandler
-VFUNC(XErrorHandler,XSetErrorHandler,V_XSetErrorHandler,_ANSI_ARGS_((XErrorHandler)))
-#endif /* #ifndef XSetErrorHandler */
-
-#ifndef XSetForeground
-VFUNC(int,XSetForeground,V_XSetForeground,_ANSI_ARGS_((Display *, GC, long unsigned int)))
-#endif /* #ifndef XSetForeground */
-
-#ifndef XSetIconName
-VFUNC(int,XSetIconName,V_XSetIconName,_ANSI_ARGS_((Display *, Window, const char *)))
-#endif /* #ifndef XSetIconName */
-
-#ifndef XSetInputFocus
-VFUNC(int,XSetInputFocus,V_XSetInputFocus,_ANSI_ARGS_((Display *, Window, int, Time)))
-#endif /* #ifndef XSetInputFocus */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XSetRegion
-VFUNC(int,XSetRegion,V_XSetRegion,_ANSI_ARGS_((Display *, GC, Region)))
-#endif /* #ifndef XSetRegion */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef XSetSelectionOwner
-VFUNC(int,XSetSelectionOwner,V_XSetSelectionOwner,_ANSI_ARGS_((Display *, Atom, Window, Time)))
-#endif /* #ifndef XSetSelectionOwner */
-
-#ifndef XSetTSOrigin
-VFUNC(int,XSetTSOrigin,V_XSetTSOrigin,_ANSI_ARGS_((Display *, GC, int, int)))
-#endif /* #ifndef XSetTSOrigin */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XSetTransientForHint
-VFUNC(int,XSetTransientForHint,V_XSetTransientForHint,_ANSI_ARGS_((Display *, Window, Window)))
-#endif /* #ifndef XSetTransientForHint */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef XSetWMClientMachine
-VFUNC(void,XSetWMClientMachine,V_XSetWMClientMachine,_ANSI_ARGS_((Display *, Window, XTextProperty *)))
-#endif /* #ifndef XSetWMClientMachine */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XSetWMColormapWindows
-VFUNC(int,XSetWMColormapWindows,V_XSetWMColormapWindows,_ANSI_ARGS_((Display *, Window, Window *, int)))
-#endif /* #ifndef XSetWMColormapWindows */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XSetWMHints
-VFUNC(int,XSetWMHints,V_XSetWMHints,_ANSI_ARGS_((Display *, Window, XWMHints *)))
-#endif /* #ifndef XSetWMHints */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XSetWMName
-VFUNC(void,XSetWMName,V_XSetWMName,_ANSI_ARGS_((Display *, Window, XTextProperty *)))
-#endif /* #ifndef XSetWMName */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XSetWMNormalHints
-VFUNC(void,XSetWMNormalHints,V_XSetWMNormalHints,_ANSI_ARGS_((Display *, Window, XSizeHints *)))
-#endif /* #ifndef XSetWMNormalHints */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef XSetWindowBackground
-VFUNC(int,XSetWindowBackground,V_XSetWindowBackground,_ANSI_ARGS_((Display *, Window, long unsigned int)))
-#endif /* #ifndef XSetWindowBackground */
-
-#ifndef XSetWindowBackgroundPixmap
-VFUNC(int,XSetWindowBackgroundPixmap,V_XSetWindowBackgroundPixmap,_ANSI_ARGS_((Display *, Window, Pixmap)))
-#endif /* #ifndef XSetWindowBackgroundPixmap */
-
-#ifndef XSetWindowBorder
-VFUNC(int,XSetWindowBorder,V_XSetWindowBorder,_ANSI_ARGS_((Display *, Window, long unsigned int)))
-#endif /* #ifndef XSetWindowBorder */
-
-#ifndef XSetWindowBorderPixmap
-VFUNC(int,XSetWindowBorderPixmap,V_XSetWindowBorderPixmap,_ANSI_ARGS_((Display *, Window, Pixmap)))
-#endif /* #ifndef XSetWindowBorderPixmap */
-
-#ifndef XSetWindowBorderWidth
-VFUNC(int,XSetWindowBorderWidth,V_XSetWindowBorderWidth,_ANSI_ARGS_((Display *, Window, unsigned int)))
-#endif /* #ifndef XSetWindowBorderWidth */
-
-#ifndef XSetWindowColormap
-VFUNC(int,XSetWindowColormap,V_XSetWindowColormap,_ANSI_ARGS_((Display *, Window, Colormap)))
-#endif /* #ifndef XSetWindowColormap */
-
-#ifndef XStringListToTextProperty
-VFUNC(int,XStringListToTextProperty,V_XStringListToTextProperty,_ANSI_ARGS_((char **, int, XTextProperty *)))
-#endif /* #ifndef XStringListToTextProperty */
-
-#ifndef XStringToKeysym
-VFUNC(KeySym,XStringToKeysym,V_XStringToKeysym,_ANSI_ARGS_((const char *)))
-#endif /* #ifndef XStringToKeysym */
-
-#ifndef XSubtractRegion
-VFUNC(int,XSubtractRegion,V_XSubtractRegion,_ANSI_ARGS_((Region, Region, Region)))
-#endif /* #ifndef XSubtractRegion */
-
-#ifndef XSync
-VFUNC(int,XSync,V_XSync,_ANSI_ARGS_((Display *, int)))
-#endif /* #ifndef XSync */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XTextExtents
-VFUNC(int,XTextExtents,V_XTextExtents,_ANSI_ARGS_((XFontStruct *, const char *, int, int *, int *, int *, XCharStruct *)))
-#endif /* #ifndef XTextExtents */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XTextWidth
-VFUNC(int,XTextWidth,V_XTextWidth,_ANSI_ARGS_((XFontStruct *, const char *, int)))
-#endif /* #ifndef XTextWidth */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef XTranslateCoordinates
-VFUNC(int,XTranslateCoordinates,V_XTranslateCoordinates,_ANSI_ARGS_((Display *, Window, Window, int, int, int *, int *, Window *)))
-#endif /* #ifndef XTranslateCoordinates */
-
-#ifndef XUngrabKeyboard
-VFUNC(int,XUngrabKeyboard,V_XUngrabKeyboard,_ANSI_ARGS_((Display *, Time)))
-#endif /* #ifndef XUngrabKeyboard */
-
-#ifndef XUngrabPointer
-VFUNC(int,XUngrabPointer,V_XUngrabPointer,_ANSI_ARGS_((Display *, Time)))
-#endif /* #ifndef XUngrabPointer */
-
-#ifndef XUngrabServer
-VFUNC(int,XUngrabServer,V_XUngrabServer,_ANSI_ARGS_((Display *)))
-#endif /* #ifndef XUngrabServer */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XUnionRectWithRegion
-VFUNC(int,XUnionRectWithRegion,V_XUnionRectWithRegion,_ANSI_ARGS_((XRectangle *, Region, Region)))
-#endif /* #ifndef XUnionRectWithRegion */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef XUnmapWindow
-VFUNC(int,XUnmapWindow,V_XUnmapWindow,_ANSI_ARGS_((Display *, Window)))
-#endif /* #ifndef XUnmapWindow */
-
-#ifndef XVisualIDFromVisual
-VFUNC(VisualID,XVisualIDFromVisual,V_XVisualIDFromVisual,_ANSI_ARGS_((Visual *)))
-#endif /* #ifndef XVisualIDFromVisual */
-
-#ifndef DO_X_EXCLUDE
-#ifndef XWarpPointer
-VFUNC(int,XWarpPointer,V_XWarpPointer,_ANSI_ARGS_(( Display *, Window, Window, int, int, unsigned int, unsigned int, int, int )))
-#endif /* #ifndef XWarpPointer */
-#endif /* !DO_X_EXCLUDE */
-
-#ifndef XWindowEvent
-VFUNC(int,XWindowEvent,V_XWindowEvent,_ANSI_ARGS_((Display *, Window, long int, XEvent *)))
-#endif /* #ifndef XWindowEvent */
-
-#ifndef XWithdrawWindow
-VFUNC(int,XWithdrawWindow,V_XWithdrawWindow,_ANSI_ARGS_((Display *, Window, int)))
-#endif /* #ifndef XWithdrawWindow */
-
-#ifndef _XInitImageFuncPtrs
-VFUNC(int,_XInitImageFuncPtrs,V__XInitImageFuncPtrs,_ANSI_ARGS_((XImage *image)))
-#endif /* #ifndef _XInitImageFuncPtrs */
-
-#endif /* _XLIB */
+#ifdef _XLIB +#if (defined(__WIN32__) || defined(__PM__)) && !defined(DO_X_EXCLUDE) +# define DO_X_EXCLUDE +#endif +#ifndef DO_X_EXCLUDE +#ifndef XAllocClassHint +VFUNC(XClassHint *,XAllocClassHint,V_XAllocClassHint,_ANSI_ARGS_((void))) +#endif /* #ifndef XAllocClassHint */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef XAllocColor +VFUNC(int,XAllocColor,V_XAllocColor,_ANSI_ARGS_((Display *, Colormap, XColor *))) +#endif /* #ifndef XAllocColor */ + +#ifndef DO_X_EXCLUDE +#ifndef XAllocNamedColor +VFUNC(int,XAllocNamedColor,V_XAllocNamedColor,_ANSI_ARGS_((Display *, Colormap, const char *, XColor *, XColor *))) +#endif /* #ifndef XAllocNamedColor */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef DO_X_EXCLUDE +#ifndef XAllocSizeHints +VFUNC(XSizeHints *,XAllocSizeHints,V_XAllocSizeHints,_ANSI_ARGS_((void))) +#endif /* #ifndef XAllocSizeHints */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef XBell +VFUNC(int,XBell,V_XBell,_ANSI_ARGS_((Display *, int))) +#endif /* #ifndef XBell */ + +#ifndef XChangeGC +VFUNC(int,XChangeGC,V_XChangeGC,_ANSI_ARGS_(( Display*, GC, unsigned long, XGCValues *))) +#endif /* #ifndef XChangeGC */ + +#ifndef XChangeProperty +VFUNC(int,XChangeProperty,V_XChangeProperty,_ANSI_ARGS_((Display *, Window, Atom, Atom, int, int, const unsigned char *, int))) +#endif /* #ifndef XChangeProperty */ + +#ifndef XChangeWindowAttributes +VFUNC(int,XChangeWindowAttributes,V_XChangeWindowAttributes,_ANSI_ARGS_((Display *, Window, long unsigned int, XSetWindowAttributes *))) +#endif /* #ifndef XChangeWindowAttributes */ + +#ifndef DO_X_EXCLUDE +#ifndef XCheckIfEvent +VFUNC(int,XCheckIfEvent,V_XCheckIfEvent,_ANSI_ARGS_((Display *, XEvent *, int (*) (Display *, XEvent *, char *), char *))) +#endif /* #ifndef XCheckIfEvent */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef DO_X_EXCLUDE +#ifndef XCheckWindowEvent +VFUNC(int,XCheckWindowEvent,V_XCheckWindowEvent,_ANSI_ARGS_((Display *, Window, long int, XEvent *))) +#endif /* #ifndef XCheckWindowEvent */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef XClearWindow +VFUNC(int,XClearWindow,V_XClearWindow,_ANSI_ARGS_((Display *, Window))) +#endif /* #ifndef XClearWindow */ + +#ifndef DO_X_EXCLUDE +#ifndef XClipBox +VFUNC(int,XClipBox,V_XClipBox,_ANSI_ARGS_((Region, XRectangle *))) +#endif /* #ifndef XClipBox */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef XConfigureWindow +VFUNC(int,XConfigureWindow,V_XConfigureWindow,_ANSI_ARGS_((Display *, Window, unsigned int, XWindowChanges *))) +#endif /* #ifndef XConfigureWindow */ + +#ifndef DO_X_EXCLUDE +#ifndef XConvertSelection +VFUNC(int,XConvertSelection,V_XConvertSelection,_ANSI_ARGS_((Display *, Atom, Atom, Atom, Window, Time))) +#endif /* #ifndef XConvertSelection */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef XCopyArea +VFUNC(int,XCopyArea,V_XCopyArea,_ANSI_ARGS_((Display *, Drawable, Drawable, GC, int, int, unsigned int, unsigned int, int, int))) +#endif /* #ifndef XCopyArea */ + +#ifndef XCopyPlane +VFUNC(int,XCopyPlane,V_XCopyPlane,_ANSI_ARGS_((Display *, Drawable, Drawable, GC, int, int, unsigned int, unsigned int, int, int, long unsigned int))) +#endif /* #ifndef XCopyPlane */ + +#ifndef XCreateBitmapFromData +VFUNC(Pixmap,XCreateBitmapFromData,V_XCreateBitmapFromData,_ANSI_ARGS_((Display *, Drawable, const char *, unsigned int, unsigned int))) +#endif /* #ifndef XCreateBitmapFromData */ + +#ifndef XCreateColormap +VFUNC(Colormap,XCreateColormap,V_XCreateColormap,_ANSI_ARGS_((Display *, Window, Visual *, int))) +#endif /* #ifndef XCreateColormap */ + +#ifndef XCreateGC +VFUNC(GC,XCreateGC,V_XCreateGC,_ANSI_ARGS_((Display *, Drawable, long unsigned int, XGCValues *))) +#endif /* #ifndef XCreateGC */ + +#ifndef XCreateGlyphCursor +VFUNC(Cursor,XCreateGlyphCursor,V_XCreateGlyphCursor,_ANSI_ARGS_((Display *, Font, Font, unsigned int, unsigned int, XColor const *, XColor const *))) +#endif /* #ifndef XCreateGlyphCursor */ + +#ifndef XCreateImage +VFUNC(XImage *,XCreateImage,V_XCreateImage,_ANSI_ARGS_((Display *, Visual *, unsigned int, int, int, char *, unsigned int, unsigned int, int, int))) +#endif /* #ifndef XCreateImage */ + +#ifndef XCreatePixmapCursor +VFUNC(Cursor,XCreatePixmapCursor,V_XCreatePixmapCursor,_ANSI_ARGS_((Display *, Pixmap, Pixmap, XColor *, XColor *, unsigned int, unsigned int))) +#endif /* #ifndef XCreatePixmapCursor */ + +#ifndef DO_X_EXCLUDE +#ifndef XCreateRegion +VFUNC(Region,XCreateRegion,V_XCreateRegion,_ANSI_ARGS_((void))) +#endif /* #ifndef XCreateRegion */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef DO_X_EXCLUDE +#ifndef XCreateWindow +VFUNC(Window,XCreateWindow,V_XCreateWindow,_ANSI_ARGS_((Display *, Window, int, int, unsigned int, unsigned int, unsigned int, int, unsigned int, Visual *, long unsigned int, XSetWindowAttributes *))) +#endif /* #ifndef XCreateWindow */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef DO_X_EXCLUDE +#ifndef XDefaultColormap +VFUNC(Colormap,XDefaultColormap,V_XDefaultColormap,_ANSI_ARGS_((Display *, int))) +#endif /* #ifndef XDefaultColormap */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef DO_X_EXCLUDE +#ifndef XDefaultDepth +VFUNC(int,XDefaultDepth,V_XDefaultDepth,_ANSI_ARGS_((Display *, int))) +#endif /* #ifndef XDefaultDepth */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef DO_X_EXCLUDE +#ifndef XDefaultScreen +VFUNC(int,XDefaultScreen,V_XDefaultScreen,_ANSI_ARGS_((Display *))) +#endif /* #ifndef XDefaultScreen */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef DO_X_EXCLUDE +#ifndef XDefaultVisual +VFUNC(Visual *,XDefaultVisual,V_XDefaultVisual,_ANSI_ARGS_((Display *, int))) +#endif /* #ifndef XDefaultVisual */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef XDefineCursor +VFUNC(int,XDefineCursor,V_XDefineCursor,_ANSI_ARGS_((Display *, Window, Cursor))) +#endif /* #ifndef XDefineCursor */ + +#ifndef XDeleteProperty +VFUNC(int,XDeleteProperty,V_XDeleteProperty,_ANSI_ARGS_((Display *, Window, Atom))) +#endif /* #ifndef XDeleteProperty */ + +#ifndef DO_X_EXCLUDE +#ifndef XDestroyRegion +VFUNC(int,XDestroyRegion,V_XDestroyRegion,_ANSI_ARGS_((Region))) +#endif /* #ifndef XDestroyRegion */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef XDestroyWindow +VFUNC(int,XDestroyWindow,V_XDestroyWindow,_ANSI_ARGS_((Display *, Window))) +#endif /* #ifndef XDestroyWindow */ + +#ifndef XDrawArc +VFUNC(int,XDrawArc,V_XDrawArc,_ANSI_ARGS_((Display *, Drawable, GC, int, int, unsigned int, unsigned int, int, int))) +#endif /* #ifndef XDrawArc */ + +#ifndef DO_X_EXCLUDE +#ifndef XDrawImageString +VFUNC(int,XDrawImageString,V_XDrawImageString,_ANSI_ARGS_((Display *, Drawable, GC, int, int, const char *, int))) +#endif /* #ifndef XDrawImageString */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef XDrawLine +VFUNC(int,XDrawLine,V_XDrawLine,_ANSI_ARGS_((Display *, Drawable, GC, int, int, int, int))) +#endif /* #ifndef XDrawLine */ + +#ifndef XDrawLines +VFUNC(int,XDrawLines,V_XDrawLines,_ANSI_ARGS_((Display *, Drawable, GC, XPoint *, int, int))) +#endif /* #ifndef XDrawLines */ + +#ifndef XDrawPoints +VFUNC(int,XDrawPoints,V_XDrawPoints,_ANSI_ARGS_(( Display*, Drawable, GC, XPoint*, int, int))) +#endif /* #ifndef XDrawPoints */ + +#ifndef XDrawRectangle +VFUNC(int,XDrawRectangle,V_XDrawRectangle,_ANSI_ARGS_((Display *, Drawable, GC, int, int, unsigned int, unsigned int))) +#endif /* #ifndef XDrawRectangle */ + +#ifndef DO_X_EXCLUDE +#ifndef XDrawString +VFUNC(int,XDrawString,V_XDrawString,_ANSI_ARGS_((Display *, Drawable, GC, int, int, const char *, int))) +#endif /* #ifndef XDrawString */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef DO_X_EXCLUDE +#ifndef XEventsQueued +VFUNC(int,XEventsQueued,V_XEventsQueued,_ANSI_ARGS_((Display *, int))) +#endif /* #ifndef XEventsQueued */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef XFillArc +VFUNC(int,XFillArc,V_XFillArc,_ANSI_ARGS_((Display *, Drawable, GC, int, int, unsigned int, unsigned int, int, int))) +#endif /* #ifndef XFillArc */ + +#ifndef XFillPolygon +VFUNC(int,XFillPolygon,V_XFillPolygon,_ANSI_ARGS_((Display *, Drawable, GC, XPoint *, int, int, int))) +#endif /* #ifndef XFillPolygon */ + +#ifndef XFillRectangle +VFUNC(int,XFillRectangle,V_XFillRectangle,_ANSI_ARGS_((Display *, Drawable, GC, int, int, unsigned int, unsigned int))) +#endif /* #ifndef XFillRectangle */ + +#ifndef XFillRectangles +VFUNC(int,XFillRectangles,V_XFillRectangles,_ANSI_ARGS_((Display *, Drawable, GC, XRectangle *, int))) +#endif /* #ifndef XFillRectangles */ + +#ifndef XFlush +VFUNC(int,XFlush,V_XFlush,_ANSI_ARGS_((Display *))) +#endif /* #ifndef XFlush */ + +#ifndef XFree +VFUNC(int,XFree,V_XFree,_ANSI_ARGS_((XFree_arg_t *))) +#endif /* #ifndef XFree */ + +#ifndef XFreeColormap +VFUNC(int,XFreeColormap,V_XFreeColormap,_ANSI_ARGS_((Display *, Colormap))) +#endif /* #ifndef XFreeColormap */ + +#ifndef XFreeColors +VFUNC(int,XFreeColors,V_XFreeColors,_ANSI_ARGS_((Display *, Colormap, long unsigned int *, int, long unsigned int))) +#endif /* #ifndef XFreeColors */ + +#ifndef XFreeCursor +VFUNC(int,XFreeCursor,V_XFreeCursor,_ANSI_ARGS_((Display *, Cursor))) +#endif /* #ifndef XFreeCursor */ + +#ifndef DO_X_EXCLUDE +#ifndef XFreeFont +VFUNC(int,XFreeFont,V_XFreeFont,_ANSI_ARGS_((Display *, XFontStruct *))) +#endif /* #ifndef XFreeFont */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef DO_X_EXCLUDE +#ifndef XFreeFontNames +VFUNC(int,XFreeFontNames,V_XFreeFontNames,_ANSI_ARGS_((char **))) +#endif /* #ifndef XFreeFontNames */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef XFreeGC +VFUNC(int,XFreeGC,V_XFreeGC,_ANSI_ARGS_((Display *, GC))) +#endif /* #ifndef XFreeGC */ + +#ifndef XFreeModifiermap +VFUNC(int,XFreeModifiermap,V_XFreeModifiermap,_ANSI_ARGS_((XModifierKeymap *))) +#endif /* #ifndef XFreeModifiermap */ + +#ifndef XGContextFromGC +VFUNC(GContext,XGContextFromGC,V_XGContextFromGC,_ANSI_ARGS_((GC))) +#endif /* #ifndef XGContextFromGC */ + +#ifndef XGetAtomName +VFUNC(char *,XGetAtomName,V_XGetAtomName,_ANSI_ARGS_((Display *, Atom))) +#endif /* #ifndef XGetAtomName */ + +#ifndef DO_X_EXCLUDE +#ifndef XGetFontProperty +VFUNC(int,XGetFontProperty,V_XGetFontProperty,_ANSI_ARGS_((XFontStruct *, Atom, long unsigned int *))) +#endif /* #ifndef XGetFontProperty */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef XGetGeometry +VFUNC(int,XGetGeometry,V_XGetGeometry,_ANSI_ARGS_((Display *, Drawable, Window *, int *, int *, unsigned int *, unsigned int *, unsigned int *, unsigned int *))) +#endif /* #ifndef XGetGeometry */ + +#ifndef XGetImage +VFUNC(XImage *,XGetImage,V_XGetImage,_ANSI_ARGS_((Display *, Drawable, int, int, unsigned int, unsigned int, long unsigned int, int))) +#endif /* #ifndef XGetImage */ + +#ifndef XGetInputFocus +VFUNC(int,XGetInputFocus,V_XGetInputFocus,_ANSI_ARGS_((Display *, Window *, int *))) +#endif /* #ifndef XGetInputFocus */ + +#ifndef XGetModifierMapping +VFUNC(XModifierKeymap *,XGetModifierMapping,V_XGetModifierMapping,_ANSI_ARGS_((Display *))) +#endif /* #ifndef XGetModifierMapping */ + +#ifndef DO_X_EXCLUDE +#ifndef XGetSelectionOwner +VFUNC(Window,XGetSelectionOwner,V_XGetSelectionOwner,_ANSI_ARGS_((Display *, Atom))) +#endif /* #ifndef XGetSelectionOwner */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef XGetVisualInfo +VFUNC(XVisualInfo *,XGetVisualInfo,V_XGetVisualInfo,_ANSI_ARGS_((Display *, long int, XVisualInfo *, int *))) +#endif /* #ifndef XGetVisualInfo */ + +#ifndef XGetWMColormapWindows +VFUNC(int,XGetWMColormapWindows,V_XGetWMColormapWindows,_ANSI_ARGS_((Display *, Window, Window **, int *))) +#endif /* #ifndef XGetWMColormapWindows */ + +#ifndef XGetWindowAttributes +VFUNC(int,XGetWindowAttributes,V_XGetWindowAttributes,_ANSI_ARGS_((Display *, Window, XWindowAttributes *))) +#endif /* #ifndef XGetWindowAttributes */ + +#ifndef XGetWindowProperty +VFUNC(int,XGetWindowProperty,V_XGetWindowProperty,_ANSI_ARGS_((Display *, Window, Atom, long int, long int, int, Atom, Atom *, int *, long unsigned int *, long unsigned int *, unsigned char **))) +#endif /* #ifndef XGetWindowProperty */ + +#ifndef XGrabKeyboard +VFUNC(int,XGrabKeyboard,V_XGrabKeyboard,_ANSI_ARGS_((Display *, Window, int, int, int, Time))) +#endif /* #ifndef XGrabKeyboard */ + +#ifndef XGrabPointer +VFUNC(int,XGrabPointer,V_XGrabPointer,_ANSI_ARGS_((Display *, Window, int, unsigned int, int, int, Window, Cursor, Time))) +#endif /* #ifndef XGrabPointer */ + +#ifndef XGrabServer +VFUNC(int,XGrabServer,V_XGrabServer,_ANSI_ARGS_((Display *))) +#endif /* #ifndef XGrabServer */ + +#ifndef XIconifyWindow +VFUNC(int,XIconifyWindow,V_XIconifyWindow,_ANSI_ARGS_((Display *, Window, int))) +#endif /* #ifndef XIconifyWindow */ + +#ifndef XInternAtom +VFUNC(Atom,XInternAtom,V_XInternAtom,_ANSI_ARGS_((Display *, const char *, int))) +#endif /* #ifndef XInternAtom */ + +#ifndef DO_X_EXCLUDE +#ifndef XIntersectRegion +VFUNC(int,XIntersectRegion,V_XIntersectRegion,_ANSI_ARGS_((Region, Region, Region))) +#endif /* #ifndef XIntersectRegion */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef XKeycodeToKeysym +VFUNC(KeySym,XKeycodeToKeysym,V_XKeycodeToKeysym,_ANSI_ARGS_((Display *, unsigned int, int))) +#endif /* #ifndef XKeycodeToKeysym */ + +#ifndef XKeysymToString +VFUNC(char *,XKeysymToString,V_XKeysymToString,_ANSI_ARGS_((KeySym))) +#endif /* #ifndef XKeysymToString */ + +#ifndef DO_X_EXCLUDE +#ifndef XListFonts +VFUNC(char **,XListFonts,V_XListFonts,_ANSI_ARGS_(( Display*, const char *, int, int *))) +#endif /* #ifndef XListFonts */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef XListHosts +VFUNC(XHostAddress *,XListHosts,V_XListHosts,_ANSI_ARGS_((Display *, int *, int *))) +#endif /* #ifndef XListHosts */ + +#ifndef DO_X_EXCLUDE +#ifndef XListProperties +VFUNC(Atom *,XListProperties,V_XListProperties,_ANSI_ARGS_((Display *, Window, int *))) +#endif /* #ifndef XListProperties */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef DO_X_EXCLUDE +#ifndef XLoadFont +VFUNC(Font,XLoadFont,V_XLoadFont,_ANSI_ARGS_((Display *, const char *))) +#endif /* #ifndef XLoadFont */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef DO_X_EXCLUDE +#ifndef XLoadQueryFont +VFUNC(XFontStruct *,XLoadQueryFont,V_XLoadQueryFont,_ANSI_ARGS_((Display *, const char *))) +#endif /* #ifndef XLoadQueryFont */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef XLookupColor +VFUNC(int,XLookupColor,V_XLookupColor,_ANSI_ARGS_((Display *, Colormap, const char *, XColor *, XColor *))) +#endif /* #ifndef XLookupColor */ + +#ifndef XLookupString +VFUNC(int,XLookupString,V_XLookupString,_ANSI_ARGS_((XKeyEvent *, char *, int, KeySym *, XComposeStatus *))) +#endif /* #ifndef XLookupString */ + +#ifndef XLowerWindow +VFUNC(int,XLowerWindow,V_XLowerWindow,_ANSI_ARGS_((Display *, Window))) +#endif /* #ifndef XLowerWindow */ + +#ifndef XMapWindow +VFUNC(int,XMapWindow,V_XMapWindow,_ANSI_ARGS_((Display *, Window))) +#endif /* #ifndef XMapWindow */ + +#ifndef XMoveResizeWindow +VFUNC(int,XMoveResizeWindow,V_XMoveResizeWindow,_ANSI_ARGS_((Display *, Window, int, int, unsigned int, unsigned int))) +#endif /* #ifndef XMoveResizeWindow */ + +#ifndef XMoveWindow +VFUNC(int,XMoveWindow,V_XMoveWindow,_ANSI_ARGS_((Display *, Window, int, int))) +#endif /* #ifndef XMoveWindow */ + +#ifndef XNextEvent +VFUNC(int,XNextEvent,V_XNextEvent,_ANSI_ARGS_((Display *, XEvent *))) +#endif /* #ifndef XNextEvent */ + +#ifndef XNoOp +VFUNC(int,XNoOp,V_XNoOp,_ANSI_ARGS_((Display *))) +#endif /* #ifndef XNoOp */ + +#ifndef DO_X_EXCLUDE +#ifndef XOpenDisplay +VFUNC(Display *,XOpenDisplay,V_XOpenDisplay,_ANSI_ARGS_((const char *))) +#endif /* #ifndef XOpenDisplay */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef XParseColor +VFUNC(int,XParseColor,V_XParseColor,_ANSI_ARGS_((Display *, Colormap, const char *, XColor *))) +#endif /* #ifndef XParseColor */ + +#ifndef XPutBackEvent +VFUNC(int,XPutBackEvent,V_XPutBackEvent,_ANSI_ARGS_((Display *, XEvent *))) +#endif /* #ifndef XPutBackEvent */ + +#ifndef DO_X_EXCLUDE +#ifndef XPutImage +VFUNC(int,XPutImage,V_XPutImage,_ANSI_ARGS_((Display *, Drawable, GC, XImage *, int, int, int, int, unsigned int, unsigned int))) +#endif /* #ifndef XPutImage */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef XQueryColors +VFUNC(int,XQueryColors,V_XQueryColors,_ANSI_ARGS_((Display *, Colormap, XColor *, int))) +#endif /* #ifndef XQueryColors */ + +#ifndef XQueryPointer +VFUNC(int,XQueryPointer,V_XQueryPointer,_ANSI_ARGS_((Display *, Window, Window *, Window *, int *, int *, int *, int *, unsigned int *))) +#endif /* #ifndef XQueryPointer */ + +#ifndef XQueryTree +VFUNC(int,XQueryTree,V_XQueryTree,_ANSI_ARGS_((Display *, Window, Window *, Window *, Window **, unsigned int *))) +#endif /* #ifndef XQueryTree */ + +#ifndef XRaiseWindow +VFUNC(int,XRaiseWindow,V_XRaiseWindow,_ANSI_ARGS_((Display *, Window))) +#endif /* #ifndef XRaiseWindow */ + +#ifndef DO_X_EXCLUDE +#ifndef XReadBitmapFile +VFUNC(int,XReadBitmapFile,V_XReadBitmapFile,_ANSI_ARGS_((Display *, Drawable, const char *, unsigned int *, unsigned int *, Pixmap *, int *, int *))) +#endif /* #ifndef XReadBitmapFile */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef XRectInRegion +VFUNC(int,XRectInRegion,V_XRectInRegion,_ANSI_ARGS_((Region,int,int,unsigned,unsigned))) +#endif /* #ifndef XRectInRegion */ + +#ifndef XRefreshKeyboardMapping +VFUNC(int,XRefreshKeyboardMapping,V_XRefreshKeyboardMapping,_ANSI_ARGS_((XMappingEvent *))) +#endif /* #ifndef XRefreshKeyboardMapping */ + +#ifndef XResizeWindow +VFUNC(int,XResizeWindow,V_XResizeWindow,_ANSI_ARGS_((Display *, Window, unsigned int, unsigned int))) +#endif /* #ifndef XResizeWindow */ + +#ifndef XRootWindow +VFUNC(Window,XRootWindow,V_XRootWindow,_ANSI_ARGS_((Display *, int))) +#endif /* #ifndef XRootWindow */ + +#ifndef XSelectInput +VFUNC(int,XSelectInput,V_XSelectInput,_ANSI_ARGS_((Display *, Window, long int))) +#endif /* #ifndef XSelectInput */ + +#ifndef XSendEvent +VFUNC(int,XSendEvent,V_XSendEvent,_ANSI_ARGS_((Display *, Window, int, long int, XEvent *))) +#endif /* #ifndef XSendEvent */ + +#ifndef XSetBackground +VFUNC(int,XSetBackground,V_XSetBackground,_ANSI_ARGS_((Display *, GC, unsigned long))) +#endif /* #ifndef XSetBackground */ + +#ifndef DO_X_EXCLUDE +#ifndef XSetClassHint +VFUNC(int,XSetClassHint,V_XSetClassHint,_ANSI_ARGS_((Display *, Window, XClassHint *))) +#endif /* #ifndef XSetClassHint */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef XSetClipMask +VFUNC(int,XSetClipMask,V_XSetClipMask,_ANSI_ARGS_((Display *, GC, Pixmap))) +#endif /* #ifndef XSetClipMask */ + +#ifndef XSetClipOrigin +VFUNC(int,XSetClipOrigin,V_XSetClipOrigin,_ANSI_ARGS_((Display *, GC, int, int))) +#endif /* #ifndef XSetClipOrigin */ + +#ifndef XSetCommand +VFUNC(int,XSetCommand,V_XSetCommand,_ANSI_ARGS_((Display *, Window, char **, int))) +#endif /* #ifndef XSetCommand */ + +#ifndef XSetDashes +VFUNC(int,XSetDashes,V_XSetDashes,_ANSI_ARGS_((Display *, GC, int, const char *, int))) +#endif /* #ifndef XSetDashes */ + +#ifndef XSetErrorHandler +VFUNC(XErrorHandler,XSetErrorHandler,V_XSetErrorHandler,_ANSI_ARGS_((XErrorHandler))) +#endif /* #ifndef XSetErrorHandler */ + +#ifndef XSetForeground +VFUNC(int,XSetForeground,V_XSetForeground,_ANSI_ARGS_((Display *, GC, long unsigned int))) +#endif /* #ifndef XSetForeground */ + +#ifndef XSetIconName +VFUNC(int,XSetIconName,V_XSetIconName,_ANSI_ARGS_((Display *, Window, const char *))) +#endif /* #ifndef XSetIconName */ + +#ifndef XSetInputFocus +VFUNC(int,XSetInputFocus,V_XSetInputFocus,_ANSI_ARGS_((Display *, Window, int, Time))) +#endif /* #ifndef XSetInputFocus */ + +#ifndef DO_X_EXCLUDE +#ifndef XSetRegion +VFUNC(int,XSetRegion,V_XSetRegion,_ANSI_ARGS_((Display *, GC, Region))) +#endif /* #ifndef XSetRegion */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef XSetSelectionOwner +VFUNC(int,XSetSelectionOwner,V_XSetSelectionOwner,_ANSI_ARGS_((Display *, Atom, Window, Time))) +#endif /* #ifndef XSetSelectionOwner */ + +#ifndef XSetTSOrigin +VFUNC(int,XSetTSOrigin,V_XSetTSOrigin,_ANSI_ARGS_((Display *, GC, int, int))) +#endif /* #ifndef XSetTSOrigin */ + +#ifndef DO_X_EXCLUDE +#ifndef XSetTransientForHint +VFUNC(int,XSetTransientForHint,V_XSetTransientForHint,_ANSI_ARGS_((Display *, Window, Window))) +#endif /* #ifndef XSetTransientForHint */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef XSetWMClientMachine +VFUNC(void,XSetWMClientMachine,V_XSetWMClientMachine,_ANSI_ARGS_((Display *, Window, XTextProperty *))) +#endif /* #ifndef XSetWMClientMachine */ + +#ifndef DO_X_EXCLUDE +#ifndef XSetWMColormapWindows +VFUNC(int,XSetWMColormapWindows,V_XSetWMColormapWindows,_ANSI_ARGS_((Display *, Window, Window *, int))) +#endif /* #ifndef XSetWMColormapWindows */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef DO_X_EXCLUDE +#ifndef XSetWMHints +VFUNC(int,XSetWMHints,V_XSetWMHints,_ANSI_ARGS_((Display *, Window, XWMHints *))) +#endif /* #ifndef XSetWMHints */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef DO_X_EXCLUDE +#ifndef XSetWMName +VFUNC(void,XSetWMName,V_XSetWMName,_ANSI_ARGS_((Display *, Window, XTextProperty *))) +#endif /* #ifndef XSetWMName */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef DO_X_EXCLUDE +#ifndef XSetWMNormalHints +VFUNC(void,XSetWMNormalHints,V_XSetWMNormalHints,_ANSI_ARGS_((Display *, Window, XSizeHints *))) +#endif /* #ifndef XSetWMNormalHints */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef XSetWindowBackground +VFUNC(int,XSetWindowBackground,V_XSetWindowBackground,_ANSI_ARGS_((Display *, Window, long unsigned int))) +#endif /* #ifndef XSetWindowBackground */ + +#ifndef XSetWindowBackgroundPixmap +VFUNC(int,XSetWindowBackgroundPixmap,V_XSetWindowBackgroundPixmap,_ANSI_ARGS_((Display *, Window, Pixmap))) +#endif /* #ifndef XSetWindowBackgroundPixmap */ + +#ifndef XSetWindowBorder +VFUNC(int,XSetWindowBorder,V_XSetWindowBorder,_ANSI_ARGS_((Display *, Window, long unsigned int))) +#endif /* #ifndef XSetWindowBorder */ + +#ifndef XSetWindowBorderPixmap +VFUNC(int,XSetWindowBorderPixmap,V_XSetWindowBorderPixmap,_ANSI_ARGS_((Display *, Window, Pixmap))) +#endif /* #ifndef XSetWindowBorderPixmap */ + +#ifndef XSetWindowBorderWidth +VFUNC(int,XSetWindowBorderWidth,V_XSetWindowBorderWidth,_ANSI_ARGS_((Display *, Window, unsigned int))) +#endif /* #ifndef XSetWindowBorderWidth */ + +#ifndef XSetWindowColormap +VFUNC(int,XSetWindowColormap,V_XSetWindowColormap,_ANSI_ARGS_((Display *, Window, Colormap))) +#endif /* #ifndef XSetWindowColormap */ + +#ifndef XStringListToTextProperty +VFUNC(int,XStringListToTextProperty,V_XStringListToTextProperty,_ANSI_ARGS_((char **, int, XTextProperty *))) +#endif /* #ifndef XStringListToTextProperty */ + +#ifndef XStringToKeysym +VFUNC(KeySym,XStringToKeysym,V_XStringToKeysym,_ANSI_ARGS_((const char *))) +#endif /* #ifndef XStringToKeysym */ + +#ifndef XSubtractRegion +VFUNC(int,XSubtractRegion,V_XSubtractRegion,_ANSI_ARGS_((Region, Region, Region))) +#endif /* #ifndef XSubtractRegion */ + +#ifndef XSync +VFUNC(int,XSync,V_XSync,_ANSI_ARGS_((Display *, int))) +#endif /* #ifndef XSync */ + +#ifndef DO_X_EXCLUDE +#ifndef XTextExtents +VFUNC(int,XTextExtents,V_XTextExtents,_ANSI_ARGS_((XFontStruct *, const char *, int, int *, int *, int *, XCharStruct *))) +#endif /* #ifndef XTextExtents */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef DO_X_EXCLUDE +#ifndef XTextWidth +VFUNC(int,XTextWidth,V_XTextWidth,_ANSI_ARGS_((XFontStruct *, const char *, int))) +#endif /* #ifndef XTextWidth */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef XTranslateCoordinates +VFUNC(int,XTranslateCoordinates,V_XTranslateCoordinates,_ANSI_ARGS_((Display *, Window, Window, int, int, int *, int *, Window *))) +#endif /* #ifndef XTranslateCoordinates */ + +#ifndef XUngrabKeyboard +VFUNC(int,XUngrabKeyboard,V_XUngrabKeyboard,_ANSI_ARGS_((Display *, Time))) +#endif /* #ifndef XUngrabKeyboard */ + +#ifndef XUngrabPointer +VFUNC(int,XUngrabPointer,V_XUngrabPointer,_ANSI_ARGS_((Display *, Time))) +#endif /* #ifndef XUngrabPointer */ + +#ifndef XUngrabServer +VFUNC(int,XUngrabServer,V_XUngrabServer,_ANSI_ARGS_((Display *))) +#endif /* #ifndef XUngrabServer */ + +#ifndef DO_X_EXCLUDE +#ifndef XUnionRectWithRegion +VFUNC(int,XUnionRectWithRegion,V_XUnionRectWithRegion,_ANSI_ARGS_((XRectangle *, Region, Region))) +#endif /* #ifndef XUnionRectWithRegion */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef XUnmapWindow +VFUNC(int,XUnmapWindow,V_XUnmapWindow,_ANSI_ARGS_((Display *, Window))) +#endif /* #ifndef XUnmapWindow */ + +#ifndef XVisualIDFromVisual +VFUNC(VisualID,XVisualIDFromVisual,V_XVisualIDFromVisual,_ANSI_ARGS_((Visual *))) +#endif /* #ifndef XVisualIDFromVisual */ + +#ifndef DO_X_EXCLUDE +#ifndef XWarpPointer +VFUNC(int,XWarpPointer,V_XWarpPointer,_ANSI_ARGS_(( Display *, Window, Window, int, int, unsigned int, unsigned int, int, int ))) +#endif /* #ifndef XWarpPointer */ +#endif /* !DO_X_EXCLUDE */ + +#ifndef XWindowEvent +VFUNC(int,XWindowEvent,V_XWindowEvent,_ANSI_ARGS_((Display *, Window, long int, XEvent *))) +#endif /* #ifndef XWindowEvent */ + +#ifndef XWithdrawWindow +VFUNC(int,XWithdrawWindow,V_XWithdrawWindow,_ANSI_ARGS_((Display *, Window, int))) +#endif /* #ifndef XWithdrawWindow */ + +#ifndef _XInitImageFuncPtrs +VFUNC(int,_XInitImageFuncPtrs,V__XInitImageFuncPtrs,_ANSI_ARGS_((XImage *image))) +#endif /* #ifndef _XInitImageFuncPtrs */ + +#endif /* _XLIB */ diff --git a/Master/tlpkg/tlperl/lib/Tk/pTk/mkVFunc b/Master/tlpkg/tlperl/lib/Tk/pTk/mkVFunc index 09ffc80a560..e10a458858a 100644 --- a/Master/tlpkg/tlperl/lib/Tk/pTk/mkVFunc +++ b/Master/tlpkg/tlperl/lib/Tk/pTk/mkVFunc @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl -w +#!/usr/bin/perl -w use strict; diff --git a/Master/tlpkg/tlperl/lib/Tk/pTk/tkImgPhoto.t b/Master/tlpkg/tlperl/lib/Tk/pTk/tkImgPhoto.t index 9e3d2175db0..02bd1b3807e 100644 --- a/Master/tlpkg/tlperl/lib/Tk/pTk/tkImgPhoto.t +++ b/Master/tlpkg/tlperl/lib/Tk/pTk/tkImgPhoto.t @@ -1,66 +1,66 @@ -#ifdef _TKIMGPHOTO
-VVAR(Tk_PhotoImageFormat,tkImgFmtPPM,V_tkImgFmtPPM)
-#ifndef Tk_CreateOldPhotoImageFormat
-VFUNC(void,Tk_CreateOldPhotoImageFormat,V_Tk_CreateOldPhotoImageFormat,_ANSI_ARGS_((
- Tk_PhotoImageFormat *formatPtr)))
-#endif /* #ifndef Tk_CreateOldPhotoImageFormat */
-
-#ifndef Tk_CreatePhotoImageFormat
-VFUNC(void,Tk_CreatePhotoImageFormat,V_Tk_CreatePhotoImageFormat,_ANSI_ARGS_((
- Tk_PhotoImageFormat *formatPtr)))
-#endif /* #ifndef Tk_CreatePhotoImageFormat */
-
-#ifndef Tk_DitherPhoto
-VFUNC(void,Tk_DitherPhoto,V_Tk_DitherPhoto,_ANSI_ARGS_((Tk_PhotoHandle handle,
- int x, int y, int width, int height)))
-#endif /* #ifndef Tk_DitherPhoto */
-
-#ifndef Tk_FindPhoto
-VFUNC(Tk_PhotoHandle,Tk_FindPhoto,V_Tk_FindPhoto,_ANSI_ARGS_((Tcl_Interp *interp,
- CONST char *imageName)))
-#endif /* #ifndef Tk_FindPhoto */
-
-#ifndef Tk_PhotoBlank
-VFUNC(void,Tk_PhotoBlank,V_Tk_PhotoBlank,_ANSI_ARGS_((Tk_PhotoHandle handle)))
-#endif /* #ifndef Tk_PhotoBlank */
-
-#ifndef Tk_PhotoExpand
-VFUNC(void,Tk_PhotoExpand,V_Tk_PhotoExpand,_ANSI_ARGS_((Tk_PhotoHandle handle,
- int width, int height )))
-#endif /* #ifndef Tk_PhotoExpand */
-
-#ifndef Tk_PhotoFormatName
-VFUNC(char *,Tk_PhotoFormatName,V_Tk_PhotoFormatName,_ANSI_ARGS_((Tcl_Interp *interp,
- Tcl_Obj *formatString)))
-#endif /* #ifndef Tk_PhotoFormatName */
-
-#ifndef Tk_PhotoGetImage
-VFUNC(int,Tk_PhotoGetImage,V_Tk_PhotoGetImage,_ANSI_ARGS_((Tk_PhotoHandle handle,
- Tk_PhotoImageBlock *blockPtr)))
-#endif /* #ifndef Tk_PhotoGetImage */
-
-#ifndef Tk_PhotoGetSize
-VFUNC(void,Tk_PhotoGetSize,V_Tk_PhotoGetSize,_ANSI_ARGS_((Tk_PhotoHandle handle,
- int *widthPtr, int *heightPtr)))
-#endif /* #ifndef Tk_PhotoGetSize */
-
-#ifndef Tk_PhotoPutBlock
-VFUNC(void,Tk_PhotoPutBlock,V_Tk_PhotoPutBlock,_ANSI_ARGS_((Tk_PhotoHandle handle,
- Tk_PhotoImageBlock *blockPtr, int x, int y,
- int width, int height, int compRule)))
-#endif /* #ifndef Tk_PhotoPutBlock */
-
-#ifndef Tk_PhotoPutZoomedBlock
-VFUNC(void,Tk_PhotoPutZoomedBlock,V_Tk_PhotoPutZoomedBlock,_ANSI_ARGS_((
- Tk_PhotoHandle handle,
- Tk_PhotoImageBlock *blockPtr, int x, int y,
- int width, int height, int zoomX, int zoomY,
- int subsampleX, int subsampleY, int compRule)))
-#endif /* #ifndef Tk_PhotoPutZoomedBlock */
-
-#ifndef Tk_PhotoSetSize
-VFUNC(void,Tk_PhotoSetSize,V_Tk_PhotoSetSize,_ANSI_ARGS_((Tk_PhotoHandle handle,
- int width, int height)))
-#endif /* #ifndef Tk_PhotoSetSize */
-
-#endif /* _TKIMGPHOTO */
+#ifdef _TKIMGPHOTO +VVAR(Tk_PhotoImageFormat,tkImgFmtPPM,V_tkImgFmtPPM) +#ifndef Tk_CreateOldPhotoImageFormat +VFUNC(void,Tk_CreateOldPhotoImageFormat,V_Tk_CreateOldPhotoImageFormat,_ANSI_ARGS_(( + Tk_PhotoImageFormat *formatPtr))) +#endif /* #ifndef Tk_CreateOldPhotoImageFormat */ + +#ifndef Tk_CreatePhotoImageFormat +VFUNC(void,Tk_CreatePhotoImageFormat,V_Tk_CreatePhotoImageFormat,_ANSI_ARGS_(( + Tk_PhotoImageFormat *formatPtr))) +#endif /* #ifndef Tk_CreatePhotoImageFormat */ + +#ifndef Tk_DitherPhoto +VFUNC(void,Tk_DitherPhoto,V_Tk_DitherPhoto,_ANSI_ARGS_((Tk_PhotoHandle handle, + int x, int y, int width, int height))) +#endif /* #ifndef Tk_DitherPhoto */ + +#ifndef Tk_FindPhoto +VFUNC(Tk_PhotoHandle,Tk_FindPhoto,V_Tk_FindPhoto,_ANSI_ARGS_((Tcl_Interp *interp, + CONST char *imageName))) +#endif /* #ifndef Tk_FindPhoto */ + +#ifndef Tk_PhotoBlank +VFUNC(void,Tk_PhotoBlank,V_Tk_PhotoBlank,_ANSI_ARGS_((Tk_PhotoHandle handle))) +#endif /* #ifndef Tk_PhotoBlank */ + +#ifndef Tk_PhotoExpand +VFUNC(void,Tk_PhotoExpand,V_Tk_PhotoExpand,_ANSI_ARGS_((Tk_PhotoHandle handle, + int width, int height ))) +#endif /* #ifndef Tk_PhotoExpand */ + +#ifndef Tk_PhotoFormatName +VFUNC(char *,Tk_PhotoFormatName,V_Tk_PhotoFormatName,_ANSI_ARGS_((Tcl_Interp *interp, + Tcl_Obj *formatString))) +#endif /* #ifndef Tk_PhotoFormatName */ + +#ifndef Tk_PhotoGetImage +VFUNC(int,Tk_PhotoGetImage,V_Tk_PhotoGetImage,_ANSI_ARGS_((Tk_PhotoHandle handle, + Tk_PhotoImageBlock *blockPtr))) +#endif /* #ifndef Tk_PhotoGetImage */ + +#ifndef Tk_PhotoGetSize +VFUNC(void,Tk_PhotoGetSize,V_Tk_PhotoGetSize,_ANSI_ARGS_((Tk_PhotoHandle handle, + int *widthPtr, int *heightPtr))) +#endif /* #ifndef Tk_PhotoGetSize */ + +#ifndef Tk_PhotoPutBlock +VFUNC(void,Tk_PhotoPutBlock,V_Tk_PhotoPutBlock,_ANSI_ARGS_((Tk_PhotoHandle handle, + Tk_PhotoImageBlock *blockPtr, int x, int y, + int width, int height, int compRule))) +#endif /* #ifndef Tk_PhotoPutBlock */ + +#ifndef Tk_PhotoPutZoomedBlock +VFUNC(void,Tk_PhotoPutZoomedBlock,V_Tk_PhotoPutZoomedBlock,_ANSI_ARGS_(( + Tk_PhotoHandle handle, + Tk_PhotoImageBlock *blockPtr, int x, int y, + int width, int height, int zoomX, int zoomY, + int subsampleX, int subsampleY, int compRule))) +#endif /* #ifndef Tk_PhotoPutZoomedBlock */ + +#ifndef Tk_PhotoSetSize +VFUNC(void,Tk_PhotoSetSize,V_Tk_PhotoSetSize,_ANSI_ARGS_((Tk_PhotoHandle handle, + int width, int height))) +#endif /* #ifndef Tk_PhotoSetSize */ + +#endif /* _TKIMGPHOTO */ diff --git a/Master/tlpkg/tlperl/lib/Tk/tkGlue.t b/Master/tlpkg/tlperl/lib/Tk/tkGlue.t index e59d658287f..ff689ff5539 100644 --- a/Master/tlpkg/tlperl/lib/Tk/tkGlue.t +++ b/Master/tlpkg/tlperl/lib/Tk/tkGlue.t @@ -1,70 +1,70 @@ -#ifdef _TKGLUE
-#ifndef Call_Tk
-VFUNC(int,Call_Tk,V_Call_Tk,_ANSI_ARGS_((Lang_CmdInfo *info,int argc, SV **args)))
-#endif /* #ifndef Call_Tk */
-
-#ifndef EnterWidgetMethods
-VFUNC(void,EnterWidgetMethods,V_EnterWidgetMethods,_ANSI_ARGS_((char *package, ...)))
-#endif /* #ifndef EnterWidgetMethods */
-
-#ifndef FindTkVarName
-VFUNC(SV *,FindTkVarName,V_FindTkVarName,_ANSI_ARGS_((CONST char *varName,int flags)))
-#endif /* #ifndef FindTkVarName */
-
-#ifndef InterpHv
-VFUNC(HV *,InterpHv,V_InterpHv,_ANSI_ARGS_((Tcl_Interp *interp,int fatal)))
-#endif /* #ifndef InterpHv */
-
-#ifndef Lang_TkCommand
-VFUNC(void,Lang_TkCommand,V_Lang_TkCommand,_ANSI_ARGS_((char *name, Tcl_ObjCmdProc *proc)))
-#endif /* #ifndef Lang_TkCommand */
-
-#ifndef Lang_TkSubCommand
-VFUNC(void,Lang_TkSubCommand,V_Lang_TkSubCommand,_ANSI_ARGS_((char *name, Tcl_ObjCmdProc *proc)))
-#endif /* #ifndef Lang_TkSubCommand */
-
-#ifndef MakeReference
-VFUNC(SV *,MakeReference,V_MakeReference,_ANSI_ARGS_((SV * sv)))
-#endif /* #ifndef MakeReference */
-
-#ifndef ObjectRef
-VFUNC(SV *,ObjectRef,V_ObjectRef,_ANSI_ARGS_((Tcl_Interp *interp, char *path)))
-#endif /* #ifndef ObjectRef */
-
-#ifndef SVtoFont
-VFUNC(Tk_Font,SVtoFont,V_SVtoFont,_ANSI_ARGS_((SV *win)))
-#endif /* #ifndef SVtoFont */
-
-#ifndef SVtoHWND
-VFUNC(HWND,SVtoHWND,V_SVtoHWND,_ANSI_ARGS_((SV *win)))
-#endif /* #ifndef SVtoHWND */
-
-#ifndef SVtoWindow
-VFUNC(Tk_Window,SVtoWindow,V_SVtoWindow,_ANSI_ARGS_((SV *win)))
-#endif /* #ifndef SVtoWindow */
-
-#ifndef TkToMainWindow
-VFUNC(Tk_Window,TkToMainWindow,V_TkToMainWindow,_ANSI_ARGS_((Tk_Window tkwin)))
-#endif /* #ifndef TkToMainWindow */
-
-#ifndef TkToWidget
-VFUNC(SV *,TkToWidget,V_TkToWidget,_ANSI_ARGS_((Tk_Window tkwin,Tcl_Interp **pinterp)))
-#endif /* #ifndef TkToWidget */
-
-#ifndef WidgetRef
-VFUNC(SV *,WidgetRef,V_WidgetRef,_ANSI_ARGS_((Tcl_Interp *interp, char *path)))
-#endif /* #ifndef WidgetRef */
-
-#ifndef WindowCommand
-VFUNC(Lang_CmdInfo *,WindowCommand,V_WindowCommand,_ANSI_ARGS_((SV *win,HV **hptr, int moan)))
-#endif /* #ifndef WindowCommand */
-
-#ifndef XSTkCommand
-VFUNC(int,XSTkCommand,V_XSTkCommand,_ANSI_ARGS_((CV *cv, int mwcd, Tcl_ObjCmdProc *proc, int items, SV **args)))
-#endif /* #ifndef XSTkCommand */
-
-#ifndef install_vtab
-VFUNC(void,install_vtab,V_install_vtab,_ANSI_ARGS_((char *name, void *table, size_t size)))
-#endif /* #ifndef install_vtab */
-
-#endif /* _TKGLUE */
+#ifdef _TKGLUE +#ifndef Call_Tk +VFUNC(int,Call_Tk,V_Call_Tk,_ANSI_ARGS_((Lang_CmdInfo *info,int argc, SV **args))) +#endif /* #ifndef Call_Tk */ + +#ifndef EnterWidgetMethods +VFUNC(void,EnterWidgetMethods,V_EnterWidgetMethods,_ANSI_ARGS_((char *package, ...))) +#endif /* #ifndef EnterWidgetMethods */ + +#ifndef FindTkVarName +VFUNC(SV *,FindTkVarName,V_FindTkVarName,_ANSI_ARGS_((CONST char *varName,int flags))) +#endif /* #ifndef FindTkVarName */ + +#ifndef InterpHv +VFUNC(HV *,InterpHv,V_InterpHv,_ANSI_ARGS_((Tcl_Interp *interp,int fatal))) +#endif /* #ifndef InterpHv */ + +#ifndef Lang_TkCommand +VFUNC(void,Lang_TkCommand,V_Lang_TkCommand,_ANSI_ARGS_((char *name, Tcl_ObjCmdProc *proc))) +#endif /* #ifndef Lang_TkCommand */ + +#ifndef Lang_TkSubCommand +VFUNC(void,Lang_TkSubCommand,V_Lang_TkSubCommand,_ANSI_ARGS_((char *name, Tcl_ObjCmdProc *proc))) +#endif /* #ifndef Lang_TkSubCommand */ + +#ifndef MakeReference +VFUNC(SV *,MakeReference,V_MakeReference,_ANSI_ARGS_((SV * sv))) +#endif /* #ifndef MakeReference */ + +#ifndef ObjectRef +VFUNC(SV *,ObjectRef,V_ObjectRef,_ANSI_ARGS_((Tcl_Interp *interp, char *path))) +#endif /* #ifndef ObjectRef */ + +#ifndef SVtoFont +VFUNC(Tk_Font,SVtoFont,V_SVtoFont,_ANSI_ARGS_((SV *win))) +#endif /* #ifndef SVtoFont */ + +#ifndef SVtoHWND +VFUNC(HWND,SVtoHWND,V_SVtoHWND,_ANSI_ARGS_((SV *win))) +#endif /* #ifndef SVtoHWND */ + +#ifndef SVtoWindow +VFUNC(Tk_Window,SVtoWindow,V_SVtoWindow,_ANSI_ARGS_((SV *win))) +#endif /* #ifndef SVtoWindow */ + +#ifndef TkToMainWindow +VFUNC(Tk_Window,TkToMainWindow,V_TkToMainWindow,_ANSI_ARGS_((Tk_Window tkwin))) +#endif /* #ifndef TkToMainWindow */ + +#ifndef TkToWidget +VFUNC(SV *,TkToWidget,V_TkToWidget,_ANSI_ARGS_((Tk_Window tkwin,Tcl_Interp **pinterp))) +#endif /* #ifndef TkToWidget */ + +#ifndef WidgetRef +VFUNC(SV *,WidgetRef,V_WidgetRef,_ANSI_ARGS_((Tcl_Interp *interp, char *path))) +#endif /* #ifndef WidgetRef */ + +#ifndef WindowCommand +VFUNC(Lang_CmdInfo *,WindowCommand,V_WindowCommand,_ANSI_ARGS_((SV *win,HV **hptr, int moan))) +#endif /* #ifndef WindowCommand */ + +#ifndef XSTkCommand +VFUNC(int,XSTkCommand,V_XSTkCommand,_ANSI_ARGS_((CV *cv, int mwcd, Tcl_ObjCmdProc *proc, int items, SV **args))) +#endif /* #ifndef XSTkCommand */ + +#ifndef install_vtab +VFUNC(void,install_vtab,V_install_vtab,_ANSI_ARGS_((char *name, void *table, size_t size))) +#endif /* #ifndef install_vtab */ + +#endif /* _TKGLUE */ |