Menu
▾
▴
perl-win32-gui-cvscommit — Send-only list for receiving email when commits are made to project CVS
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(6) |
Nov
(31) |
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(6) |
Feb
|
Mar
(17) |
Apr
(17) |
May
(27) |
Jun
(67) |
Jul
(26) |
Aug
(15) |
Sep
(2) |
Oct
(24) |
Nov
(6) |
Dec
|
| 2007 |
Jan
(4) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(28) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
(21) |
Feb
(45) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
(3) |
Mar
|
Apr
(3) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Robert M. <rob...@us...> - 2006-06-14 22:26:35
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Grid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3665/Win32-GUI-Grid Modified Files: Grid.xs Log Message: Fixes: typos and Scintilla::Perl default styles Index: Grid.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Grid/Grid.xs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Grid.xs 11 Jun 2006 16:42:10 -0000 1.2 --- Grid.xs 14 Jun 2006 22:26:31 -0000 1.3 *************** *** 140,144 **** { dSP; - dTARG; ENTER; SAVETMPS; --- 140,143 ---- *************** *** 166,170 **** if(perl_get_cv(Name, FALSE) != NULL) { dSP; - dTARG; ENTER ; SAVETMPS; --- 165,168 ---- *************** *** 196,200 **** { dSP; - dTARG; ENTER ; SAVETMPS; --- 194,197 ---- *************** *** 228,232 **** { dSP; - dTARG; ENTER ; SAVETMPS; --- 225,228 ---- *************** *** 450,454 **** dSP; - dTARG; ENTER ; SAVETMPS ; --- 446,449 ---- *************** *** 779,783 **** if(perl_get_cv(csEvent , FALSE) != NULL) { dSP; - dTARG; ENTER ; SAVETMPS; --- 774,777 ---- |
|
From: Robert M. <rob...@us...> - 2006-06-11 21:00:22
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Scintilla/demos In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12378/Win32-GUI-Scintilla/demos Modified Files: Editor.pl Log Message: Fix cygwin and mingw builds Index: Editor.pl =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Scintilla/demos/Editor.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Editor.pl 11 Jun 2006 16:51:50 -0000 1.1 --- Editor.pl 11 Jun 2006 21:00:16 -0000 1.2 *************** *** 9,13 **** use Win32::GUI qw(MB_OK MB_ICONQUESTION MB_ICONINFORMATION MB_YESNOCANCEL WS_EX_CLIENTEDGE WS_CLIPCHILDREN); ! use Win32::GUI::Scintilla::Perl; my $VERSION = "1.0alpha2"; --- 9,13 ---- use Win32::GUI qw(MB_OK MB_ICONQUESTION MB_ICONINFORMATION MB_YESNOCANCEL WS_EX_CLIENTEDGE WS_CLIPCHILDREN); ! use Win32::GUI::Scintilla::Perl(); my $VERSION = "1.0alpha2"; |
|
From: Robert M. <rob...@us...> - 2006-06-11 21:00:21
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Scintilla In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12378/Win32-GUI-Scintilla Modified Files: Makefile.PL Scintilla.PL ScintillaRC.PL TODO Log Message: Fix cygwin and mingw builds Index: ScintillaRC.PL =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Scintilla/ScintillaRC.PL,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ScintillaRC.PL 11 Jun 2006 16:51:48 -0000 1.1 --- ScintillaRC.PL 11 Jun 2006 21:00:16 -0000 1.2 *************** *** 48,52 **** BLOCK "040904E4" { ! VALUE "Comments" , "Win32::GUI::Scintilla, part of the perl Win32::GUI module." VALUE "CompanyName" , "perl-win32-gui.sourceforge.net" VALUE "FileDescription" , "Win32::GUI::Scintilla perl extension" --- 48,52 ---- BLOCK "040904E4" { ! VALUE "Comments" , "Win32::GUI::Scintilla, part of the perl Win32::GUI module. Includes code from the Scintilla project http://www.scintilla.org/" VALUE "CompanyName" , "perl-win32-gui.sourceforge.net" VALUE "FileDescription" , "Win32::GUI::Scintilla perl extension" Index: TODO =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Scintilla/TODO,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TODO 11 Jun 2006 16:51:48 -0000 1.1 --- TODO 11 Jun 2006 21:00:16 -0000 1.2 *************** *** 3,6 **** - Generate the majority of Scintilla.pod from scintilla.iface - More subclasses for syntax high-lighting other languages - - use Scintilla; should fail gracefully if we fail to load SciLexer.dll - find a way to make Scintilla (SciLexer.dll) play nicely with PAR --- 3,5 ---- Index: Makefile.PL =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Scintilla/Makefile.PL,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.PL 11 Jun 2006 16:51:44 -0000 1.2 --- Makefile.PL 11 Jun 2006 21:00:16 -0000 1.3 *************** *** 1,5 **** #!perl -w use strict; ! use warnings; # Makefile.PL for Win32::GUI::Scintilla --- 1,5 ---- #!perl -w use strict; ! #use warnings; # Makefile.PL for Win32::GUI::Scintilla *************** *** 44,47 **** --- 44,53 ---- package MY; + sub special_targets { + my $inherited = shift->SUPER::special_targets(@_); + $inherited =~ s/^(.SUFFIXES.*)$/$1 .rc .res/m; + return $inherited; + } + # Add rule for .rc to .res conversion # Add rules to install demo scripts Index: Scintilla.PL =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Scintilla/Scintilla.PL,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Scintilla.PL 11 Jun 2006 16:51:45 -0000 1.1 --- Scintilla.PL 11 Jun 2006 21:00:16 -0000 1.2 *************** *** 7,21 **** # $Id$ # MakeMaker provides the output filename as the first argument on the # command line, we need to ensure the directory exists before opening # the file: if ( @ARGV > 0 ) { ! my $file = $ARGV[0]; ! my $path = dirname($file); ! unless (-d $path) { ! mkpath($path, 1) or die qq(Failed to create '$path': $!); ! } ! open(my $fh, '>', $file) or die qq(Failed to open '$file': $!); ! select $fh; } --- 7,23 ---- # $Id$ + my $iface_file = "Include/Scintilla.iface"; + # MakeMaker provides the output filename as the first argument on the # command line, we need to ensure the directory exists before opening # the file: if ( @ARGV > 0 ) { ! my $file = $ARGV[0]; ! my $path = dirname($file); ! unless (-d $path) { ! mkpath($path, 1) or die qq(Failed to create '$path': $!); ! } ! open(my $fh, '>', $file) or die qq(Failed to open '$file': $!); ! select $fh; } *************** *** 56,67 **** my $SCILEXER_PATH; for my $path (@INC) { ! $SCILEXER_PATH = $path . '\auto\Win32\GUI\Scintilla\SciLexer.dll'; ! last if -f $SCILEXER_PATH; ! undef $SCILEXER_PATH; } my $SCINTILLA_DLL = Win32::GUI::LoadLibrary($SCILEXER_PATH) if $SCILEXER_PATH; $SCINTILLA_DLL = Win32::GUI::LoadLibrary('SciLexer') unless $SCINTILLA_DLL; ! ! #TODO: Fail is we fail to load SciLexer.dll Win32::GUI::Scintilla::_Initialise(); --- 58,71 ---- my $SCILEXER_PATH; for my $path (@INC) { ! my $lexer_file = $path . '/auto/Win32/GUI/Scintilla/SciLexer.dll'; ! if (-f $lexer_file) { ! $lexer_file =~ s|/|\\|g; # LoadLibrary doesn't like unix path seperators ! $SCILEXER_PATH = $lexer_file; ! last; ! } } my $SCINTILLA_DLL = Win32::GUI::LoadLibrary($SCILEXER_PATH) if $SCILEXER_PATH; $SCINTILLA_DLL = Win32::GUI::LoadLibrary('SciLexer') unless $SCINTILLA_DLL; ! die "Failed to load 'SciLexer.dll'" unless $SCINTILLA_DLL; Win32::GUI::Scintilla::_Initialise(); *************** *** 259,266 **** # Build Scintilla interface ! open my $fh, "<" , "Include/Scintilla.iface" or die "Failed to open 'Include/Scintilla.iface' for reading: $!"; while ( <$fh> ) { #--- Constant --- if (/^val (.*)=(.*)$/) { --- 263,275 ---- # Build Scintilla interface ! ! # The 'crlf' perlio layer ensures that on cygwin we don't get thrown by ! # windows line endings ! open my $fh, "<:crlf" , $iface_file or die "Failed to open '$iface_file' for reading: $!"; while ( <$fh> ) { + chomp; + #--- Constant --- if (/^val (.*)=(.*)$/) { *************** *** 415,419 **** print 'sub TargetAsUTF8 {', "\n"; print ' my $self = shift;', "\n"; ! print ' my $len = $self->SendMessage(2447,0,0);',"\n"; print ' my $text = " " x $len;', "\n\n"; --- 424,428 ---- print 'sub TargetAsUTF8 {', "\n"; print ' my $self = shift;', "\n"; ! print ' my $len = $self->SendMessage(2447,0,0);',"\n"; print ' my $text = " " x $len;', "\n\n"; *************** *** 430,434 **** print 'sub EncodedFromUTF8 {', "\n"; print ' my ($self, $src) = @_;', "\n"; ! print ' my $len = $self->SendMessagePN(2449,$src,0);',"\n"; print ' my $text = " " x $len;', "\n\n"; --- 439,443 ---- print 'sub EncodedFromUTF8 {', "\n"; print ' my ($self, $src) = @_;', "\n"; ! print ' my $len = $self->SendMessagePN(2449,$src,0);',"\n"; print ' my $text = " " x $len;', "\n\n"; |
|
From: Robert M. <rob...@us...> - 2006-06-11 21:00:20
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-DIBitmap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12378/Win32-GUI-DIBitmap Modified Files: Makefile.PL Log Message: Fix cygwin and mingw builds Index: Makefile.PL =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-DIBitmap/Makefile.PL,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.PL 11 Jun 2006 16:34:33 -0000 1.2 --- Makefile.PL 11 Jun 2006 21:00:15 -0000 1.3 *************** *** 1,5 **** #!perl -w use strict; ! use warnings; # Makefile.PL for Win32::GUI::DIBitmap --- 1,5 ---- #!perl -w use strict; ! #use warnings; # Makefile.PL for Win32::GUI::DIBitmap *************** *** 43,51 **** } ! # Can't build with MinGW (yet). ! if($Config{cc} =~ /gcc/i and $^O !~ /cygwin/i ) { print <<__EXPLAIN; ! At this time Win32::GUI::DIBitmap cannot be build using MinGW. Win32::GUI::DIBitmap will be skipped during the current build process. --- 43,51 ---- } ! # Can't build with gcc (yet). ! if($Config{cc} =~ /gcc/i ) { print <<__EXPLAIN; ! At this time Win32::GUI::DIBitmap cannot be build using gcc. Win32::GUI::DIBitmap will be skipped during the current build process. *************** *** 59,62 **** --- 59,68 ---- package MY; + sub special_targets { + my $inherited = shift->SUPER::special_targets(@_); + $inherited =~ s/^(.SUFFIXES.*)$/$1 .rc .res/m; + return $inherited; + } + # Add rule for .rc to .res conversion # Add rules to install demo scripts |
|
From: Robert M. <rob...@us...> - 2006-06-11 21:00:20
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-DropFiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12378/Win32-GUI-DropFiles Modified Files: Makefile.PL Log Message: Fix cygwin and mingw builds Index: Makefile.PL =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-DropFiles/Makefile.PL,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.PL 11 Jun 2006 15:33:14 -0000 1.3 --- Makefile.PL 11 Jun 2006 21:00:15 -0000 1.4 *************** *** 1,5 **** #!perl -w use strict; ! use warnings; # Makefile.PL for Win32::GUI::DropFiles --- 1,5 ---- #!perl -w use strict; ! #use warnings; # Makefile.PL for Win32::GUI::DropFiles *************** *** 44,47 **** --- 44,53 ---- package MY; + sub special_targets { + my $inherited = shift->SUPER::special_targets(@_); + $inherited =~ s/^(.SUFFIXES.*)$/$1 .rc .res/m; + return $inherited; + } + # Add rule for .rc to .res conversion # Add rules to install demo scripts |
|
From: Robert M. <rob...@us...> - 2006-06-11 21:00:20
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-AxWindow In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12378/Win32-GUI-AxWindow Modified Files: Makefile.PL Log Message: Fix cygwin and mingw builds Index: Makefile.PL =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-AxWindow/Makefile.PL,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.PL 11 Jun 2006 15:46:51 -0000 1.2 --- Makefile.PL 11 Jun 2006 21:00:15 -0000 1.3 *************** *** 1,5 **** #!perl -w use strict; ! use warnings; # Makefile.PL for Win32::GUI::AxWindow --- 1,5 ---- #!perl -w use strict; ! #use warnings; # Makefile.PL for Win32::GUI::AxWindow *************** *** 56,59 **** --- 56,65 ---- package MY; + sub special_targets { + my $inherited = shift->SUPER::special_targets(@_); + $inherited =~ s/^(.SUFFIXES.*)$/$1 .rc .res/m; + return $inherited; + } + sub xs_c { my $inherited = shift->SUPER::xs_c(@_); |
|
From: Robert M. <rob...@us...> - 2006-06-11 21:00:20
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Constants In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12378/Win32-GUI-Constants Modified Files: Constants.PL Constants.xs Makefile.PL Log Message: Fix cygwin and mingw builds Index: Constants.PL =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Constants/Constants.PL,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Constants.PL 1 Jun 2006 19:46:12 -0000 1.3 --- Constants.PL 11 Jun 2006 21:00:15 -0000 1.4 *************** *** 42,45 **** --- 42,46 ---- my %C; + binmode(DATA, ':crlf'); # ensure we do dos-unix line ending conversions, even on cygwin while(<DATA>) { s/#.*$//; # remove comments Index: Constants.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Constants/Constants.xs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Constants.xs 13 May 2006 15:39:30 -0000 1.1 --- Constants.xs 11 Jun 2006 21:00:15 -0000 1.2 *************** *** 50,54 **** if(*key == *str && !strncmp(key+1, str+1, len-1) && str[len] == '\0') { if(const_table[hash].flags & F_UV) { ! XSRETURN_UV((UV)const_table[hash].value); } else { --- 50,56 ---- if(*key == *str && !strncmp(key+1, str+1, len-1) && str[len] == '\0') { if(const_table[hash].flags & F_UV) { ! /* Care with the casting, as UV's are (currently) ! * unsigned long long on cygwin */ ! XSRETURN_UV((UV)((ULONG)const_table[hash].value)); } else { Index: Makefile.PL =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Constants/Makefile.PL,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.PL 13 May 2006 15:39:30 -0000 1.1 --- Makefile.PL 11 Jun 2006 21:00:15 -0000 1.2 *************** *** 1,5 **** #!perl -w use strict; ! use warnings; # Makefile.PL for Win32::GUI::Constants --- 1,5 ---- #!perl -w use strict; ! #use warnings; # Makefile.PL for Win32::GUI::Constants *************** *** 39,42 **** --- 39,48 ---- package MY; + sub special_targets { + my $inherited = shift->SUPER::special_targets(@_); + $inherited =~ s/^(.SUFFIXES.*)$/$1 .rc .res/m; + return $inherited; + } + # Add rule for .rc to .res conversion # Add rules to install demo scripts *************** *** 68,72 **** phash.def :: constants.src ! hash\perfect.exe < constants.src __POSTAMBLE --- 74,78 ---- phash.def :: constants.src ! hash$(DIRFILESEP)perfect.exe < constants.src __POSTAMBLE |
|
From: Robert M. <rob...@us...> - 2006-06-11 21:00:19
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Constants/t In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12378/Win32-GUI-Constants/t Modified Files: 52_tags.t Log Message: Fix cygwin and mingw builds Index: 52_tags.t =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Constants/t/52_tags.t,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 52_tags.t 16 May 2006 18:57:26 -0000 1.2 --- 52_tags.t 11 Jun 2006 21:00:15 -0000 1.3 *************** *** 61,65 **** VK_LSHIFT VK_OEM_4 VK_MODECHANGE ) ], animation => [ qw( ACS_CENTER ACS_TRANSPARENT ACS_AUTOPLAY ACS_TIMER ) ], ! bitmap => [ qw( ) ], brush => [ qw( ) ], button => [ --- 61,70 ---- VK_LSHIFT VK_OEM_4 VK_MODECHANGE ) ], animation => [ qw( ACS_CENTER ACS_TRANSPARENT ACS_AUTOPLAY ACS_TIMER ) ], ! bitmap => [ ! qw( OBM_DNARROWD OBM_UPARROWI OBM_DNARROWI OBM_CHECKBOXES OBM_RGARROWI OBM_DNARROW ! OBM_RGARROW OBM_ZOOMD OBM_CHECK OBM_BTNCORNERS OBM_RESTORED OBM_MNARROW ! OBM_REDUCE OBM_UPARROWD OBM_RESTORE OBM_LFARROWI OBM_BTSIZE OBM_RGARROWD ! OBM_REDUCED OBM_SIZE OBM_ZOOM OBM_LFARROW OBM_LFARROWD OBM_COMBO OBM_UPARROW ! OBM_CLOSE ) ], brush => [ qw( ) ], button => [ *************** *** 88,94 **** CBES_EX_CASESENSITIVE ) ], cursor => [ ! qw( IDC_HAND IDC_IBEAM IDC_CROSS IDC_SIZE IDC_SIZEWE IDC_WAIT IDC_ARROW IDC_APPSTARTING ! IDC_HELP IDC_SIZENESW IDC_SIZENWSE IDC_ICON IDC_NO IDC_SIZENS IDC_UPARROW ! IDC_SIZEALL ) ], datetime => [ qw( DTS_LONGDATEFORMAT DTS_APPCANPARSE DTS_TIMEFORMAT DTS_SHORTDATEFORMAT DTS_UPDOWN --- 93,102 ---- CBES_EX_CASESENSITIVE ) ], cursor => [ ! qw( IDC_ARROW IDC_IBEAM IDC_WAIT IDC_CROSS IDC_UPARROW IDC_SIZENWSE ! IDC_SIZENESW IDC_SIZEWE IDC_SIZENS IDC_SIZEALL IDC_NO IDC_HAND ! IDC_APPSTARTING IDC_HELP IDC_HSPLIT IDC_VSPLIT ! OCR_NORMAL OCR_IBEAM OCR_WAIT OCR_CROSS OCR_UP OCR_SIZENWSE ! OCR_SIZENESW OCR_SIZEWE OCR_SIZENS OCR_SIZEALL OCR_NO OCR_HAND ! OCR_APPSTARTING ) ], datetime => [ qw( DTS_LONGDATEFORMAT DTS_APPCANPARSE DTS_TIMEFORMAT DTS_SHORTDATEFORMAT DTS_UPDOWN *************** *** 134,138 **** icon => [ qw( IDI_EXCLAMATION IDI_ASTERISK IDI_APPLICATION IDI_HAND IDI_INFORMATION IDI_ERROR ! IDI_QUESTION IDI_WARNING IDI_WINLOGO ) ], imagelist => [ qw( ILC_COLOR16 ILC_MIRROR ILC_COLOR24 ILC_COLORDDB ILC_COLOR8 ILC_COLOR --- 142,148 ---- icon => [ qw( IDI_EXCLAMATION IDI_ASTERISK IDI_APPLICATION IDI_HAND IDI_INFORMATION IDI_ERROR ! IDI_QUESTION IDI_WARNING IDI_WINLOGO IDI_DEFAULTICON ! OIC_WINLOGO OIC_BANG OIC_QUES OIC_INFORMATION OIC_NOTE OIC_SAMPLE OIC_WARNING ! OIC_ERROR OIC_HAND ) ], imagelist => [ qw( ILC_COLOR16 ILC_MIRROR ILC_COLOR24 ILC_COLORDDB ILC_COLOR8 ILC_COLOR |
|
From: Robert M. <rob...@us...> - 2006-06-11 21:00:19
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Constants/hash In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12378/Win32-GUI-Constants/hash Modified Files: Makefile.PL Log Message: Fix cygwin and mingw builds Index: Makefile.PL =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Constants/hash/Makefile.PL,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.PL 13 May 2006 15:39:30 -0000 1.1 --- Makefile.PL 11 Jun 2006 21:00:15 -0000 1.2 *************** *** 16,21 **** open my $fh, '>', $file or die "Failed to open $file for writing: $!"; ! END { close $fh; } ! select $fh; # Generic configuration --- 16,20 ---- open my $fh, '>', $file or die "Failed to open $file for writing: $!"; ! my $oldfh = select $fh; # Generic configuration *************** *** 65,75 **** # DEPENDENCIES ! lookupa.o : lookupa.c standard.h lookupa.h ! recycle.o : recycle.c standard.h recycle.h ! perfhex.o : perfhex.c standard.h lookupa.h recycle.h perfect.h ! perfect.o : perfect.c standard.h lookupa.h recycle.h perfect.h MAKEFILE --- 64,77 ---- # DEPENDENCIES ! lookupa.$Config{obj_ext} : lookupa.c standard.h lookupa.h ! recycle.$Config{obj_ext} : recycle.c standard.h recycle.h ! perfhex.$Config{obj_ext} : perfhex.c standard.h lookupa.h recycle.h perfect.h ! perfect.$Config{obj_ext} : perfect.c standard.h lookupa.h recycle.h perfect.h MAKEFILE + + select $oldfh; + close $fh; |
|
From: Robert M. <rob...@us...> - 2006-06-11 21:00:19
|
Update of /cvsroot/perl-win32-gui/Win32-GUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12378 Modified Files: CHANGELOG GUI.pm GUI.xs MANIFEST Log Message: Fix cygwin and mingw builds Index: GUI.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/GUI.xs,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** GUI.xs 1 Jun 2006 19:46:11 -0000 1.58 --- GUI.xs 11 Jun 2006 21:00:15 -0000 1.59 *************** *** 1541,1551 **** if((bitmap == NULL) && SvIOK(filename)) { if(iType == IMAGE_BITMAP) { ! bitmap = LoadBitmap(NULL, MAKEINTRESOURCE(SvIV(filename))); } else if (iType == IMAGE_ICON) { ! bitmap = LoadIcon(NULL, MAKEINTRESOURCE(SvIV(filename))); } else if (iType == IMAGE_CURSOR) { ! bitmap = LoadCursor(NULL, MAKEINTRESOURCE(SvIV(filename))); } } --- 1541,1551 ---- if((bitmap == NULL) && SvIOK(filename)) { if(iType == IMAGE_BITMAP) { ! bitmap = (HBITMAP)LoadBitmap(NULL, MAKEINTRESOURCE(SvIV(filename))); } else if (iType == IMAGE_ICON) { ! bitmap = (HBITMAP)LoadIcon(NULL, MAKEINTRESOURCE(SvIV(filename))); } else if (iType == IMAGE_CURSOR) { ! bitmap = (HBITMAP)LoadCursor(NULL, MAKEINTRESOURCE(SvIV(filename))); } } Index: CHANGELOG =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/CHANGELOG,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -d -r1.85 -r1.86 *** CHANGELOG 1 Jun 2006 19:46:11 -0000 1.85 --- CHANGELOG 11 Jun 2006 21:00:15 -0000 1.86 *************** *** 6,9 **** --- 6,33 ---- Win32-GUI ChangeLog =================== + + [Robert May] : 11 June 2006 - Fix Cygwin build + - All Makefile.PL: add MY::special_targets to add .rc and .res to + .SUFFIXES + - All Makefile.PL: turn off warnings, to prevent spurious + 'redefinition' of MY package subroutine warnings. + - GUI.xs - add casts in LoadImage to assist gcc. + - GUI.pm - up version to 1.03_04 + - MANIFEST: update + --- Win32::GUI::Constants --- + - Constants.PL - fix line endings for cygwin + - Makefile.PL - fix directory seperators + - Constants.xs - fix a cast + - hash/Makefile.PL - close the output filehandle + - t/52_tags.t - fix icon, cursor and bitmap tag definitions + --- Win32::GUI::Scintilla --- + - Scintilla.PL - fix line endings when reading Scintilla.iface; fix + path fo loading SciLexer.dll under Cygwin + + + [Robert May] : 11 June 2006 - Merge AxWindow/DIBitmap/Grid/SCintilla + - Move Win32::GUI::AxWindow code into core + - Move Win32::GUI::DIBitmap code into core + - Move Win32::GUI::Grid code into core + - Move Win32::GUI::Scintilla code into core + + [Robert May] : 01 June 2006 - Icon/Cursor/Bitmap enhancement --- Win32::GUI core --- Index: GUI.pm =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/GUI.pm,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** GUI.pm 1 Jun 2006 19:46:11 -0000 1.46 --- GUI.pm 11 Jun 2006 21:00:15 -0000 1.47 *************** *** 23,27 **** # STATIC OBJECT PROPERTIES # ! $VERSION = "1.03_03"; # For MakeMaker $XS_VERSION = $VERSION; # For dynaloader $VERSION = eval $VERSION; # For Perl (see perldoc perlmodstyle) --- 23,27 ---- # STATIC OBJECT PROPERTIES # ! $VERSION = "1.03_04"; # For MakeMaker $XS_VERSION = $VERSION; # For dynaloader $VERSION = eval $VERSION; # For Perl (see perldoc perlmodstyle) Index: MANIFEST =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/MANIFEST,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** MANIFEST 13 May 2006 15:39:30 -0000 1.16 --- MANIFEST 11 Jun 2006 21:00:15 -0000 1.17 *************** *** 51,55 **** GUI.rc GUI.xs - GUI_Constants.cpp GUI_Events.cpp GUI_Helpers.cpp --- 51,54 ---- *************** *** 68,72 **** MANIFEST.SKIP MDI.xs - META.yml MonthCal.xs NotifyIcon.xs --- 67,70 ---- *************** *** 91,95 **** --- 89,95 ---- samples/NotifyIcon.pl samples/Region.pl + samples/SPLASH.bmp samples/SplashScreen.pl + samples/standard_images.pl samples/Tutorial_Part1_hello1.pl samples/Tutorial_Part1_hello2.pl *************** *** 111,114 **** --- 111,115 ---- StatusBar.xs t/01_basic.t + t/02_constants.t t/02_window.t t/03_button.t *************** *** 142,145 **** --- 143,173 ---- UpDown.xs vsplit.cur + Win32-GUI-AxWindow/AxWindow.pm + Win32-GUI-AxWindow/AxWindow.xs + Win32-GUI-AxWindow/AxWindowRC.PL + Win32-GUI-AxWindow/Changes + Win32-GUI-AxWindow/demos/DHtmlEdit.pl + Win32-GUI-AxWindow/demos/InfoControl.pl + Win32-GUI-AxWindow/demos/Movie.avi + Win32-GUI-AxWindow/demos/MovieControl.pl + Win32-GUI-AxWindow/demos/MsFlexGrid.pl + Win32-GUI-AxWindow/demos/MShtml.pl + Win32-GUI-AxWindow/demos/SCGrid.pl + Win32-GUI-AxWindow/demos/TestOLE.pl + Win32-GUI-AxWindow/demos/UnComplete/DHtmlEdit.pm + Win32-GUI-AxWindow/demos/UnComplete/DHtmlEditor.pl + Win32-GUI-AxWindow/demos/UnComplete/Google.pl + Win32-GUI-AxWindow/demos/UnComplete/MsFlexGrid.pm + Win32-GUI-AxWindow/demos/WebBrowser.pl + Win32-GUI-AxWindow/demos/WebBrowser2.pl + Win32-GUI-AxWindow/demos/WMPControl.pl + Win32-GUI-AxWindow/Makefile.PL + Win32-GUI-AxWindow/t/01_load.t + Win32-GUI-AxWindow/t/02_new.t + Win32-GUI-AxWindow/t/98_pod.t + Win32-GUI-AxWindow/t/99_pod_coverage.t + Win32-GUI-AxWindow/TODO + Win32-GUI-AxWindow/TYPEMAP + Win32-GUI-Constants/Changes Win32-GUI-Constants/Constants.PL Win32-GUI-Constants/Constants.pm *************** *** 177,180 **** --- 205,264 ---- Win32-GUI-Constants/t/99_pod_coverage.t Win32-GUI-Constants/Tags.pm + Win32-GUI-Constants/TODO + win32-gui-demos.pl + Win32-GUI-DIBitmap/Changes + Win32-GUI-DIBitmap/demos/1.bmp + Win32-GUI-DIBitmap/demos/1.png + Win32-GUI-DIBitmap/demos/1.tga + Win32-GUI-DIBitmap/demos/2.bmp + Win32-GUI-DIBitmap/demos/2.png + Win32-GUI-DIBitmap/demos/2.tga + Win32-GUI-DIBitmap/demos/3.bmp + Win32-GUI-DIBitmap/demos/3.png + Win32-GUI-DIBitmap/demos/3.tga + Win32-GUI-DIBitmap/demos/4.bmp + Win32-GUI-DIBitmap/demos/4.png + Win32-GUI-DIBitmap/demos/4.tga + Win32-GUI-DIBitmap/demos/5.bmp + Win32-GUI-DIBitmap/demos/5.png + Win32-GUI-DIBitmap/demos/5.tga + Win32-GUI-DIBitmap/demos/demo.pl + Win32-GUI-DIBitmap/demos/demo2.pl + Win32-GUI-DIBitmap/demos/info.pl + Win32-GUI-DIBitmap/demos/info2.pl + Win32-GUI-DIBitmap/demos/piv.pl + Win32-GUI-DIBitmap/demos/small.tga + Win32-GUI-DIBitmap/demos/test1.pl + Win32-GUI-DIBitmap/demos/test10.pl + Win32-GUI-DIBitmap/demos/test11.pl + Win32-GUI-DIBitmap/demos/test12.pl + Win32-GUI-DIBitmap/demos/test13.pl + Win32-GUI-DIBitmap/demos/test14.pl + Win32-GUI-DIBitmap/demos/test15.pl + Win32-GUI-DIBitmap/demos/test2.pl + Win32-GUI-DIBitmap/demos/test3.pl + Win32-GUI-DIBitmap/demos/test4.pl + Win32-GUI-DIBitmap/demos/test5.pl + Win32-GUI-DIBitmap/demos/test6.pl + Win32-GUI-DIBitmap/demos/test7.pl + Win32-GUI-DIBitmap/demos/test8.pl + Win32-GUI-DIBitmap/demos/test9.pl + Win32-GUI-DIBitmap/demos/Zapotec.bmp + Win32-GUI-DIBitmap/demos/Zapotec.jpg + Win32-GUI-DIBitmap/demos/zipimage.pl + Win32-GUI-DIBitmap/DIBitmap.pm + Win32-GUI-DIBitmap/DIBitmap.xs + Win32-GUI-DIBitmap/DIBitmapRC.PL + Win32-GUI-DIBitmap/extlib/FreeImage.h + Win32-GUI-DIBitmap/extlib/FreeImage.lib + Win32-GUI-DIBitmap/extlib/libfreeimage-cygwin.a + Win32-GUI-DIBitmap/extlib/Readme.txt + Win32-GUI-DIBitmap/Makefile.PL + Win32-GUI-DIBitmap/t/01_load.t + Win32-GUI-DIBitmap/t/02_new.t + Win32-GUI-DIBitmap/t/98_pod.t + Win32-GUI-DIBitmap/t/99_pod_coverage.t + Win32-GUI-DIBitmap/TODO + Win32-GUI-DIBitmap/TYPEMAP Win32-GUI-DropFiles/demos/DropFilesDemo.pl Win32-GUI-DropFiles/DropFiles.pm *************** *** 199,201 **** --- 283,352 ---- Win32-GUI-DropFiles/t/DropTest.pm Win32-GUI-DropFiles/TYPEMAP + Win32-GUI-Grid/Changes + Win32-GUI-Grid/demos/one.bmp + Win32-GUI-Grid/demos/test1.pl + Win32-GUI-Grid/demos/test2.pl + Win32-GUI-Grid/demos/test3.pl + Win32-GUI-Grid/demos/test4.pl + Win32-GUI-Grid/demos/test5.pl + Win32-GUI-Grid/demos/test6.pl + Win32-GUI-Grid/demos/three.bmp + Win32-GUI-Grid/demos/two.bmp + Win32-GUI-Grid/Grid.pm + Win32-GUI-Grid/Grid.xs + Win32-GUI-Grid/GridRC.PL + Win32-GUI-Grid/Makefile.PL + Win32-GUI-Grid/MFCGrid/CellRange.h + Win32-GUI-Grid/MFCGrid/GridCell.cpp + Win32-GUI-Grid/MFCGrid/GridCell.h + Win32-GUI-Grid/MFCGrid/GridCellBase.cpp + Win32-GUI-Grid/MFCGrid/GridCellBase.h + Win32-GUI-Grid/MFCGrid/GridCellCheck.cpp + Win32-GUI-Grid/MFCGrid/GridCellCheck.h + Win32-GUI-Grid/MFCGrid/GridCellCombo.cpp + Win32-GUI-Grid/MFCGrid/GridCellCombo.h + Win32-GUI-Grid/MFCGrid/GridCellDateTime.cpp + Win32-GUI-Grid/MFCGrid/GridCellDateTime.h + Win32-GUI-Grid/MFCGrid/GridCellNumeric.cpp + Win32-GUI-Grid/MFCGrid/GridCellNumeric.h + Win32-GUI-Grid/MFCGrid/GridCellURL.cpp + Win32-GUI-Grid/MFCGrid/GridCellURL.h + Win32-GUI-Grid/MFCGrid/GridCtrl.cpp + Win32-GUI-Grid/MFCGrid/GridCtrl.h + Win32-GUI-Grid/MFCGrid/GridDropTarget.cpp + Win32-GUI-Grid/MFCGrid/GridDropTarget.h + Win32-GUI-Grid/MFCGrid/InPlaceEdit.cpp + Win32-GUI-Grid/MFCGrid/InPlaceEdit.h + Win32-GUI-Grid/MFCGrid/MemDC.h + Win32-GUI-Grid/MFCGrid/StdAfx.cpp + Win32-GUI-Grid/MFCGrid/StdAfx.h + Win32-GUI-Grid/MFCGrid/TitleTip.cpp + Win32-GUI-Grid/MFCGrid/TitleTip.h + Win32-GUI-Grid/t/01_load.t + Win32-GUI-Grid/t/02_new.t + Win32-GUI-Grid/t/98_pod.t + Win32-GUI-Grid/t/99_pod_coverage.t + Win32-GUI-Grid/TODO + Win32-GUI-Grid/TYPEMAP + Win32-GUI-Scintilla/Changes + Win32-GUI-Scintilla/demos/Editor.pl + Win32-GUI-Scintilla/demos/test.pl + Win32-GUI-Scintilla/demos/test2.pl + Win32-GUI-Scintilla/Include/License.txt + Win32-GUI-Scintilla/Include/Readme.txt + Win32-GUI-Scintilla/Include/SciLexer.dll + Win32-GUI-Scintilla/Include/Scintilla.h + Win32-GUI-Scintilla/Include/Scintilla.iface + Win32-GUI-Scintilla/Makefile.PL + Win32-GUI-Scintilla/Perl.pm + Win32-GUI-Scintilla/Scintilla.PL + Win32-GUI-Scintilla/Scintilla.pod + Win32-GUI-Scintilla/Scintilla.xs + Win32-GUI-Scintilla/ScintillaRC.PL + Win32-GUI-Scintilla/t/01_load.t + Win32-GUI-Scintilla/t/02_new.t + Win32-GUI-Scintilla/t/98_pod.t + Win32-GUI-Scintilla/t/99_pod_coverage.t + Win32-GUI-Scintilla/TODO + Win32-GUI-Scintilla/Typemap Window.xs |
|
From: Robert M. <rob...@us...> - 2006-06-11 21:00:19
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Grid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12378/Win32-GUI-Grid Modified Files: Makefile.PL Log Message: Fix cygwin and mingw builds Index: Makefile.PL =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Grid/Makefile.PL,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.PL 11 Jun 2006 16:42:11 -0000 1.2 --- Makefile.PL 11 Jun 2006 21:00:16 -0000 1.3 *************** *** 1,5 **** #!perl -w use strict; ! use warnings; # Makefile.PL for Win32::GUI::Grid --- 1,5 ---- #!perl -w use strict; ! #use warnings; # Makefile.PL for Win32::GUI::Grid *************** *** 45,50 **** Win32::GUI::Grid can only be built using MSVC, not '$Config{cc}', ! as it requires the MFC framework. Win32::GUI::Grid will be skipped ! during the current build process. __EXPLAIN --- 45,50 ---- Win32::GUI::Grid can only be built using MSVC, not '$Config{cc}', ! as it requires the MFC framework. ! Win32::GUI::Grid will be skipped during the current build process. __EXPLAIN *************** *** 57,60 **** --- 57,66 ---- package MY; + sub special_targets { + my $inherited = shift->SUPER::special_targets(@_); + $inherited =~ s/^(.SUFFIXES.*)$/$1 .rc .res/m; + return $inherited; + } + sub xs_c { my $inherited = shift->SUPER::xs_c(@_); |
|
From: Robert M. <rob...@us...> - 2006-06-11 16:51:54
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Scintilla In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26402 Modified Files: Changes Makefile.PL Perl.pm Scintilla.xs Typemap Added Files: Scintilla.PL Scintilla.pod ScintillaRC.PL TODO Removed Files: MANIFEST README Scintilla.html Scintilla.pm Scintilla.pm.begin Scintilla.pm.end Log Message: Merge Scintilla into core distribution Index: Makefile.PL =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Scintilla/Makefile.PL,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.PL 1 Nov 2005 10:36:51 -0000 1.1 --- Makefile.PL 11 Jun 2006 16:51:44 -0000 1.2 *************** *** 1,38 **** use ExtUtils::MakeMaker; ! # See lib/ExtUtils/MakeMaker.pm for details of how to influence ! # the contents of the Makefile that is written. ! WriteMakefile( ! 'NAME' => 'Win32::GUI::Scintilla', ! 'VERSION_FROM' => 'Scintilla.pm.begin', # finds $VERSION ! 'PREREQ_PM' => {}, # e.g., Module::Name => 1.1 ! 'PM' => { ! 'Scintilla.pm' => '$(INST_LIBDIR)/Scintilla.pm', ! 'Perl.pm' => '$(INST_LIBDIR)/Scintilla/Perl.pm', ! }, ! ($] >= 5.005 ? ## Add these new keywords supported since 5.005 ! (ABSTRACT => 'Add Scintilla control to Win32::GUI', ! AUTHOR => 'ROCHER Laurent (lr...@cp...)') : ()), ! 'LIBS' => [''], # e.g., '-lm' ! 'DEFINE' => '', # e.g., '-DHAVE_SOMETHING' ! # Insert -I. if you add *.h files later: ! 'INC' => '', # e.g., '-I/usr/include/other' ! # Un-comment this if you add C files to link with later: ! # 'OBJECT' => '$(O_FILES)', # link all the C files too ); ! sub MY::postamble { ! return <<'MAKE_FRAG'; ! Scintilla.pm : Scintilla.pm.begin Scintilla.pm.end include/Scintilla.iface include/autogen.pl ! $(PERL) ./include/autogen.pl ! config :: $(INST_ARCHAUTODIR)/SciLexer.dll ! @$(NOOP) ! $(INST_ARCHAUTODIR)/SciLexer.dll : include/SciLexer.dll ! $(CP) ./include/SciLexer.dll $(INST_ARCHAUTODIR)/SciLexer.dll ! MAKE_FRAG } --- 1,70 ---- + #!perl -w + use strict; + use warnings; + + # Makefile.PL for Win32::GUI::Scintilla + # $Id$ + + use 5.006; + use Config; use ExtUtils::MakeMaker; + use File::Find(); ! my @demos; ! File::Find::find(sub { push @demos, $File::Find::name if $File::Find::name =~ /\.pl$/ }, 'demos'); ! ! my %config = ( ! NAME => 'Win32::GUI::Scintilla', ! VERSION_FROM => 'Scintilla.PL', ! ABSTRACT_FROM => 'Scintilla.pod', ! AUTHOR => 'ROCHER Laurent (lr...@cp...)', ! PM => {'Scintilla.pod' => '$(INST_LIBDIR)/Scintilla.pod', ! 'Perl.pm' => '$(INST_LIBDIR)/Scintilla/Perl.pm', ! 'Include/SciLexer.dll' => '$(INST_ARCHAUTODIR)/SciLexer.dll', }, ! PL_FILES => {'Scintilla.PL' => '$(INST_LIBDIR)/Scintilla.pm', ! 'ScintillaRC.PL' => '$(BASEEXT).rc', }, ! OBJECT => '$(BASEEXT)$(OBJ_EXT) $(BASEEXT).res', ! macro => {RC => 'rc.exe', ! RCFLAGS => '', ! INST_DEMODIR => '$(INST_LIB)/Win32/GUI/demos/$(BASEEXT)', ! DEMOS => "@demos", }, ! depend => {'Scintilla.pm' => 'Include/Scintilla.iface', }, ! clean => {FILES => '*.rc *.res', }, ); ! # if building using gcc (MinGW or cygwin) use windres ! # as the resource compiler ! if($Config{cc} =~ /gcc/i) { ! $config{macro}->{RC} = 'windres'; ! $config{macro}->{RCFLAGS} = '-O coff -o $*.res'; ! } ! WriteMakefile(%config); ! package MY; ! # Add rule for .rc to .res conversion ! # Add rules to install demo scripts ! sub postamble { ! return <<'__POSTAMBLE'; ! # Win32::GUI::Scintilla RC section ! .rc.res: ! $(RC) $(RCFLAGS) $< ! ! # Win32::GUI::Scintilla demo script section ! ! pure_all :: demo_to_blib ! $(NOECHO) $(NOOP) ! ! demo_to_blib: $(DEMOS) ! $(NOECHO) $(MKPATH) $(INST_DEMODIR) ! $(CP) $? $(INST_DEMODIR) ! $(NOECHO) $(TOUCH) demo_to_blib ! ! clean :: ! -$(RM_F) demo_to_blib ! ! __POSTAMBLE } --- NEW FILE: Scintilla.pod --- =head1 NAME Win32::GUI::Scintilla - Add Scintilla edit control to Win32::GUI =head1 SYNOPSIS use Win32::GUI; use Win32::GUI::Scintilla; # main Window $Window = new Win32::GUI::Window ( -name => "Window", -title => "Scintilla test", -pos => [100, 100], -size => [400, 400], ) or die "new Window"; # Create Scintilla Edit Window [...2344 lines suppressed...] Win32::GUI - L<http://perl-win32-gui.sourceforge.net/> Scintilla - L<http:/www.scintilla.org/> =head1 SEE ALSO L<Win32::GUI|Win32::GUI> =head1 AUTHOR Laurent Rocher (lr...@cp...) =head1 COPYRIGHT AND LICENCE Copyright 2003 by Laurent Rocher (lr...@cp...). This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. =cut --- NEW FILE: ScintillaRC.PL --- #!perl -w use strict; use warnings; use ExtUtils::MakeMaker; # $Id: ScintillaRC.PL,v 1.1 2006/06/11 16:51:48 robertemay Exp $ # perl script to produce the RC file for # Win32::GUI::Scintilla create Resource # file with a VERSIONINFO section # The variables: my %info = ( Version => MM->parse_version('Scintilla.PL'), Dllname => 'SCintilla.dll', Years => '2003..2006', Win32GUIVersion => MM->parse_version('../GUI.pm'), ); # Open the target file if ( @ARGV > 0 ) { my $file = $ARGV[0]; open(my $fh, '>', $file) or die qq(Failed to open '$file': $!); select $fh; } { my $fileVersion = $info{Version}; $fileVersion .= "_00" unless $fileVersion =~ m/_/; $info{FileVersion} = sprintf("%02d,%02d,%02d,00", $fileVersion =~ m/^(.*)\.([^_]*)_?(.*)$/); my $prodVersion = $info{Win32GUIVersion}; $prodVersion .= "_00" unless $prodVersion =~ m/_/; $info{ProductVersion} = sprintf("%02d,%02d,%02d,00", $prodVersion =~ m/^(.*)\.([^_]*)_?(.*)$/); } print <<"__RC"; #include "Winver.h" 1 VERSIONINFO FILEVERSION $info{FileVersion} PRODUCTVERSION $info{ProductVersion} FILEOS VOS__WINDOWS32 FILETYPE VFT_DLL { BLOCK "StringFileInfo" { BLOCK "040904E4" { VALUE "Comments" , "Win32::GUI::Scintilla, part of the perl Win32::GUI module." VALUE "CompanyName" , "perl-win32-gui.sourceforge.net" VALUE "FileDescription" , "Win32::GUI::Scintilla perl extension" VALUE "FileVersion" , "$info{Version}" VALUE "InternalName" , "$info{Dllname}" VALUE "LegalCopyright" , "Copyright © Laurent Rocher $info{Years}" VALUE "LegalTrademarks" , "GNU and Artistic licences" VALUE "OriginalFilename" , "$info{Dllname}" VALUE "ProductName" , "Win32::GUI perl extension" VALUE "ProductVersion" , "$info{Win32GUIVersion}" } } BLOCK "VarFileInfo" { VALUE "Translation", 0x0409, 0x04E4 } } __RC exit(0); __END__ --- Scintilla.pm.begin DELETED --- --- Scintilla.pm DELETED --- --- NEW FILE: Scintilla.PL --- #! perl -w use strict; use warnings; use File::Basename; use File::Path; # $Id: Scintilla.PL,v 1.1 2006/06/11 16:51:45 robertemay Exp $ # MakeMaker provides the output filename as the first argument on the # command line, we need to ensure the directory exists before opening # the file: if ( @ARGV > 0 ) { my $file = $ARGV[0]; my $path = dirname($file); unless (-d $path) { mkpath($path, 1) or die qq(Failed to create '$path': $!); } open(my $fh, '>', $file) or die qq(Failed to open '$file': $!); select $fh; } # Preamble # Was scintilla.pm.begin print <<'PREAMBLE'; #------------------------------------------------------------------------ # Scintilla control for Win32::GUI # by Laurent ROCHER (lr...@cp...) #------------------------------------------------------------------------ #perl2exe_bundle 'SciLexer.dll' # This file created by the build process from Scintilla.PL # change made here will be lost. Edit Scintilla.PL instead. # $Id: Scintilla.PL,v 1.1 2006/06/11 16:51:45 robertemay Exp $ package Win32::GUI::Scintilla; use strict; use warnings; use Win32::GUI qw(WS_CLIPCHILDREN WS_TABSTOP WS_VISIBLE WS_HSCROLL WS_VSCROLL); require DynaLoader; our @ISA = qw(DynaLoader Win32::GUI::Window); our $VERSION = 1.80_01; our $XS_VERSION = $VERSION; $VERSION = eval $VERSION; bootstrap Win32::GUI::Scintilla $XS_VERSION; #------------------------------------------------------------------------ # Load Scintilla DLL from somewhere on @INC or standard LoadLibrary search my $SCILEXER_PATH; for my $path (@INC) { $SCILEXER_PATH = $path . '\auto\Win32\GUI\Scintilla\SciLexer.dll'; last if -f $SCILEXER_PATH; undef $SCILEXER_PATH; } my $SCINTILLA_DLL = Win32::GUI::LoadLibrary($SCILEXER_PATH) if $SCILEXER_PATH; $SCINTILLA_DLL = Win32::GUI::LoadLibrary('SciLexer') unless $SCINTILLA_DLL; #TODO: Fail is we fail to load SciLexer.dll Win32::GUI::Scintilla::_Initialise(); END { # Free Scintilla DLL Win32::GUI::Scintilla::_UnInitialise(); #Win32::GUI::FreeLibrary($SCINTILLA_DLL); #The above line causes some scripts to crash - such as test2.pl in the samples when running under 5.8.7 } #------------------------------------------------------------------------ # # Notify event code # use constant SCN_STYLENEEDED => 2000; use constant SCN_CHARADDED => 2001; use constant SCN_SAVEPOINTREACHED => 2002; use constant SCN_SAVEPOINTLEFT => 2003; use constant SCN_MODIFYATTEMPTRO => 2004; use constant SCN_KEY => 2005; use constant SCN_DOUBLECLICK => 2006; use constant SCN_UPDATEUI => 2007; use constant SCN_MODIFIED => 2008; use constant SCN_MACRORECORD => 2009; use constant SCN_MARGINCLICK => 2010; use constant SCN_NEEDSHOWN => 2011; use constant SCN_PAINTED => 2013; use constant SCN_USERLISTSELECTION => 2014; use constant SCN_URIDROPPED => 2015; use constant SCN_DWELLSTART => 2016; use constant SCN_DWELLEND => 2017; use constant SCN_ZOOM => 2018; use constant SCN_HOTSPOTCLICK => 2019; use constant SCN_HOTSPOTDOUBLECLICK => 2020; use constant SCN_CALLTIPCLICK => 2021; #------------------------------------------------------------------------ # # New scintilla control # sub new { my $class = shift; my (%in) = @_; my %out; ### Filtering option for my $option qw( -name -parent -left -top -width -height -pos -size -pushstyle -addstyle -popstyle -remstyle -notstyle -negstyle -exstyle -pushexstyle -addexstyle -popexstyle -remexstyle -notexstyle ) { $out{$option} = $in{$option} if exists $in{$option}; } ### Default window my $constant = ($Win32::GUI::VERSION < 1.0303 ? Win32::GUI::constant("WIN32__GUI__STATIC",0) : Win32::GUI::_constant("WIN32__GUI__STATIC")); $out{-addstyle} = WS_CLIPCHILDREN; $out{-class} = "Scintilla"; ### Window style $out{-addstyle} |= WS_TABSTOP unless exists $in{-tabstop} && $in{-tabstop} == 0; #Default to -tabstop => 1 $out{-addstyle} |= WS_VISIBLE unless exists $in{-visible} && $in{-visible} == 0; #Default to -visible => 1 $out{-addstyle} |= WS_HSCROLL if exists $in{-hscroll} && $in{-hscroll} == 1; $out{-addstyle} |= WS_VSCROLL if exists $in{-vscroll} && $in{-vscroll} == 1; my $self = Win32::GUI->_new($constant, $class, -remstyle => 0xFFFFFFFF, %out); if (defined ($self)) { # Option Text : $self->SetText($in{-text}) if exists $in{-text}; $self->SetReadOnly($in{-readonly}) if exists $in{-readonly}; } return $self; } # # Win32 shortcut # sub Win32::GUI::Window::AddScintilla { my $parent = shift; return Win32::GUI::Scintilla->new (-parent => $parent, @_); } #------------------------------------------------------------------------ # Miscolous function #------------------------------------------------------------------------ # # Clear Scintilla Text # sub NewFile { my $self = shift; $self->ClearAll(); $self->EmptyUndoBuffer(); $self->SetSavePoint(); } # # Load text file to Scintilla # sub LoadFile { my ($self, $file) = @_; $self->ClearAll(); $self->Cancel(); $self->SetUndoCollection(0); open F, "<$file" or return 0; while ( <F> ) { $self->AppendText($_); } close F; $self->SetUndoCollection(1); $self->EmptyUndoBuffer(); $self->SetSavePoint(); $self->GotoPos(0); return 1; } # # Save Scintilla text to file # sub SaveFile { my ($self, $file) = @_; open F, ">$file" or return 0; for my $i (0..$self->GetLineCount()) { print F $self->GetLine ($i); } close F; $self->SetSavePoint(); return 1; } # # Help routine for StyleSet # sub StyleSetSpec { my ($self, $style, $textstyle) = @_; foreach my $prop (split (/,/, $textstyle)) { my ($key, $value) = split (/:/, $prop); $self->StyleSetFore($style, $value) if $key eq 'fore'; $self->StyleSetBack($style, $value) if $key eq 'back'; $self->StyleSetFont($style, $value) if $key eq 'face'; $self->StyleSetSize($style, int ($value) ) if $key eq 'size'; $self->StyleSetBold($style, 1) if $key eq 'bold'; $self->StyleSetBold($style, 0) if $key eq 'notbold'; $self->StyleSetItalic($style, 1) if $key eq 'italic'; $self->StyleSetItalic($style, 0) if $key eq 'notitalic'; $self->StyleSetUnderline($style, 1) if $key eq 'underline'; $self->StyleSetUnderline($style, 0) if $key eq 'notunderline'; $self->StyleSetEOLFilled ($style, 1) if $key eq 'eolfilled'; $self->StyleSetEOLFilled ($style, 0) if $key eq 'noteolfilled'; } } #------------------------------------------------------------------------ # Begin Autogenerate #------------------------------------------------------------------------ PREAMBLE # Autogenerate the contents from Include\Scintilla.iface # Build Scintilla interface open my $fh, "<" , "Include/Scintilla.iface" or die "Failed to open 'Include/Scintilla.iface' for reading: $!"; while ( <$fh> ) { #--- Constant --- if (/^val (.*)=(.*)$/) { print "use constant $1 => $2 ;\n"; } #--- Get --- elsif (/^get colour (.*)=(.*)\(,\)$/ ) { print "sub $1 {\n my \$self = shift;\n my \$colour = \$self->SendMessage ($2, 0, 0);\n \$colour = sprintf ('#%x', \$colour);\n \$colour =~ s/(.)(..)(..)(..)/\$1\$4\$3\$2/;\n return \$colour;\n}\n"; } elsif (/^get colour (.*)=(.*)\(int (.*),\)$/ ) { print "sub $1 {\n my (\$self, \$$3) = \@_;\n my \$colour = \$self->SendMessage ($2, \$$3, 0);\n \$colour = sprintf ('#%x', \$colour);\n \$colour =~ s/(.)(..)(..)(..)/\$1\$4\$3\$2/;\n return \$colour;\n}"; } elsif (/^get (.*) (.*)=(.*)\(,\)$/ ) { print "sub $2 {\n my \$self = shift;\n return \$self->SendMessage ($3, 0, 0);\n}\n"; } elsif (/^get int GetCharAt=2007\(position pos,\)$/ ) { print "sub GetCharAt {\n my (\$self, \$pos) = \@_;\n return chr \$self->SendMessage (2007, \$pos, 0);\n}\n"; } elsif (/^get int GetPropertyInt=4010\(string key,\)$/ ) { print "sub GetPropertyInt {\n my (\$self, \$key) = \@_;\n return \$self->SendMessagePP (4010, \$key, '');\n}\n"; } elsif (/^get (.*) (.*)=(.*)\(position (.*),\)$/ ) { print "sub $2 {\n my (\$self, \$$4) = \@_;\n return \$self->SendMessage ($3, \$$4, 0);\n}\n"; } elsif (/^get (.*) (.*)=(.*)\(int (.*),\)$/ ) { print "sub $2 {\n my (\$self, \$$4) = \@_;\n return \$self->SendMessage ($3, \$$4, 0);\n}\n"; } elsif (/^get (.*) (.*)=(.*)\(int (.*), int (.*)\)$/ ) { print "sub $2 {\n my (\$self, \$$4, \$$5) = \@_;\n return \$self->SendMessage ($3, \$$4, \$$5);\n}\n"; } #--- Set --- elsif (/^set (.*) (.*)=(.*)\(,\)$/ ) { print "sub $2 {\n my \$self = shift;\n return \$self->SendMessage ($3, 0, 0);\n}\n"; } elsif (/^set (.*) (.*)=(.*)\(bool (.*),\)$/ ) { print "sub $2 {\n my (\$self, \$$4) = \@_;\n return \$self->SendMessage ($3, \$$4, 0);\n}\n"; } elsif (/^set (.*) (.*)=(.*)\(int (.*),\)$/ ) { print "sub $2 {\n my (\$self, \$$4) = \@_;\n return \$self->SendMessage ($3, \$$4, 0);\n}\n"; } elsif (/^set (.*) (.*)=(.*)\(position (.*),\)$/ ) { print "sub $2 {\n my (\$self, \$$4) = \@_;\n return \$self->SendMessage ($3, \$$4, 0);\n}\n"; } elsif (/^set (.*) (.*)=(.*)\(colour (.*),\)$/ ) { print "sub $2 {\n my (\$self, \$$4) = \@_;\n \$$4 =~ s/.(..)(..)(..)/\$3\$2\$1/;\n return \$self->SendMessage ($3, int hex \$$4, 0);\n}\n"; } elsif (/^set (.*) (.*)=(.*)\(int (.*), int (.*)\)$/ ) { print "sub $2 {\n my (\$self, \$$4, \$$5) = \@_;\n return \$self->SendMessage ($3, \$$4, \$$5);\n}\n"; } elsif (/^set (.*) (.*)=(.*)\(int (.*), bool (.*)\)$/ ) { print "sub $2 {\n my (\$self, \$$4, \$$5) = \@_;\n return \$self->SendMessage ($3, \$$4, \$$5);\n}\n"; } elsif (/^set (.*) (.*)=(.*)\(bool (.*), colour (.*)\)$/ ) { print "sub $2 {\n my (\$self, \$$4, \$$5) = \@_;\n \$$5 =~ s/.(..)(..)(..)/\$3\$2\$1/;\n return \$self->SendMessage ($3, \$$4, int hex \$$5);\n}\n"; } elsif (/^set (.*) (.*)=(.*)\(int (.*), colour (.*)\)$/ ) { print "sub $2 {\n my (\$self, \$$4, \$$5) = \@_;\n \$$5 =~ s/.(..)(..)(..)/\$3\$2\$1/;\n return \$self->SendMessage ($3, \$$4, int hex \$$5);\n}\n"; } elsif (/^set (.*) (.*)=(.*)\(int (.*), string (.*)\)$/ ) { print "sub $2 {\n my (\$self, \$$4, \$$5) = \@_;\n return \$self->SendMessageNP ($3, \$$4, \$$5);\n}\n"; } elsif (/^set (.*) (.*)=(.*)\(string (.*), string (.*)\)$/ ) { print "sub $2 {\n my (\$self, \$$4, \$$5) = \@_;\n return \$self->SendMessagePP ($3, \$$4, \$$5);\n}\n"; } elsif (/^set (.*) (.*)=(.*)\(, string (.*)\)$/ ) { print "sub $2 {\n my (\$self, \$$4) = \@_;\n return \$self->SendMessageNP ($3, 0, \$$4);\n}\n"; } elsif (/^set (.*) (.*)=(.*)\(,\s?int (.*)\)$/ ) { print "sub $2 {\n my (\$self, \$$4) = \@_;\n return \$self->SendMessage ($3, 0, \$$4);\n}\n"; } #--- Special Function --- # AddText, ReplaceTarget, ReplaceTargetRE, SearchInTarget, AppendText, CopyText elsif (/^fun (.*) (.*)=(.*)\(int length, string text\)$/ ) { print "# $2(text)\n"; print "sub $2 {\n"; print ' my ($self, $text) = @_;', "\n"; print ' my $length = length $text;', "\n"; print " return \$self->SendMessageNP ($3, \$length, \$text);\n"; print '}', "\n"; } # AddStyledText elsif (/^fun void AddStyledText=2002\(int length, cells c\)$/ ) { print '# AddStyledText(styledtext)', "\n"; print 'sub AddStyledText {', "\n"; print ' my ($self, $text) = @_;', "\n"; print ' my $length = length $text;', "\n"; print ' return $self->SendMessageNP (2002, $length, $text);', "\n"; print '}', "\n"; } # GetStyledText and GetTextRange elsif (/^fun (.*) (.*)=(.*)\(, textrange (.*)\)$/ ) { print "sub $2 {\n my \$self = shift;\n my \$start = shift || 0;\n my \$end = shift || \$self->GetLength();\n\n"; print " return undef if \$start >= \$end;\n\n"; if ( $2 eq 'GetStyledText') { print " my \$text = \" \" x ((\$end - \$start + 1)*2);\n"; } else { print " my \$text = \" \" x (\$end - \$start + 1);\n"; } print " my \$textrange = pack(\"LLp\", \$start, \$end, \$text);\n"; print " \$self->SendMessageNP ($3, 0, \$textrange);\n"; print " return \$text;\n}\n"; } # GetCurLine elsif (/^fun int GetCurLine=2027\(int length, stringresult text\)$/) { print '# GetCurline () : Return curent line Text', "\n"; print 'sub GetCurLine {', "\n"; print ' my ($self) = @_;',"\n"; print ' my $line = $self->GetLineFromPosition ($self->GetCurrentPos());',"\n"; print ' my $lenght = $self->LineLength($line);',"\n"; print ' my $text = " " x ($lenght+1);',"\n\n"; print ' if ($self->SendMessageNP (2027, $lenght, $text)) {',"\n"; print ' return $text;',"\n"; print ' } else {',"\n"; print ' return undef;',"\n"; print ' }',"\n"; print '}',"\n"; } # GetLine elsif (/^fun int GetLine=2153\(int line, stringresult text\)/) { print '# Getline (line)', "\n"; print 'sub GetLine {', "\n"; print ' my ($self, $line) = @_;', "\n"; print ' my $lenght = $self->LineLength($line);', "\n"; print ' my $text = " " x ($lenght + 1);', "\n\n"; print ' if ($self->SendMessageNP (2153, $line, $text)) {', "\n"; print ' return $text;', "\n"; print ' } else {', "\n"; print ' return undef;', "\n"; print ' }', "\n"; print '}', "\n"; } # GetSelText elsif (/^fun int GetSelText=2161\(, stringresult text\)/) { print '# GetSelText() : Return selected text', "\n"; print 'sub GetSelText {', "\n"; print ' my $self = shift;', "\n"; print ' my $start = $self->GetSelectionStart();', "\n"; print ' my $end = $self->GetSelectionEnd();', "\n\n"; print ' return undef if $start >= $end;', "\n"; print ' my $text = " " x ($end - $start + 1);', "\n\n"; print ' $self->SendMessageNP (2161, 0, $text);', "\n"; print ' return $text;', "\n"; print '}', "\n"; } # TargetAsUTF8 elsif (/^fun int TargetAsUTF8=2447\(, stringresult s\)/) { print '# TargetAsUTF8() :', "\n"; print '# Returns the target converted to UTF8.',"\n"; print 'sub TargetAsUTF8 {', "\n"; print ' my $self = shift;', "\n"; print ' my $len = $self->SendMessage(2447,0,0);',"\n"; print ' my $text = " " x $len;', "\n\n"; print ' $self->SendMessageNP (2447, 0, $text);', "\n"; print ' return $text;', "\n"; print '}', "\n"; } # EncodeFromUTF8 elsif (/^fun int EncodedFromUTF8=2449\(string utf8, stringresult encoded\)/) { print '# EncodedFromUTF8() :', "\n"; print '# Translates a UTF8 string into the document encoding.',"\n"; print '# Return the length of the result in bytes.',"\n"; print '# On error return 0.',"\n"; print 'sub EncodedFromUTF8 {', "\n"; print ' my ($self, $src) = @_;', "\n"; print ' my $len = $self->SendMessagePN(2449,$src,0);',"\n"; print ' my $text = " " x $len;', "\n\n"; print ' if($self->SendMessagePP (2449, $src, $text)) {', "\n"; print ' return $text;', "\n"; print ' }', "\n"; print ' else {', "\n"; print ' return undef;', "\n"; print ' }', "\n"; print '}', "\n"; } # GetText : elsif (/^fun int GetText=2182\(int length, stringresult text\)/) { print '# GetText() : Return all text', "\n"; print 'sub GetText {', "\n"; print ' my $self = shift;', "\n"; print ' my $lenght = $self->GetTextLength() + 1;', "\n"; print ' my $text = " " x ($lenght+1);', "\n\n"; print ' if ($self->SendMessageNP (2182, $lenght, $text)) {', "\n"; print ' return $text;', "\n"; print ' } else {', "\n"; print ' return undef;', "\n"; print ' }', "\n"; print '}', "\n"; } # FindText : elsif (/^fun position FindText=2150\(int flags, findtext ft\)/) { print '# FindText (textToFind, start=0, end=GetLength(), flag = SCFIND_WHOLEWORD)', "\n"; print 'sub FindText {', "\n"; print ' my $self = shift;', "\n"; print ' my $text = shift;', "\n"; print ' my $start = shift || 0;', "\n"; print ' my $end = shift || $self->GetLength();', "\n"; print ' my $flag = shift || SCFIND_WHOLEWORD;', "\n\n"; print ' return undef if $start >= $end;', "\n\n"; print ' my $texttofind = pack("LLpLL", $start, $end, $text, 0, 0);', "\n"; print ' my $pos = $self->SendMessageNP (2150, $flag, $texttofind);', "\n"; print ' return $pos unless defined wantarray;', "\n"; print ' my @res = unpack("LLpLL", $texttofind);', "\n"; print ' return ($res[3], $res[4]); # pos , lenght', "\n"; print '}', "\n"; } # GetProperty and GetPropertyExpanded : elsif (/^fun int (.+)=(\d+)\(string key, stringresult buf\)/) { print '# GetProperty(): Retrieve a "property" value previously set with SetProperty.',"\n"; print '# GetPropertyExpanded() with "$()" variable replacement on returned buffer.',"\n"; print 'sub '.$1.' {', "\n"; print ' my ($self, $key) = @_;', "\n"; print ' my $len = $self->SendMessagePN('.$2.', $key, 0);', "\n"; print ' my $text = " " x $len;', "\n\n"; print ' $self->SendMessagePP ('.$2.', $key, $text);', "\n"; print ' return $text;', "\n"; print '}', "\n"; } # GetPropertyExpanded : elsif (/^fun int GetPropertyExpanded=4008\(string key, stringresult buf\)/) { print '# GetPropertyExpanded(): Retrieve a "property" value previously set with SetProperty.',"\n"; print 'sub GetProperty {', "\n"; print ' my ($self, $key) = @_;', "\n"; print ' my $len = $self->SendMessagePN(4008, $key, 0);', "\n"; print ' my $text = " " x $len;', "\n\n"; print ' $self->SendMessagePP (4008, $key, $text);', "\n"; print ' return $text;', "\n"; print '}', "\n"; } # FindRange : elsif (/^fun position FormatRange=2151\(bool draw, formatrange fr\)/) { print '# FormatRange (start=0, end=GetLength(), draw=1)', "\n"; print 'sub FormatRange {', "\n"; print ' my $self = shift;', "\n"; print ' my $start = shift || 0;', "\n"; print ' my $end = shift || $self->GetLength();', "\n"; print ' my $draw = shift || 1;', "\n"; print ' return undef if $start >= $end;', "\n\n"; print ' my $formatrange = pack("LL", $start, $end);', "\n"; print ' return $self->SendMessageNP (2151, $draw, $formatrange);', "\n"; print '}', "\n"; } #--- Function --- elsif (/^fun (.*) (.*)=(.*)\(,\)$/ ) { print "sub $2 {\n my \$self = shift;\n return \$self->SendMessage ($3, 0, 0);\n}\n"; } elsif (/^fun (.*) (.*)=(.*)\(bool (.*),\)$/ ) { print "sub $2 {\n my (\$self, \$$4) = \@_;\n return \$self->SendMessage ($3, \$$4, 0);\n}\n"; } elsif (/^fun (.*) (.*)=(.*)\(int (.*),\)$/ ) { print "sub $2 {\n my (\$self, \$$4) = \@_;\n return \$self->SendMessage ($3, \$$4, 0);\n}\n"; } elsif (/^fun (.*) (.*)=(.*)\(position (.*),\)$/ ) { print "sub $2 {\n my (\$self, \$$4) = \@_;\n return \$self->SendMessage ($3, \$$4, 0);\n}\n"; } elsif (/^fun (.*) (.*)=(.*)\(, position (.*)\)$/ ) { print "sub $2 {\n my (\$self, \$$4) = \@_;\n return \$self->SendMessage ($3, 0, \$$4);\n}\n"; } elsif (/^fun (.*) (.*)=(.*)\(int (.*), int (.*)\)$/ ) { print "sub $2 {\n my (\$self, \$$4, \$$5) = \@_;\n return \$self->SendMessage ($3, \$$4, \$$5);\n}\n"; } elsif (/^fun (.*) (.*)=(.*)\(int (.*), colour (.*)\)$/ ) { print "sub $2 {\n my (\$self, \$$4, \$$5) = \@_;\n \$$5 =~ s/.(..)(..)(..)/\$3\$2\$1/;\n return \$self->SendMessage ($3, \$$4, int hex \$$5);\n}\n"; } elsif (/^fun (.*) (.*)=(.*)\(int (.*), string (.*)\)$/ ) { print "sub $2 {\n my (\$self, \$$4, \$$5) = \@_;\n return \$self->SendMessageNP ($3, \$$4, \$$5);\n}\n"; } elsif (/^fun (.*) (.*)=(.*)\(, string (.*)\)$/ ) { print "sub $2 {\n my (\$self, \$$4) = \@_;\n return \$self->SendMessageNP ($3, 0, \$$4);\n}\n"; } elsif (/^fun (.*) (.*)=(.*)\(, int (.*)\)$/ ) { print "sub $2 {\n my (\$self, \$$4) = \@_;\n return \$self->SendMessage ($3, 0, \$$4);\n}\n"; } elsif (/^fun (.*) (.*)=(.*)\(position (.*), string (.*)\)$/ ) { print "sub $2 {\n my (\$self, \$$4, \$$5) = \@_;\n return \$self->SendMessageNP ($3, \$$4, \$$5);\n}\n"; } elsif (/^fun (.*) (.*)=(.*)\(position (.*), bool (.*)\)$/ ) { print "sub $2 {\n my (\$self, \$$4, \$$5) = \@_;\n return \$self->SendMessage ($3, \$$4, \$$5);\n}\n"; } elsif (/^fun (.*) (.*)=(.*)\(position (.*), int (.*)\)$/ ) { print "sub $2 {\n my (\$self, \$$4, \$$5) = \@_;\n return \$self->SendMessage ($3, \$$4, \$$5);\n}\n"; } elsif (/^fun (.*) (.*)=(.*)\(position (.*), position (.*)\)$/ ) { print "sub $2 {\n my (\$self, \$$4, \$$5) = \@_;\n return \$self->SendMessage ($3, \$$4, \$$5);\n}\n"; } elsif (/^fun (.*) (.*)=(.*)\(bool (.*), colour (.*)\)$/ ) { print "sub $2 {\n my (\$self, \$$4, \$$5) = \@_;\n \$$5 =~ s/.(..)(..)(..)/\$3\$2\$1/;\n return \$self->SendMessage ($3, \$$4, int hex \$$5);\n}\n"; } elsif (/^fun (.*) (.*)=(.*)\(int (.*), cells (.*)\)$/ ) { print "sub $2 {\n my (\$self, \$$4, \$$5) = \@_;\n return \$self->SendMessageNP ($3, \$$4, \$$5);\n}\n"; } elsif (/^fun (.*) (.*)=(.*)\(keymod (.*),\)$/ ) { print "sub $2 {\n my (\$self, \$key, \$modifiers) = \@_;\n"; print " my \$param = pack ('ss', \$key, \$modifiers);\n"; print " return \$self->SendMessage ($3, \$param, 0);\n}\n"; } elsif (/^fun (.*) (.*)=(.*)\(keymod (.*), int (.*)\)$/ ) { print "sub $2 {\n my (\$self, \$key, \$modifiers, \$$5) = \@_;\n"; print " my \$param = pack ('ss', \$key, \$modifiers);\n"; print " return \$self->SendMessage ($3, \$param, \$$5);\n}\n"; } #--- Comment --- elsif (/^\#\s(.*)$/) { print "# $1\n"; } elsif (/^lex (.*)$/) { print "# $1\n"; } #--- Error ---- elsif (/^fun (.*)$/) { print STDERR "===> Function = $1\n"; } elsif (/^set (.*)$/) { print STDERR "===> Set = $1\n"; } elsif (/^get (.*)$/) { print STDERR "===> Get = $1\n"; } } close $fh; # Add Postamble # was: scintilla.pm.end print <<'POSTAMBLE'; #------------------------------------------------------------------------ # End Autogenerate #------------------------------------------------------------------------ # Code Here because need constant #------------------------------------------------------------------------ # BraceHighEvent Management #------------------------------------------------------------------------ sub BraceHighEvent { my $self = shift; my $braces = shift || "[]{}()"; my $braceAtCaret = -1; my $braceOpposite = -1; my $caretPos = $self->GetCurrentPos(); if ($caretPos > 0) { my $charBefore = $self->GetCharAt($caretPos - 1); $braceAtCaret = $caretPos - 1 if (index ($braces, $charBefore) >= 0 ); } if ($braceAtCaret < 0) { my $charAfter = $self->GetCharAt($caretPos); my $styleAfter = $self->GetCharAt($caretPos); $braceAtCaret = $caretPos if (index ($braces, $charAfter) >= 0); } $braceOpposite = $self->BraceMatch($braceAtCaret) if ($braceAtCaret >= 0); if ($braceAtCaret != -1 and $braceOpposite == -1) { $self->BraceBadLight($braceAtCaret); } else { $self->BraceHighlight($braceAtCaret, $braceOpposite); } } #------------------------------------------------------------------------ # Folder Management #------------------------------------------------------------------------ # Folder Event call # If Shift and Control are pressed, open or close all folder # Otherwise # if shift is pressed, Toggle 1 level of current folder # else if control is pressed, expand all subfolder of current folder # else Toggle current folder sub FolderEvent { my $self = shift; my (%evt) = @_; if ($evt{-shift} and $evt{-control}) { $self->FolderAll(); } else { my $lineClicked = $self->LineFromPosition($evt{-position}); if ($self->GetFoldLevel($lineClicked) & Win32::GUI::Scintilla::SC_FOLDLEVELHEADERFLAG) { if ($evt{-shift}) { $self->SetFoldExpanded($lineClicked, 1); $self->FolderExpand($lineClicked, 1, 1, 1); } elsif ($evt{-control}) { if ($self->GetFoldExpanded($lineClicked)) { $self->SetFoldExpanded($lineClicked, 0); $self->FolderExpand($lineClicked, 0, 1, 0); } else { $self->SetFoldExpanded($lineClicked, 1); $self->FolderExpand($lineClicked, 1, 1, 100); } } else { $self->ToggleFold($lineClicked); } } } } # Open All Folder sub FolderAll { my $self = shift; my $lineCount = $self->GetLineCount(); my $expanding = 1; my $lineNum; # find out if we are folding or unfolding for $lineNum (1..$lineCount) { if ($self->GetFoldLevel($lineNum) & Win32::GUI::Scintilla::SC_FOLDLEVELHEADERFLAG) { $expanding = not $self->GetFoldExpanded($lineNum); last; } } $lineNum = 0; while ($lineNum < $lineCount) { my $level = $self->GetFoldLevel($lineNum); if (($level & Win32::GUI::Scintilla::SC_FOLDLEVELHEADERFLAG) and ($level & Win32::GUI::Scintilla::SC_FOLDLEVELNUMBERMASK) == Win32::GUI::Scintilla::SC_FOLDLEVELBASE) { if ($expanding) { $self->SetFoldExpanded($lineNum, 1); $lineNum = $self->FolderExpand($lineNum, 1); $lineNum--; } else { my $lastChild = $self->GetLastChild($lineNum, -1); $self->SetFoldExpanded($lineNum, 0); $self->HideLines($lineNum+1, $lastChild) if ($lastChild > $lineNum); } } $lineNum++; } } # Expand folder sub FolderExpand { my $self = shift; my $line = shift; my $doExpand = shift; my $force = shift || 0; my $visLevels= shift || 0; my $level = shift || -1; my $lastChild = $self->GetLastChild($line, $level); $line++; while ($line <= $lastChild) { if ($force) { if ($visLevels > 0) { $self->ShowLines($line, $line); } else { $self->HideLines($line, $line); } } else { $self->ShowLines($line, $line) if ($doExpand); } $level = $self->GetFoldLevel($line) if ($level == -1); if ($level & Win32::GUI::Scintilla::SC_FOLDLEVELHEADERFLAG) { if ($force) { if ($visLevels > 1) { $self->SetFoldExpanded($line, 1); } else { $self->SetFoldExpanded($line, 0); } $line = $self->FolderExpand($line, $doExpand, $force, $visLevels-1); } else { if ($doExpand and $self->GetFoldExpanded($line)) { $line = $self->FolderExpand($line, 1, $force, $visLevels-1); } else { $line = $self->FolderExpand($line, 0, $force, $visLevels-1); } } } else { $line ++; } } return $line; } #------------------------------------------------------------------------ # Find Management #------------------------------------------------------------------------ sub FindAndSelect { my $self = shift; my $text = shift; my $flag = shift || Win32::GUI::Scintilla::SCFIND_WHOLEWORD; my $direction = shift || 1; my $wrap = shift || 1; my ($start, $end); # Set Search target if ($direction >= 0) { $start = $self->GetSelectionEnd (); $end = $self->GetLength(); } else { $start = $self->GetSelectionStart() - 1; $end = 0; } $self->SetTargetStart ($start); $self->SetTargetEnd ($end); $self->SetSearchFlags ($flag); # Find text my $pos = $self->SearchInTarget($text); # Not found and Wrap mode if ($pos == -1 and $wrap == 1) { # New search target if ($direction >= 0) { $start = 0; $end = $self->GetLength(); } else { $start = $self->GetLength(); $end = 0; } $self->SetTargetStart ($start); $self->SetTargetEnd ($end); # Find Text $pos = $self->SearchInTarget($text); } # Select and visible unless ($pos == -1) { # GetTarget $start = $self->GetTargetStart(); $end = $self->GetTargetEnd(); # Ensure range visible my ($lstart, $lend); if ($start <= $end) { $lstart = $self->LineFromPosition($start); $lend = $self->LineFromPosition($end); } else { $lstart = $self->LineFromPosition($end); $lend = $self->LineFromPosition($start); } for my $i ($lstart .. $lend) { $self->EnsureVisible ($i); } # Select Target $self->SetSel ($start, $end); } else { $self->SetSelectionStart ($self->GetSelectionEnd()); } return $pos; } 1; # End of Scintilla.pm __END__ POSTAMBLE __END__ --- README DELETED --- Index: Changes =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Scintilla/Changes,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Changes 5 Dec 2005 10:37:56 -0000 1.2 --- Changes 11 Jun 2006 16:51:44 -0000 1.3 *************** *** 1,4 **** --- 1,13 ---- Revision history for Perl extension Scintilla. + 1.90 24/05/2006 + - Merge into Win32::GUI Core codebase + - refactor build process + - new loading mechanism for SciLexer.dll - find using @INC + - Use Scintilla 1.68 + - add basic tests + - stop using deprecated -style option for window creation + - split pod into seperate Scintilla.pod file + 1.8 05/12/2005 - Fixed bugs which caused crashes and no events firing in perl 5.8.x --- Scintilla.html DELETED --- Index: Scintilla.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Scintilla/Scintilla.xs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Scintilla.xs 5 Dec 2005 10:37:56 -0000 1.2 --- Scintilla.xs 11 Jun 2006 16:51:48 -0000 1.3 *************** *** 8,12 **** //we will need/use ! #include "../Win32-GUI/GUI.h" #include "./include/Scintilla.h" --- 8,12 ---- //we will need/use ! #include "../GUI.h" #include "./include/Scintilla.h" *************** *** 67,71 **** if(perl_get_cv(Name, FALSE) != NULL) { dSP; ! dTARG; ENTER; SAVETMPS; --- 67,71 ---- if(perl_get_cv(Name, FALSE) != NULL) { dSP; ! /* dTARG; */ ENTER; SAVETMPS; *************** *** 164,168 **** if(perl_get_cv(Name, FALSE) != NULL) { dSP; ! dTARG; ENTER; SAVETMPS; --- 164,168 ---- if(perl_get_cv(Name, FALSE) != NULL) { dSP; ! /* dTARG; */ ENTER; SAVETMPS; *************** *** 261,264 **** --- 261,266 ---- MODULE = Win32::GUI::Scintilla PACKAGE = Win32::GUI::Scintilla + PROTOTYPES: ENABLE + ########################################################################### # _Initialise() (internal) *************** *** 297,300 **** --- 299,317 ---- ########################################################################### + # SendMessagePN : Posts a message to a window + # Take WPARAM as LPVOID and LPARAM as int + + LRESULT + SendMessagePN(handle,msg,wparam,lparam) + HWND handle + UINT msg + LPVOID wparam + int lparam + CODE: + RETVAL = SendMessage(handle, msg, (WPARAM) wparam, (LPARAM) lparam); + OUTPUT: + RETVAL + + ########################################################################### # SendMessagePP : Posts a message to a window # Take WPARAM and LPARAM as a LPVOID Index: Perl.pm =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Scintilla/Perl.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Perl.pm 1 Nov 2005 10:36:51 -0000 1.1 --- Perl.pm 11 Jun 2006 16:51:44 -0000 1.2 *************** *** 1,6 **** =head1 NAME ! Win32::GUI::Scintilla::Perl -- Scintilla control with Perl ! awareness. =head1 SYNOPSIS --- 1,14 ---- + package Win32::GUI::Scintilla::Perl; + + # $Id$ + + use strict; + use warnings; + + use Win32::GUI::Scintilla(); + =head1 NAME ! Win32::GUI::Scintilla::Perl -- Scintilla control with Perl awareness. =head1 SYNOPSIS *************** *** 23,30 **** =cut - package Win32::GUI::Scintilla::Perl; - - use strict; - use Win32::GUI::Scintilla; =head1 METHODS --- 31,34 ---- --- MANIFEST DELETED --- --- NEW FILE: TODO --- - Scintilla.PL should be re-written to be more generic when parsing scintilla.iface - Generate the majority of Scintilla.pod from scintilla.iface - More subclasses for syntax high-lighting other languages - use Scintilla; should fail gracefully if we fail to load SciLexer.dll - find a way to make Scintilla (SciLexer.dll) play nicely with PAR Index: Typemap =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Scintilla/Typemap,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Typemap 1 Nov 2005 10:36:51 -0000 1.1 --- Typemap 11 Jun 2006 16:51:49 -0000 1.2 *************** *** 1,19 **** TYPEMAP HWND T_HANDLE - HTREEITEM T_IV - LONG T_IV - LPCTSTR T_PV - LPTSTR T_PV - DWORD T_IV UINT T_IV - BOOL T_IV WPARAM T_IV - LPARAM T_IV - LRESULT T_IV - HINSTANCE T_IV - COLORREF T_COLOR - LPCSTR T_PV - FLOAT T_FLOAT LPVOID T_PV ################################################################################ --- 1,8 ---- TYPEMAP HWND T_HANDLE UINT T_IV WPARAM T_IV LPVOID T_PV + LRESULT T_IV ################################################################################ *************** *** 21,28 **** T_HANDLE if(SvROK($arg)) { ! if(hv_fetch((HV*)SvRV($arg), \"-handle\", 7, 0) != NULL) ! $var = ($type) SvIV(*(hv_fetch((HV*)SvRV($arg), \"-handle\", 7, 0))); else $var = NULL; } else ! $var = ($type) SvIV($arg); --- 10,18 ---- T_HANDLE if(SvROK($arg)) { ! SV** out=hv_fetch((HV*)SvRV($arg), \"-handle\", 7, 0); ! if(out != NULL) ! $var = INT2PTR($type,SvIV(*out)); else $var = NULL; } else ! $var = INT2PTR($type,SvIV($arg)); --- Scintilla.pm.end DELETED --- |
|
From: Robert M. <rob...@us...> - 2006-06-11 16:51:54
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Scintilla/Include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26402/Include Modified Files: Readme.txt SciLexer.dll Scintilla.iface Added Files: License.txt Removed Files: autogen.pl Log Message: Merge Scintilla into core distribution Index: Scintilla.iface =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Scintilla/Include/Scintilla.iface,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Scintilla.iface 1 Nov 2005 10:36:51 -0000 1.1 --- Scintilla.iface 11 Jun 2006 16:51:49 -0000 1.2 *************** *** 54,58 **** ## colour -> colour integer containing red, green and blue bytes. ## string -> pointer to const character ! ## stringresult -> pointer to character ## cells -> pointer to array of cells, each cell containing a style byte and character byte ## textrange -> range of a min and a max position with an output string --- 54,58 ---- ## colour -> colour integer containing red, green and blue bytes. ## string -> pointer to const character ! ## stringresult -> pointer to character, NULL-> return size of result ## cells -> pointer to array of cells, each cell containing a style byte and character byte ## textrange -> range of a min and a max position with an output string *************** *** 71,79 **** ## for possibly #defining the constants ## String arguments may contain NUL ('\0') characters where the calls provide a length ## argument and retrieve NUL characters. All retrieved strings except for those retrieved ## by GetLine also have a NUL appended but client code should calculate the size that ## will be returned rather than relying upon the NUL whenever possible. Allow for the ! ## extra NUL character when allocating buffers. cat Basics --- 71,81 ---- ## for possibly #defining the constants + ## Line numbers and positions start at 0. ## String arguments may contain NUL ('\0') characters where the calls provide a length ## argument and retrieve NUL characters. All retrieved strings except for those retrieved ## by GetLine also have a NUL appended but client code should calculate the size that ## will be returned rather than relying upon the NUL whenever possible. Allow for the ! ## extra NUL character when allocating buffers. The size to allocate for a stringresult ! ## can be determined by calling with a NULL (0) pointer. cat Basics *************** *** 88,92 **** val SCI_LEXER_START=4000 ! # Add text to the document. fun void AddText=2001(int length, string text) --- 90,94 ---- val SCI_LEXER_START=4000 ! # Add text to the document at current position. fun void AddText=2001(int length, string text) *************** *** 103,107 **** fun void ClearDocumentStyle=2005(,) ! # The number of characters in the document. get int GetLength=2006(,) --- 105,109 ---- fun void ClearDocumentStyle=2005(,) ! # Returns the number of characters in the document. get int GetLength=2006(,) *************** *** 266,269 **** --- 268,272 ---- val SC_MARK_ARROWS=24 val SC_MARK_PIXMAP=25 + val SC_MARK_FULLRECT=26 val SC_MARK_CHARACTER=10000 *************** *** 311,314 **** --- 314,320 ---- fun void MarkerDefinePixmap=2049(int markerNumber, string pixmap) + # Add a set of markers to a line. + fun void MarkerAddSet=2466(int line, int set) + enu MarginType=SC_MARGIN_ val SC_MARGIN_SYMBOL=0 *************** *** 339,344 **** get bool GetMarginSensitiveN=2247(int margin,) ! # Styles in range 32..37 are predefined for parts of the UI and are not used as normal styles. ! # Styles 38 and 39 are for future use. enu StylesCommon=STYLE_ val STYLE_DEFAULT=32 --- 345,350 ---- get bool GetMarginSensitiveN=2247(int margin,) ! # Styles in range 32..38 are predefined for parts of the UI and are not used as normal styles. ! # Style 39 is for future use. enu StylesCommon=STYLE_ val STYLE_DEFAULT=32 *************** *** 348,351 **** --- 354,358 ---- val STYLE_CONTROLCHAR=36 val STYLE_INDENTGUIDE=37 + val STYLE_CALLTIP=38 val STYLE_LASTPREDEFINED=39 val STYLE_MAX=127 *************** *** 365,368 **** --- 372,376 ---- val SC_CHARSET_OEM=255 val SC_CHARSET_RUSSIAN=204 + val SC_CHARSET_CYRILLIC=1251 val SC_CHARSET_SHIFTJIS=128 val SC_CHARSET_SYMBOL=2 *************** *** 373,376 **** --- 381,385 ---- val SC_CHARSET_VIETNAMESE=163 val SC_CHARSET_THAI=222 + val SC_CHARSET_8859_15=1000 # Clear all the styles and make equivalent to the global default style. *************** *** 467,470 **** --- 476,480 ---- val INDIC_HIDDEN=5 val INDIC_BOX=6 + val INDIC_ROUNDBOX=7 val INDIC0_MASK=0x20 val INDIC1_MASK=0x40 *************** *** 606,609 **** --- 616,633 ---- set void AutoCSetTypeSeparator=2286(int separatorCharacter,) + # Set the maximum width, in characters, of auto-completion and user lists. + # Set to 0 to autosize to fit longest item, which is the default. + set void AutoCSetMaxWidth=2208(int characterCount,) + + # Get the maximum width, in characters, of auto-completion and user lists. + get int AutoCGetMaxWidth=2209(,) + + # Set the maximum height, in rows, of auto-completion and user lists. + # The default is 5 rows. + set void AutoCSetMaxHeight=2210(int rowCount,) + + # Set the maximum height, in rows, of auto-completion and user lists. + get int AutoCGetMaxHeight=2211(,) + # Set the number of spaces used for one level of indentation. set void SetIndent=2122(int indentSize,) *************** *** 898,901 **** --- 922,928 ---- set void CallTipSetForeHlt=2207(colour fore,) + # Enable use of STYLE_CALLTIP and set call tip tab size in pixels. + set void CallTipUseStyle=2212(int tabSize,) + # Find the display line of a document line taking hidden lines into account. fun int VisibleFromDocLine=2220(int line,) *************** *** 904,907 **** --- 931,937 ---- fun int DocLineFromVisible=2221(int lineDisplay,) + # The number of display lines needed to wrap a document line + fun int WrapCount=2235(int line,) + enu FoldLevel=SC_FOLDLEVEL val SC_FOLDLEVELBASE=0x400 *************** *** 993,996 **** --- 1023,1027 ---- val SC_WRAP_NONE=0 val SC_WRAP_WORD=1 + val SC_WRAP_CHAR=2 # Sets whether text is word wrapped. *************** *** 1000,1003 **** --- 1031,1062 ---- get int GetWrapMode=2269(,) + enu WrapVisualFlag=SC_WRAPVISUALFLAG_ + val SC_WRAPVISUALFLAG_NONE=0x0000 + val SC_WRAPVISUALFLAG_END=0x0001 + val SC_WRAPVISUALFLAG_START=0x0002 + + # Set the display mode of visual flags for wrapped lines. + set void SetWrapVisualFlags=2460(int wrapVisualFlags,) + + # Retrive the display mode of visual flags for wrapped lines. + get int GetWrapVisualFlags=2461(,) + + enu WrapVisualLocation=SC_WRAPVISUALFLAGLOC_ + val SC_WRAPVISUALFLAGLOC_DEFAULT=0x0000 + val SC_WRAPVISUALFLAGLOC_END_BY_TEXT=0x0001 + val SC_WRAPVISUALFLAGLOC_START_BY_TEXT=0x0002 + + # Set the location of visual flags for wrapped lines. + set void SetWrapVisualFlagsLocation=2462(int wrapVisualFlagsLocation,) + + # Retrive the location of visual flags for wrapped lines. + get int GetWrapVisualFlagsLocation=2463(,) + + # Set the start indent for wrapped lines. + set void SetWrapStartIndent=2464(int indent,) + + # Retrive the start indent for wrapped lines. + get int GetWrapStartIndent=2465(,) + enu LineCache=SC_CACHE_ val SC_CACHE_NONE=0 *************** *** 1030,1034 **** # Retrieve whether the maximum scroll position has the last # line at the bottom of the view. ! get int GetEndAtLastLine=2278(,) # Retrieve the height of a particular line of text in pixels. --- 1089,1093 ---- # Retrieve whether the maximum scroll position has the last # line at the bottom of the view. ! get bool GetEndAtLastLine=2278(,) # Retrieve the height of a particular line of text in pixels. *************** *** 1393,1397 **** # Set the focus to this Scintilla widget. - # GTK+ Specific. fun void GrabFocus=2400(,) --- 1452,1455 ---- *************** *** 1553,1556 **** --- 1611,1659 ---- fun void Allocate=2446(int bytes,) + # Returns the target converted to UTF8. + # Return the length in bytes. + fun int TargetAsUTF8=2447(, stringresult s) + + # Set the length of the utf8 argument for calling EncodedFromUTF8. + # Set to -1 and the string will be measured to the first nul. + fun void SetLengthForEncode=2448(int bytes,) + + # Translates a UTF8 string into the document encoding. + # Return the length of the result in bytes. + # On error return 0. + fun int EncodedFromUTF8=2449(string utf8, stringresult encoded) + + # Find the position of a column on a line taking into account tabs and + # multi-byte characters. If beyond end of line, return line end position. + fun int FindColumn=2456(int line, int column) + + # Can the caret preferred x position only be changed by explicit movement commands? + get bool GetCaretSticky=2457(,) + + # Stop the caret preferred x position changing when the user types. + set void SetCaretSticky=2458(bool useCaretStickyBehaviour,) + + # Switch between sticky and non-sticky: meant to be bound to a key. + fun void ToggleCaretSticky=2459(,) + + # Enable/Disable convert-on-paste for line endings + set void SetPasteConvertEndings=2467(bool convert,) + + # Get convert-on-paste setting + get bool GetPasteConvertEndings=2468(,) + + # Duplicate the selection. If selection empty duplicate the line containing the caret. + fun void SelectionDuplicate=2469(,) + + val SC_ALPHA_TRANSPARENT=0 + val SC_ALPHA_OPAQUE=255 + val SC_ALPHA_NOALPHA=256 + + # Set background alpha of the caret line. + set void SetCaretLineBackAlpha=2470(int alpha,) + + # Get the background alpha of the caret line. + get int GetCaretLineBackAlpha=2471(,) + # Start notifying the container of all key presses and commands. fun void StartRecord=3001(,) *************** *** 1583,1586 **** --- 1686,1703 ---- fun void LoadLexerLibrary=4007(, string path) + # Retrieve a "property" value previously set with SetProperty. + fun int GetProperty=4008(string key, stringresult buf) + + # Retrieve a "property" value previously set with SetProperty, + # with "$()" variable replacement on returned buffer. + fun int GetPropertyExpanded=4009(string key, stringresult buf) + + # Retrieve a "property" value previously set with SetProperty, + # interpreted as an int AFTER any "$()" variable replacement. + get int GetPropertyInt=4010(string key,) + + # Retrieve the number of bits the current lexer needs for styling. + get int GetStyleBitsNeeded=4011(,) + # Notifications # Type of modification and the action which caused the modification. *************** *** 1595,1603 **** val SC_PERFORMED_UNDO=0x20 val SC_PERFORMED_REDO=0x40 val SC_LASTSTEPINUNDOREDO=0x100 val SC_MOD_CHANGEMARKER=0x200 val SC_MOD_BEFOREINSERT=0x400 val SC_MOD_BEFOREDELETE=0x800 ! val SC_MODEVENTMASKALL=0xF77 # For compatibility, these go through the COMMAND notification rather than NOTIFY --- 1712,1722 ---- val SC_PERFORMED_UNDO=0x20 val SC_PERFORMED_REDO=0x40 + val SC_MULTISTEPUNDOREDO=0x80 val SC_LASTSTEPINUNDOREDO=0x100 val SC_MOD_CHANGEMARKER=0x200 val SC_MOD_BEFOREINSERT=0x400 val SC_MOD_BEFOREDELETE=0x800 ! val SC_MULTILINEUNDOREDO=0x1000 ! val SC_MODEVENTMASKALL=0x1FFF # For compatibility, these go through the COMMAND notification rather than NOTIFY *************** *** 1633,1636 **** --- 1752,1756 ---- enu KeyMod=SCMOD_ + val SCMOD_NORM=0 val SCMOD_SHIFT=1 val SCMOD_CTRL=2 *************** *** 1669,1674 **** val SCLEX_BULLANT=27 val SCLEX_VBSCRIPT=28 - val SCLEX_ASP=29 - val SCLEX_PHP=30 val SCLEX_BAAN=31 val SCLEX_MATLAB=32 --- 1789,1792 ---- *************** *** 1697,1700 **** --- 1815,1839 ---- val SCLEX_MSSQL=55 val SCLEX_VERILOG=56 + val SCLEX_KIX=57 + val SCLEX_GUI4CLI=58 + val SCLEX_SPECMAN=59 + val SCLEX_AU3=60 + val SCLEX_APDL=61 + val SCLEX_BASH=62 + val SCLEX_ASN1=63 + val SCLEX_VHDL=64 + val SCLEX_CAML=65 + val SCLEX_BLITZBASIC=66 + val SCLEX_PUREBASIC=67 + val SCLEX_HASKELL=68 + val SCLEX_PHPSCRIPT=69 + val SCLEX_TADS3=70 + val SCLEX_REBOL=71 + val SCLEX_SMALLTALK=72 + val SCLEX_FLAGSHIP=73 + val SCLEX_CSOUND=74 + val SCLEX_FREEBASIC=75 + val SCLEX_INNOSETUP=76 + val SCLEX_OPAL=77 # When a lexer specifies its language as SCLEX_AUTOMATIC it receives a *************** *** 1703,1707 **** # Lexical states for SCLEX_PYTHON lex Python=SCLEX_PYTHON SCE_P_ - lex Ruby=SCLEX_RUBY SCE_P_ val SCE_P_DEFAULT=0 val SCE_P_COMMENTLINE=1 --- 1842,1845 ---- *************** *** 1718,1726 **** val SCE_P_COMMENTBLOCK=12 val SCE_P_STRINGEOL=13 # Lexical states for SCLEX_CPP lex Cpp=SCLEX_CPP SCE_C_ - lex SQL=SCLEX_SQL SCE_C_ lex Pascal=SCLEX_PASCAL SCE_C_ - lex TCL=SCLEX_TCL SCE_C_ lex BullAnt=SCLEX_BULLANT SCE_C_ val SCE_C_DEFAULT=0 --- 1856,1864 ---- val SCE_P_COMMENTBLOCK=12 val SCE_P_STRINGEOL=13 + val SCE_P_WORD2=14 + val SCE_P_DECORATOR=15 # Lexical states for SCLEX_CPP lex Cpp=SCLEX_CPP SCE_C_ lex Pascal=SCLEX_PASCAL SCE_C_ lex BullAnt=SCLEX_BULLANT SCE_C_ val SCE_C_DEFAULT=0 *************** *** 1744,1747 **** --- 1882,1907 ---- val SCE_C_COMMENTDOCKEYWORDERROR=18 val SCE_C_GLOBALCLASS=19 + # Lexical states for SCLEX_TCL + lex TCL=SCLEX_TCL SCE_TCL_ + val SCE_TCL_DEFAULT=0 + val SCE_TCL_COMMENT=1 + val SCE_TCL_COMMENTLINE=2 + val SCE_TCL_NUMBER=3 + val SCE_TCL_WORD_IN_QUOTE=4 + val SCE_TCL_IN_QUOTE=5 + val SCE_TCL_OPERATOR=6 + val SCE_TCL_IDENTIFIER=7 + val SCE_TCL_SUBSTITUTION=8 + val SCE_TCL_SUB_BRACE=9 + val SCE_TCL_MODIFIER=10 + val SCE_TCL_EXPAND=11 + val SCE_TCL_WORD=12 + val SCE_TCL_WORD2=13 + val SCE_TCL_WORD3=14 + val SCE_TCL_WORD4=15 + val SCE_TCL_WORD5=16 + val SCE_TCL_WORD6=17 + val SCE_TCL_WORD7=18 + val SCE_TCL_WORD8=19 # Lexical states for SCLEX_HTML, SCLEX_XML lex HTML=SCLEX_HTML SCE_H *************** *** 1845,1848 **** --- 2005,2010 ---- val SCE_HP_OPERATOR=101 val SCE_HP_IDENTIFIER=102 + # PHP + val SCE_HPHP_COMPLEX_VARIABLE=104 # ASP Python val SCE_HPA_START=105 *************** *** 1888,1891 **** --- 2050,2054 ---- val SCE_PL_HASH=14 val SCE_PL_SYMBOLTABLE=15 + val SCE_PL_VARIABLE_INDEXER=16 val SCE_PL_REGEX=17 val SCE_PL_REGSUBST=18 *************** *** 1902,1905 **** --- 2065,2105 ---- val SCE_PL_STRING_QR=29 val SCE_PL_STRING_QW=30 + val SCE_PL_POD_VERB=31 + # Lexical states for SCLEX_RUBY + lex Ruby=SCLEX_RUBY SCE_RB_ + val SCE_RB_DEFAULT=0 + val SCE_RB_ERROR=1 + val SCE_RB_COMMENTLINE=2 + val SCE_RB_POD=3 + val SCE_RB_NUMBER=4 + val SCE_RB_WORD=5 + val SCE_RB_STRING=6 + val SCE_RB_CHARACTER=7 + val SCE_RB_CLASSNAME=8 + val SCE_RB_DEFNAME=9 + val SCE_RB_OPERATOR=10 + val SCE_RB_IDENTIFIER=11 + val SCE_RB_REGEX=12 + val SCE_RB_GLOBAL=13 + val SCE_RB_SYMBOL=14 + val SCE_RB_MODULE_NAME=15 + val SCE_RB_INSTANCE_VAR=16 + val SCE_RB_CLASS_VAR=17 + val SCE_RB_BACKTICKS=18 + val SCE_RB_DATASECTION=19 + val SCE_RB_HERE_DELIM=20 + val SCE_RB_HERE_Q=21 + val SCE_RB_HERE_QQ=22 + val SCE_RB_HERE_QX=23 + val SCE_RB_STRING_Q=24 + val SCE_RB_STRING_QQ=25 + val SCE_RB_STRING_QX=26 + val SCE_RB_STRING_QR=27 + val SCE_RB_STRING_QW=28 + val SCE_RB_WORD_DEMOTED=29 + val SCE_RB_STDIN=30 + val SCE_RB_STDOUT=31 + val SCE_RB_STDERR=40 + val SCE_RB_UPPER_BOUND=41 # Lexical states for SCLEX_VB, SCLEX_VBSCRIPT, SCLEX_POWERBASIC lex VB=SCLEX_VB SCE_B_ *************** *** 1921,1924 **** --- 2121,2128 ---- val SCE_B_CONSTANT=13 val SCE_B_ASM=14 + val SCE_B_LABEL=15 + val SCE_B_ERROR=16 + val SCE_B_HEXNUMBER=17 + val SCE_B_BINNUMBER=18 # Lexical states for SCLEX_PROPERTIES lex Properties=SCLEX_PROPERTIES SCE_PROPS_ *************** *** 1928,1931 **** --- 2132,2136 ---- val SCE_PROPS_ASSIGNMENT=3 val SCE_PROPS_DEFVAL=4 + val SCE_PROPS_KEY=5 # Lexical states for SCLEX_LATEX lex LaTeX=SCLEX_LATEX SCE_L_ *************** *** 1978,1981 **** --- 2183,2188 ---- val SCE_ERR_IFORT=17 val SCE_ERR_ABSF=18 + val SCE_ERR_TIDY=19 + val SCE_ERR_JAVA_STACK=20 # Lexical states for SCLEX_BATCH lex Batch=SCLEX_BATCH SCE_BAT_ *************** *** 2068,2075 **** --- 2275,2286 ---- val SCE_LISP_NUMBER=2 val SCE_LISP_KEYWORD=3 + val SCE_LISP_KEYWORD_KW=4 + val SCE_LISP_SYMBOL=5 val SCE_LISP_STRING=6 val SCE_LISP_STRINGEOL=8 val SCE_LISP_IDENTIFIER=9 val SCE_LISP_OPERATOR=10 + val SCE_LISP_SPECIAL=11 + val SCE_LISP_MULTI_COMMENT=12 # Lexical states for SCLEX_EIFFEL and SCLEX_EIFFELKW lex Eiffel=SCLEX_EIFFEL SCE_EIFFEL_ *************** *** 2193,2196 **** --- 2404,2409 ---- val SCE_CSS_DOUBLESTRING=13 val SCE_CSS_SINGLESTRING=14 + val SCE_CSS_IDENTIFIER2=15 + val SCE_CSS_ATTRIBUTE=16 # Lexical states for SCLEX_POV lex POV=SCLEX_POV SCE_POV_ *************** *** 2274,2277 **** --- 2487,2494 ---- val SCE_NSIS_STRINGVAR=13 val SCE_NSIS_NUMBER=14 + val SCE_NSIS_SECTIONGROUP=15 + val SCE_NSIS_PAGEEX=16 + val SCE_NSIS_FUNCTIONDEF=17 + val SCE_NSIS_COMMENTBOX=18 # Lexical states for SCLEX_MMIXAL lex MMIXAL=SCLEX_MMIXAL SCE_MMIXAL_ *************** *** 2306,2314 **** val SCE_CLW_KEYWORD=8 val SCE_CLW_COMPILER_DIRECTIVE=9 ! val SCE_CLW_BUILTIN_PROCEDURES_FUNCTION=10 ! val SCE_CLW_STRUCTURE_DATA_TYPE=11 ! val SCE_CLW_ATTRIBUTE=12 ! val SCE_CLW_STANDARD_EQUATE=13 ! val SCE_CLW_ERROR=14 # Lexical states for SCLEX_LOT lex LOT=SCLEX_LOT SCE_LOT_ --- 2523,2533 ---- val SCE_CLW_KEYWORD=8 val SCE_CLW_COMPILER_DIRECTIVE=9 ! val SCE_CLW_RUNTIME_EXPRESSIONS=10 ! val SCE_CLW_BUILTIN_PROCEDURES_FUNCTION=11 ! val SCE_CLW_STRUCTURE_DATA_TYPE=12 ! val SCE_CLW_ATTRIBUTE=13 ! val SCE_CLW_STANDARD_EQUATE=14 ! val SCE_CLW_ERROR=15 ! val SCE_CLW_DEPRECATED=16 # Lexical states for SCLEX_LOT lex LOT=SCLEX_LOT SCE_LOT_ *************** *** 2366,2370 **** # Lexical states for SCLEX_OCTAVE are identical to MatLab lex Octave=SCLEX_OCTAVE SCE_MATLAB_ - # Lexical states for SCLEX_MSSQL lex MSSQL=SCLEX_MSSQL SCE_MSSQL_ --- 2585,2588 ---- *************** *** 2383,2386 **** --- 2601,2607 ---- val SCE_MSSQL_GLOBAL_VARIABLE=12 val SCE_MSSQL_FUNCTION=13 + val SCE_MSSQL_STORED_PROCEDURE=14 + val SCE_MSSQL_DEFAULT_PREF_DATATYPE=15 + val SCE_MSSQL_COLUMN_NAME_2=16 # Lexical states for SCLEX_VERILOG lex Verilog=SCLEX_VERILOG SCE_V_ *************** *** 2399,2402 **** --- 2620,2946 ---- val SCE_V_STRINGEOL=12 val SCE_V_USER=19 + # Lexical states for SCLEX_KIX + lex Kix=SCLEX_KIX SCE_KIX_ + val SCE_KIX_DEFAULT=0 + val SCE_KIX_COMMENT=1 + val SCE_KIX_STRING1=2 + val SCE_KIX_STRING2=3 + val SCE_KIX_NUMBER=4 + val SCE_KIX_VAR=5 + val SCE_KIX_MACRO=6 + val SCE_KIX_KEYWORD=7 + val SCE_KIX_FUNCTIONS=8 + val SCE_KIX_OPERATOR=9 + val SCE_KIX_IDENTIFIER=31 + # Lexical states for SCLEX_GUI4CLI + val SCE_GC_DEFAULT=0 + val SCE_GC_COMMENTLINE=1 + val SCE_GC_COMMENTBLOCK=2 + val SCE_GC_GLOBAL=3 + val SCE_GC_EVENT=4 + val SCE_GC_ATTRIBUTE=5 + val SCE_GC_CONTROL=6 + val SCE_GC_COMMAND=7 + val SCE_GC_STRING=8 + val SCE_GC_OPERATOR=9 + # Lexical states for SCLEX_SPECMAN + lex Specman=SCLEX_SPECMAN SCE_SN_ + val SCE_SN_DEFAULT=0 + val SCE_SN_CODE=1 + val SCE_SN_COMMENTLINE=2 + val SCE_SN_COMMENTLINEBANG=3 + val SCE_SN_NUMBER=4 + val SCE_SN_WORD=5 + val SCE_SN_STRING=6 + val SCE_SN_WORD2=7 + val SCE_SN_WORD3=8 + val SCE_SN_PREPROCESSOR=9 + val SCE_SN_OPERATOR=10 + val SCE_SN_IDENTIFIER=11 + val SCE_SN_STRINGEOL=12 + val SCE_SN_REGEXTAG=13 + val SCE_SN_SIGNAL=14 + val SCE_SN_USER=19 + # Lexical states for SCLEX_AU3 + lex Au3=SCLEX_AU3 SCE_AU3_ + val SCE_AU3_DEFAULT=0 + val SCE_AU3_COMMENT=1 + val SCE_AU3_COMMENTBLOCK=2 + val SCE_AU3_NUMBER=3 + val SCE_AU3_FUNCTION=4 + val SCE_AU3_KEYWORD=5 + val SCE_AU3_MACRO=6 + val SCE_AU3_STRING=7 + val SCE_AU3_OPERATOR=8 + val SCE_AU3_VARIABLE=9 + val SCE_AU3_SENT=10 + val SCE_AU3_PREPROCESSOR=11 + val SCE_AU3_SPECIAL=12 + val SCE_AU3_EXPAND=13 + val SCE_AU3_COMOBJ=14 + # Lexical states for SCLEX_APDL + lex APDL=SCLEX_APDL SCE_APDL_ + val SCE_APDL_DEFAULT=0 + val SCE_APDL_COMMENT=1 + val SCE_APDL_COMMENTBLOCK=2 + val SCE_APDL_NUMBER=3 + val SCE_APDL_STRING=4 + val SCE_APDL_OPERATOR=5 + val SCE_APDL_WORD=6 + val SCE_APDL_PROCESSOR=7 + val SCE_APDL_COMMAND=8 + val SCE_APDL_SLASHCOMMAND=9 + val SCE_APDL_STARCOMMAND=10 + val SCE_APDL_ARGUMENT=11 + val SCE_APDL_FUNCTION=12 + # Lexical states for SCLEX_BASH + lex Bash=SCLEX_BASH SCE_SH_ + val SCE_SH_DEFAULT=0 + val SCE_SH_ERROR=1 + val SCE_SH_COMMENTLINE=2 + val SCE_SH_NUMBER=3 + val SCE_SH_WORD=4 + val SCE_SH_STRING=5 + val SCE_SH_CHARACTER=6 + val SCE_SH_OPERATOR=7 + val SCE_SH_IDENTIFIER=8 + val SCE_SH_SCALAR=9 + val SCE_SH_PARAM=10 + val SCE_SH_BACKTICKS=11 + val SCE_SH_HERE_DELIM=12 + val SCE_SH_HERE_Q=13 + # Lexical states for SCLEX_ASN1 + lex Asn1=SCLEX_ASN1 SCE_ASN1_ + val SCE_ASN1_DEFAULT=0 + val SCE_ASN1_COMMENT=1 + val SCE_ASN1_IDENTIFIER=2 + val SCE_ASN1_STRING=3 + val SCE_ASN1_OID=4 + val SCE_ASN1_SCALAR=5 + val SCE_ASN1_KEYWORD=6 + val SCE_ASN1_ATTRIBUTE=7 + val SCE_ASN1_DESCRIPTOR=8 + val SCE_ASN1_TYPE=9 + val SCE_ASN1_OPERATOR=10 + # Lexical states for SCLEX_VHDL + lex VHDL=SCLEX_VHDL SCE_VHDL_ + val SCE_VHDL_DEFAULT=0 + val SCE_VHDL_COMMENT=1 + val SCE_VHDL_COMMENTLINEBANG=2 + val SCE_VHDL_NUMBER=3 + val SCE_VHDL_STRING=4 + val SCE_VHDL_OPERATOR=5 + val SCE_VHDL_IDENTIFIER=6 + val SCE_VHDL_STRINGEOL=7 + val SCE_VHDL_KEYWORD=8 + val SCE_VHDL_STDOPERATOR=9 + val SCE_VHDL_ATTRIBUTE=10 + val SCE_VHDL_STDFUNCTION=11 + val SCE_VHDL_STDPACKAGE=12 + val SCE_VHDL_STDTYPE=13 + val SCE_VHDL_USERWORD=14 + # Lexical states for SCLEX_CAML + lex Caml=SCLEX_CAML SCE_CAML_ + val SCE_CAML_DEFAULT=0 + val SCE_CAML_IDENTIFIER=1 + val SCE_CAML_TAGNAME=2 + val SCE_CAML_KEYWORD=3 + val SCE_CAML_KEYWORD2=4 + val SCE_CAML_KEYWORD3=5 + val SCE_CAML_LINENUM=6 + val SCE_CAML_OPERATOR=7 + val SCE_CAML_NUMBER=8 + val SCE_CAML_CHAR=9 + val SCE_CAML_STRING=11 + val SCE_CAML_COMMENT=12 + val SCE_CAML_COMMENT1=13 + val SCE_CAML_COMMENT2=14 + val SCE_CAML_COMMENT3=15 + # Lexical states for SCLEX_HASKELL + lex Haskell=SCLEX_HASKELL SCE_HA_ + val SCE_HA_DEFAULT=0 + val SCE_HA_IDENTIFIER=1 + val SCE_HA_KEYWORD=2 + val SCE_HA_NUMBER=3 + val SCE_HA_STRING=4 + val SCE_HA_CHARACTER=5 + val SCE_HA_CLASS=6 + val SCE_HA_MODULE=7 + val SCE_HA_CAPITAL=8 + val SCE_HA_DATA=9 + val SCE_HA_IMPORT=10 + val SCE_HA_OPERATOR=11 + val SCE_HA_INSTANCE=12 + val SCE_HA_COMMENTLINE=13 + val SCE_HA_COMMENTBLOCK=14 + val SCE_HA_COMMENTBLOCK2=15 + val SCE_HA_COMMENTBLOCK3=16 + # Lexical states of SCLEX_TADS3 + lex TADS3=SCLEX_TADS3 SCE_T3_ + val SCE_T3_DEFAULT=0 + val SCE_T3_X_DEFAULT=1 + val SCE_T3_PREPROCESSOR=2 + val SCE_T3_BLOCK_COMMENT=3 + val SCE_T3_LINE_COMMENT=4 + val SCE_T3_OPERATOR=5 + val SCE_T3_KEYWORD=6 + val SCE_T3_NUMBER=7 + val SCE_T3_IDENTIFIER=8 + val SCE_T3_S_STRING=9 + val SCE_T3_D_STRING=10 + val SCE_T3_X_STRING=11 + val SCE_T3_LIB_DIRECTIVE=12 + val SCE_T3_MSG_PARAM=13 + val SCE_T3_HTML_TAG=14 + val SCE_T3_HTML_DEFAULT=15 + val SCE_T3_HTML_STRING=16 + val SCE_T3_USER1=17 + val SCE_T3_USER2=18 + val SCE_T3_USER3=19 + # Lexical states for SCLEX_REBOL + lex Rebol=SCLEX_REBOL SCE_REBOL_ + val SCE_REBOL_DEFAULT=0 + val SCE_REBOL_COMMENTLINE=1 + val SCE_REBOL_COMMENTBLOCK=2 + val SCE_REBOL_PREFACE=3 + val SCE_REBOL_OPERATOR=4 + val SCE_REBOL_CHARACTER=5 + val SCE_REBOL_QUOTEDSTRING=6 + val SCE_REBOL_BRACEDSTRING=7 + val SCE_REBOL_NUMBER=8 + val SCE_REBOL_PAIR=9 + val SCE_REBOL_TUPLE=10 + val SCE_REBOL_BINARY=11 + val SCE_REBOL_MONEY=12 + val SCE_REBOL_ISSUE=13 + val SCE_REBOL_TAG=14 + val SCE_REBOL_FILE=15 + val SCE_REBOL_EMAIL=16 + val SCE_REBOL_URL=17 + val SCE_REBOL_DATE=18 + val SCE_REBOL_TIME=19 + val SCE_REBOL_IDENTIFIER=20 + val SCE_REBOL_WORD=21 + val SCE_REBOL_WORD2=22 + val SCE_REBOL_WORD3=23 + val SCE_REBOL_WORD4=24 + val SCE_REBOL_WORD5=25 + val SCE_REBOL_WORD6=26 + val SCE_REBOL_WORD7=27 + val SCE_REBOL_WORD8=28 + # Lexical states for SCLEX_SQL + lex SQL=SCLEX_SQL SCE_SQL_ + val SCE_SQL_DEFAULT=0 + val SCE_SQL_COMMENT=1 + val SCE_SQL_COMMENTLINE=2 + val SCE_SQL_COMMENTDOC=3 + val SCE_SQL_NUMBER=4 + val SCE_SQL_WORD=5 + val SCE_SQL_STRING=6 + val SCE_SQL_CHARACTER=7 + val SCE_SQL_SQLPLUS=8 + val SCE_SQL_SQLPLUS_PROMPT=9 + val SCE_SQL_OPERATOR=10 + val SCE_SQL_IDENTIFIER=11 + val SCE_SQL_SQLPLUS_COMMENT=13 + val SCE_SQL_COMMENTLINEDOC=15 + val SCE_SQL_WORD2=16 + val SCE_SQL_COMMENTDOCKEYWORD=17 + val SCE_SQL_COMMENTDOCKEYWORDERROR=18 + val SCE_SQL_USER1=19 + val SCE_SQL_USER2=20 + val SCE_SQL_USER3=21 + val SCE_SQL_USER4=22 + val SCE_SQL_QUOTEDIDENTIFIER=23 + # Lexical states for SCLEX_SMALLTALK + lex Smalltalk=SCLEX_SMALLTALK SCE_ST_ + val SCE_ST_DEFAULT=0 + val SCE_ST_STRING=1 + val SCE_ST_NUMBER=2 + val SCE_ST_COMMENT=3 + val SCE_ST_SYMBOL=4 + val SCE_ST_BINARY=5 + val SCE_ST_BOOL=6 + val SCE_ST_SELF=7 + val SCE_ST_SUPER=8 + val SCE_ST_NIL=9 + val SCE_ST_GLOBAL=10 + val SCE_ST_RETURN=11 + val SCE_ST_SPECIAL=12 + val SCE_ST_KWSEND=13 + val SCE_ST_ASSIGN=14 + val SCE_ST_CHARACTER=15 + val SCE_ST_SPEC_SEL=16 + # Lexical states for SCLEX_FLAGSHIP (clipper) + lex FlagShip=SCLEX_FLAGSHIP SCE_B_ + val SCE_FS_DEFAULT=0 + val SCE_FS_COMMENT=1 + val SCE_FS_COMMENTLINE=2 + val SCE_FS_COMMENTDOC=3 + val SCE_FS_COMMENTLINEDOC=4 + val SCE_FS_COMMENTDOCKEYWORD=5 + val SCE_FS_COMMENTDOCKEYWORDERROR=6 + val SCE_FS_KEYWORD=7 + val SCE_FS_KEYWORD2=8 + val SCE_FS_KEYWORD3=9 + val SCE_FS_KEYWORD4=10 + val SCE_FS_NUMBER=11 + val SCE_FS_STRING=12 + val SCE_FS_PREPROCESSOR=13 + val SCE_FS_OPERATOR=14 + val SCE_FS_IDENTIFIER=15 + val SCE_FS_DATE=16 + val SCE_FS_STRINGEOL=17 + val SCE_FS_CONSTANT=18 + val SCE_FS_ASM=19 + val SCE_FS_LABEL=20 + val SCE_FS_ERROR=21 + val SCE_FS_HEXNUMBER=22 + val SCE_FS_BINNUMBER=23 + # Lexical states for SCLEX_CSOUND + lex Csound=SCLEX_CSOUND SCE_CSOUND_ + val SCE_CSOUND_DEFAULT=0 + val SCE_CSOUND_COMMENT=1 + val SCE_CSOUND_NUMBER=2 + val SCE_CSOUND_OPERATOR=3 + val SCE_CSOUND_INSTR=4 + val SCE_CSOUND_IDENTIFIER=5 + val SCE_CSOUND_OPCODE=6 + val SCE_CSOUND_HEADERSTMT=7 + val SCE_CSOUND_USERKEYWORD=8 + val SCE_CSOUND_COMMENTBLOCK=9 + val SCE_CSOUND_PARAM=10 + val SCE_CSOUND_ARATE_VAR=11 + val SCE_CSOUND_KRATE_VAR=12 + val SCE_CSOUND_IRATE_VAR=13 + val SCE_CSOUND_GLOBAL_VAR=14 + val SCE_CSOUND_STRINGEOL=15 + # Lexical states for SCLEX_INNOSETUP + lex Inno=SCLEX_INNOSETUP SCE_INNO_ + val SCE_INNO_DEFAULT=0 + val SCE_INNO_COMMENT=1 + val SCE_INNO_KEYWORD=2 + val SCE_INNO_PARAMETER=3 + val SCE_INNO_SECTION=4 + val SCE_INNO_PREPROC=5 + val SCE_INNO_PREPROC_INLINE=6 + val SCE_INNO_COMMENT_PASCAL=7 + val SCE_INNO_KEYWORD_PASCAL=8 + val SCE_INNO_KEYWORD_USER=9 + val SCE_INNO_STRING_DOUBLE=10 + val SCE_INNO_STRING_SINGLE=11 + val SCE_INNO_IDENTIFIER=12 + # Lexical states for SCLEX_OPAL + lex Opal=SCLEX_OPAL SCE_OPAL_ + val SCE_OPAL_SPACE=0 + val SCE_OPAL_COMMENT_BLOCK=1 + val SCE_OPAL_COMMENT_LINE=2 + val SCE_OPAL_INTEGER=3 + val SCE_OPAL_KEYWORD=4 + val SCE_OPAL_SORT=5 + val SCE_OPAL_STRING=6 + val SCE_OPAL_PAR=7 + val SCE_OPAL_BOOL_CONST=8 + val SCE_OPAL_DEFAULT=32 # Events *************** *** 2424,2427 **** --- 2968,2972 ---- evt void HotSpotDoubleClick=2020(int modifiers, int position) evt void CallTipClick=2021(int position) + evt void AutoCSelection=2022(string text) cat Deprecated *************** *** 2437,2438 **** --- 2982,2986 ---- evt void PosChanged=2012(int position) + # SCLEX_HTML should be used in preference to these. + val SCLEX_ASP=29 + val SCLEX_PHP=30 --- autogen.pl DELETED --- --- NEW FILE: License.txt --- License for Scintilla and SciTE Copyright 1998-2003 by Neil Hodgson <ne...@sc...> All Rights Reserved Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation. NEIL HODGSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NEIL HODGSON BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. Index: SciLexer.dll =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Scintilla/Include/SciLexer.dll,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsUelgK5 and /tmp/cvsOLd6iU differ Index: Readme.txt =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Scintilla/Include/Readme.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Readme.txt 1 Nov 2005 10:36:51 -0000 1.1 --- Readme.txt 11 Jun 2006 16:51:49 -0000 1.2 *************** *** 2,4 **** Scintilla.h : C include file of Scintilla control. Scintilla.iface : Interface desciption of Scintilla control. ! Autogen.pl : Build Scintilla.pm from Scintilla.pm.begin, Scintilla.pm.end and Scintilla.iface. \ No newline at end of file --- 2,4 ---- Scintilla.h : C include file of Scintilla control. Scintilla.iface : Interface desciption of Scintilla control. ! |
|
From: Robert M. <rob...@us...> - 2006-06-11 16:51:54
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Scintilla/t In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26402/t Added Files: 01_load.t 02_new.t 98_pod.t 99_pod_coverage.t Log Message: Merge Scintilla into core distribution --- NEW FILE: 99_pod_coverage.t --- #!perl -wT # Win32::GUI::Scintilla test suite. # $Id: 99_pod_coverage.t,v 1.1 2006/06/11 16:51:50 robertemay Exp $ # Check the POD covers all method calls use strict; use warnings; use Test::More; eval "use Test::Pod::Coverage 1.04"; plan skip_all => "Test::Pod::Coverage 1.04 required for testing POD coverage" if $@; plan skip_all => "Pod Coverage tests for Win32::GUI::Scintilla done by core" if $ENV{W32G_CORE}; all_pod_coverage_ok( { also_private => [ qr/^SendMessage..$/, ] } ); --- NEW FILE: 02_new.t --- #!perl -wT # Win32::GUI::Scintilla test suite # $Id: 02_new.t,v 1.1 2006/06/11 16:51:50 robertemay Exp $ # # - check we can create a new Scintilla object use strict; use warnings; BEGIN { $| = 1 } # Autoflush use Test::More tests => 2; use Win32::GUI(); use Win32::GUI::Scintilla(); can_ok('Win32::GUI::Scintilla', 'new'); my $W = Win32::GUI::Window->new(); my $S = $W->AddScintilla(); isa_ok($S, 'Win32::GUI::Scintilla', 'Correct object type created'); --- NEW FILE: 98_pod.t --- #!perl -wT # Win32::GUI::Scintilla test suite. # $Id: 98_pod.t,v 1.1 2006/06/11 16:51:50 robertemay Exp $ # Check that our pod documentation has valid syntax use strict; use warnings; BEGIN { $| = 1 } # Autoflush use Test::More; eval "use Test::Pod 1.14"; plan skip_all => "Test::Pod 1.14 required for testing POD" if $@; plan skip_all => "Pod tests for Win32::GUI::Scintilla done by core" if $ENV{W32G_CORE}; all_pod_files_ok(); --- NEW FILE: 01_load.t --- #!perl -wT # Win32::GUI::Scintilla test suite # $Id: 01_load.t,v 1.1 2006/06/11 16:51:50 robertemay Exp $ # # - check pre-requsites # - check module loads # - check module has a version use strict; use warnings; BEGIN { $| = 1 } # Autoflush # Pre-requisites: Bail out if we havent got Test::More eval "use Test::More"; if($@) { # As we haven't got Test::More, can't use diag() print "#\n# Test::More required to perform any Win32::GUI::Scintilla test\n"; chomp $@; $@ =~ s/^/# /gm; print "$@\n"; print "Bail Out! Test::More not available\n"; exit(1); } plan( tests => 3 ); # Pre-requisites: Check that we're on windows or cygwin # bail out if we're not if ( not ($^O =~ /MSwin32|cygwin/i)) { diag("\nWin32::GUI::Scintilla can only run on MSWin32 or cygwin, not '$^O'"); print "Bail out! Incompatible Operating System\n"; } pass("Correct OS: $^O"); # Check that Win32::GUI::Scintilla loads, and bail out of all # tests if it doesn't use_ok('Win32::GUI::Scintilla') or print STDOUT "Bail out! Can't load Win32::GUI::Scintilla"; # Check that Win32::GUI::Scintilla has a version ok(defined $Win32::GUI::Scintilla::VERSION, "Win32::GUI::Scintilla version check"); |
|
From: Robert M. <rob...@us...> - 2006-06-11 16:51:53
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Scintilla/demos In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26402/demos Added Files: Editor.pl test.pl test2.pl Log Message: Merge Scintilla into core distribution --- NEW FILE: test2.pl --- # perl -w use strict; use warnings; use Win32::GUI(); use Win32::GUI::Scintilla; use Win32::GUI::Scintilla::Perl; # main Window my $Window = new Win32::GUI::Window ( -name => "Window", -title => "Scintilla Perl test", -pos => [100, 100], -size => [400, 400], ) or die "new Window"; # Create Scintilla Edit Window # $Edit = new Win32::GUI::Scintilla ( # -parent => $Window, # Or my $Edit = $Window->AddScintillaPerl ( -name => "Edit", -pos => [0, 0], -size => [$Window->ScaleWidth(), $Window->ScaleHeight()], -text => "my \$Test\n", ) or die "new Edit"; # Call Some method $Edit->AddText ("if (\$i == 1) {\n \$i++;\n}\n"); # Event loop $Window->Show(); Win32::GUI::Dialog(); $Window->Show(); # Main window event handler sub Window_Terminate { return -1; } # Main window resize sub Window_Resize { if (defined $Window) { my ($width, $height) = ($Window->GetClientRect)[2..3]; $Edit->Resize ($width, $height); } } # Scintilla Event Notification sub Edit_Notify { my (%evt) = @_; print "Edit Notify = ", %evt, "\n"; } --- NEW FILE: test.pl --- # perl -w use strict; use warnings; use Win32::GUI(); use Win32::GUI::Scintilla; # main Window my $Window = new Win32::GUI::Window ( -name => "Window", -title => "Scintilla test", -pos => [100, 100], -size => [400, 400], ) or die "new Window"; $Window->AddButton ( -name => "Test", -text => "Test", -pos => [0, 0], -size => [100, 10], ); # Create Scintilla Edit Window # $Edit = new Win32::GUI::Scintilla ( # -parent => $Window, # Or my $Edit = $Window->AddScintilla ( -name => "Edit", -pos => [0, 10], -size => [$Window->ScaleWidth(), $Window->ScaleHeight()-10], -text => "Test\n", ) or die "new Edit"; # Call Some method $Edit->AddText ("add\n"); $Edit->AppendText ("append\n"); # Event loop $Edit->Show(); $Window->Show(); Win32::GUI::Dialog(); $Window->Hide(); exit(0); # Main window event handler sub Window_Terminate { # Call Some method print "GetText = ---\n", $Edit->GetText(), "\n---\n"; print "GetLine(1) = ", $Edit->GetLine(1), "\n"; print "GetSelText = ", $Edit->GetSelText(), "\n"; print "GetTextRange(2) = ", $Edit->GetTextRange(2), "\n"; print "GetTextRange(2, 6) = ", $Edit->GetTextRange(2, 6), "\n"; return -1; } # Main window resize sub Window_Resize { if (defined $Window) { my ($width, $height) = ($Window->GetClientRect)[2..3]; $Edit->Move (0, 10); $Edit->Resize ($width, $height-10); } } # Scintilla Event Notification sub Edit_Notify { my (%evt) = @_; # print "Edit Notify = ", %evt, "\n"; } sub Edit_Change { print "Change!!!\n"; } sub Edit_GotFocus { print "GotFocus!!!\n"; } sub Edit_LostFocus { print "LostFocus!!!\n"; } --- NEW FILE: Editor.pl --- #!perl -w # Perl Editor #----------------------------------------------------------------------- # perl -v use strict; use warnings; use Cwd; use Win32::GUI qw(MB_OK MB_ICONQUESTION MB_ICONINFORMATION MB_YESNOCANCEL WS_EX_CLIENTEDGE WS_CLIPCHILDREN); use Win32::GUI::Scintilla::Perl; my $VERSION = "1.0alpha2"; my $CurrentFile = ""; my $Directory = cwd; my $Menu = Win32::GUI::MakeMenu( "&File" => "File", " > &New" => "FileNew", " > &Open..." => "FileOpen", " > -" => 0, " > &Save" => "FileSave", " > &Save As..." => "FileSaveAs", " > -" => 0, " > &Directory..." => "FileDirectory", " > -" => 0, " > E&xit" => "FileExit", "&Edit" => "Edit", " > &Undo" => "EditUndo", " > &Redo" => "EditRedo", " > -" => 0, " > Cu&t" => "EditCut", " > &Copy" => "EditCopy", " > &Paste" => "EditPaste", " > &Delete" => "EditClear", " > -" => 0, " > Select A&ll" => "EditSelectAll", " > -" => 0, " > &Find..." => "EditFind", "&Help" => "Help", " > &About..." => "HelpAbout", ); # main Window my $Window = Win32::GUI::Window->new( -name => "Window", -title => "Perl Editor", -pos => [100, 100], -size => [400, 400], -pushstyle => WS_CLIPCHILDREN, -menu => $Menu, ) or die "new Window"; # Create Scintilla Edit Window my $Editor = $Window->AddScintillaPerl( -name => "Editor", -pos => [0, 0], -size => [400, 400], -addexstyle => WS_EX_CLIENTEDGE, ) or die "new Edit"; # Create FindDlg window my $FindDlg = CreateFindDlg(); # Event loop $Window->Show(); Win32::GUI::Dialog(); $Window->Hide(); # Free FindDlg $FindDlg->CloseWindow(); exit(0); sub Editor_Notify { my (%evt) = @_; if ($evt{-code} == Win32::GUI::Scintilla::SCN_UPDATEUI) { # Update menu my $Sel = ($Editor->GetSelectionStart() != $Editor->GetSelectionEnd()); $Menu->{EditUndo}->Enabled($Editor->CanUndo()); $Menu->{EditRedo}->Enabled($Editor->CanRedo()); $Menu->{EditCut}->Enabled($Sel); $Menu->{EditCopy}->Enabled($Sel); $Menu->{EditPaste}->Enabled($Editor->CanPaste()); $Menu->{EditClear}->Enabled($Sel); # check for matching braces $Editor->BraceHighEvent(); } elsif ($evt{-code} == Win32::GUI::Scintilla::SCN_MARGINCLICK) { # Click on folder margin if ($evt{-margin} == 2) { # Manage Folder $Editor->FolderEvent(%evt); # caret visible $Editor->ScrollCaret(); } } } # Main window event handler sub Window_Terminate { return FileExit_Click(); } sub Window_Resize { if (defined $Window) { my ($width, $height) = ($Window->GetClientRect)[2..3]; $Editor->Move (0, 0); $Editor->Resize ($width, $height); } return 1; } ####################################################################### # # File Menu # ####################################################################### sub FileNew_Click { $Editor->NewFile(); $CurrentFile = ""; return 1; } sub FileOpen_Click { my $file = Win32::GUI::GetOpenFileName( -owner => $Window, -title => "Open a text file", -filter => [ 'Perl script (*.pl)' => '*.pl', 'All files' => '*.*', ], -directory => $Directory, ); if ($file) { $Editor->LoadFile ($file); $CurrentFile = $file; } elsif (Win32::GUI::CommDlgExtendedError()) { Win32::GUI::MessageBox(0, "ERROR : ".Win32::GUI::CommDlgExtendedError(), "GetOpenFileName Error"); } return 1; } sub FileSave_Click { unless ($CurrentFile eq "") { my $ret = Win32::GUI::MessageBox (0, "Overwrite existing file ?", "Save", MB_ICONQUESTION | MB_YESNOCANCEL); if ($ret == 6) { $ret = $Editor->SaveFile ($CurrentFile); unless ($ret) { Win32::GUI::MessageBox (0, "ERROR : SaveDocument ", "Save Error"); } } elsif ($ret == 7) { FileSaveAs_Click(); } } else { FileSaveAs_Click(); } return 1; } sub FileSaveAs_Click { my $ret = Win32::GUI::GetSaveFileName ( -title => "Save text file As", -filter => [ 'Perl script (*.pl)' => '*.pl', 'All files' => '*.*', ], -directory => $Directory, ); if ($ret) { $CurrentFile = $ret; $ret = $Editor->SaveFile ($CurrentFile); unless ($ret) { Win32::GUI::MessageBox (0, "ERROR : SaveDocument ", "Save Error"); } } elsif (Win32::GUI::CommDlgExtendedError()) { Win32::GUI::MessageBox (0, "ERROR : ".Win32::GUI::CommDlgExtendedError(), "GetSaveFileName Error"); } return 1; } sub FileDirectory_Click { my $ret = Win32::GUI::BrowseForFolder ( -title => "Select default directory", -directory => $Directory, -folderonly => 1, ); $Directory = $ret if ($ret); return 1; } sub FileExit_Click { return -1 } ####################################################################### # # Edit Menu # ####################################################################### sub EditUndo_Click { $Editor->Undo(); return 1; } sub EditRedo_Click { $Editor->Redo(); return 1; } sub EditCut_Click { $Editor->Cut(); return 1; } sub EditCopy_Click { $Editor->Copy(); return 1; } sub EditPaste_Click { $Editor->Paste(); return 1; } sub EditSelectAll_Click { $Editor->SelectAll(); return 1; } sub EditClear_Click { $Editor->Clear(); return 1; } sub EditFind_Click { $FindDlg->Show(); return 1; } ####################################################################### # # Help Menu # ####################################################################### sub HelpAbout_Click { Win32::GUI::MessageBox( 0, "Perl Editor, version $VERSION\r\n". "Laurent ROCHER", "About...", MB_ICONINFORMATION | MB_OK, ); return 1; } ####################################################################### # # FindWindow # ####################################################################### sub CreateFindDlg { my $FindDlg = new Win32::GUI::Window( -name => "FindDlg", -title => "Find", -pos => [ 150, 150 ], -size => [ 270, 140 ], ); $FindDlg->AddLabel ( -name => "FindDlg_Label", -text => "Find what...", -pos => [10, 12], -size => [100, 13], ); $FindDlg->AddTextfield ( -name => "FindDlg_Text", -pos => [10, 30], -size => [150, 21], ); $FindDlg->AddCheckbox ( -name => "FindDlg_Case", -text => "Match case", -pos => [10, 50], -size => [100, 21], ); $FindDlg->AddCheckbox ( -name => "FindDlg_Word", -text => "Find Whole word only", -pos => [10, 70], -size => [100, 21], ); $FindDlg->AddCheckbox ( -name => "FindDlg_REGEX", -text => "Regular expression", -pos => [10, 90], -size => [75, 21], ); $FindDlg->AddButton ( -name => "FindDlg_Forward", -text => "&Forward", -pos => [180, 10], -size => [75 , 21], ); $FindDlg->AddButton ( -name => "FindDlg_Backware", -text => "&Backware", -pos => [180, 40], -size => [75 , 21], ); $FindDlg->AddButton ( -name => "FindDlg_Close", -text => "C&lose", -pos => [180, 70], -size => [75 , 21], ); return $FindDlg; } sub FindDlg_Forward_Click { my $text = $FindDlg->FindDlg_Text->Text(); my $flag = 0; $flag |= Win32::GUI::Scintilla::SCFIND_MATCHCASE if ($FindDlg->FindDlg_Case->Checked()); $flag |= Win32::GUI::Scintilla::SCFIND_WHOLEWORD if ($FindDlg->FindDlg_Word->Checked()); $flag |= Win32::GUI::Scintilla::SCFIND_REGEXP if ($FindDlg->FindDlg_REGEX->Checked()); if ($Editor->FindAndSelect ($text, $flag, 1, 1) == -1) { Win32::GUI::MessageBox($FindDlg, "Text not found", "Find..."); } return 0; } sub FindDlg_Backware_Click { my $text = $FindDlg->FindDlg_Text->Text(); my $flag = 0; $flag |= Win32::GUI::Scintilla::SCFIND_MATCHCASE if ($FindDlg->FindDlg_Case->Checked()); $flag |= Win32::GUI::Scintilla::SCFIND_WHOLEWORD if ($FindDlg->FindDlg_Word->Checked()); $flag |= Win32::GUI::Scintilla::SCFIND_REGEXP if ($FindDlg->FindDlg_REGEX->Checked()); if ($Editor->FindAndSelect ($text, $flag, -1, 1) == -1) { Win32::GUI::MessageBox($FindDlg, "Text not found", "Find..."); } return 0; } sub FindDlg_Close_Click { $FindDlg->Hide(); return 0; } sub FindDlg_Terminate { return FindDlg_Close_Click(); } |
|
From: Robert M. <rob...@us...> - 2006-06-11 16:51:52
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Scintilla/Samples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26402/Samples Removed Files: Editor.pl test.pl test2.pl Log Message: Merge Scintilla into core distribution --- test2.pl DELETED --- --- test.pl DELETED --- --- Editor.pl DELETED --- |
|
From: Robert M. <rob...@us...> - 2006-06-11 16:50:54
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Scintilla/demos In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25842/demos Log Message: Directory /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Scintilla/demos added to the repository |
|
From: Robert M. <rob...@us...> - 2006-06-11 16:47:48
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Scintilla/t In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23679/t Log Message: Directory /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Scintilla/t added to the repository |
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Grid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20182 Modified Files: Changes Grid.pm Grid.xs Makefile.PL TYPEMAP Added Files: GridRC.PL TODO Removed Files: MANIFEST README Log Message: Merge Grid into core distribution Index: Makefile.PL =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Grid/Makefile.PL,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.PL 1 Nov 2005 12:34:46 -0000 1.1 --- Makefile.PL 11 Jun 2006 16:42:11 -0000 1.2 *************** *** 1,38 **** use ExtUtils::MakeMaker; ! # See lib/ExtUtils/MakeMaker.pm for details of how to influence ! # the contents of the Makefile that is written. ! WriteMakefile( ! 'NAME' => 'Win32::GUI::Grid', ! 'VERSION_FROM' => 'Grid.pm', ! 'XS' => { 'Grid.xs' => 'Grid.cpp' }, ! 'LIBS' => ['Comctl32.lib Mfc42.lib Eafxis.lib'], # e.g., '-lm' ! 'DEFINE' => '', # e.g., '-DHAVE_SOMETHING' ! 'INC' => '', # e.g., '-I/usr/include/other' ! 'MYEXTLIB' => './MFCGrid/Lib/MFCGrid.lib', ! ($] ge '5.005') ! ? ( ! 'AUTHOR' => 'ROCHER Laurent (lr...@cp...)', ! 'ABSTRACT' => 'Add a Grid control to Win32::GUI (MFC Grid from CodeProject.com)', ! ) ! : (), ); ! sub MY::xs_c { ! ' ! .xs.c: ! $(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) $(XSUBPP) $(XSPROTOARG) $(XSUBPPARGS) $*.xs > $*.c ! .xs.cpp: ! $(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) $(XSUBPP) $(XSPROTOARG) $(XSUBPPARGS) $*.xs > $*.cpp ! ./MFCGrid/Lib/MFCGrid.lib: MFCGrid/makefile ! cd MFCGrid ! nmake ! cd .. ! '; } --- 1,97 ---- + #!perl -w + use strict; + use warnings; + + # Makefile.PL for Win32::GUI::Grid + # $Id$ + + use 5.006; + use Config; use ExtUtils::MakeMaker; ! use File::Find(); ! my @demos; ! File::Find::find(sub { push @demos, $File::Find::name if $File::Find::name =~ /\.(pl|bmp)$/ }, 'demos'); ! ! my %config = ( ! NAME => 'Win32::GUI::Grid', ! VERSION_FROM => 'Grid.pm', ! ABSTRACT_FROM => 'Grid.pm', ! AUTHOR => 'ROCHER Laurent (lr...@cp...)', ! XS => { 'Grid.xs' => 'Grid.cpp' }, ! LIBS => ['-lcomctl32 -lMfc42 -lEafxis'], ! MYEXTLIB => './MFCGrid/Lib/MFCGrid.lib', ! PL_FILES => {'GridRC.PL' => '$(BASEEXT).rc', }, ! OBJECT => '$(BASEEXT)$(OBJ_EXT) $(BASEEXT).res', ! macro => {RC => 'rc.exe', ! RCFLAGS => '', ! INST_DEMODIR => '$(INST_LIB)/Win32/GUI/demos/$(BASEEXT)', ! DEMOS => "@demos", }, ! clean => {FILES => '*.rc *.res', }, ); + # if building using gcc (MinGW or cygwin) use windres + # as the resource compiler + # and the MinGW C++ standard library + if($Config{cc} =~ /gcc/i) { + $config{macro}->{RC} = 'windres'; + $config{macro}->{RCFLAGS} = '-O coff -o $*.res'; + $config{LIBS} = [':nodefault -lcomctl32 -lmsvcp60']; + } ! # Can only build with mscv. ! if($Config{cc} !~ /cl/i) { ! print <<__EXPLAIN; ! Win32::GUI::Grid can only be built using MSVC, not '$Config{cc}', ! as it requires the MFC framework. Win32::GUI::Grid will be skipped ! during the current build process. ! __EXPLAIN ! ExtUtils::MakeMaker::WriteEmptyMakefile(NAME => 'Win32::GUI::Grid'); ! } ! else { ! WriteMakefile(%config); ! } ! package MY; ! sub xs_c { ! my $inherited = shift->SUPER::xs_c(@_); ! $inherited =~ s/\.c/.cpp/g; ! return $inherited; } + # Add rule to make MFCGrid.lib + # Add rule for .rc to .res conversion + # Add rules to install demo scripts + sub postamble { + return <<'__POSTAMBLE'; + + # Win32::GUI::Grid MFCGrid.lib section + + ./MFCGrid/Lib/MFCGrid.lib: MFCGrid/makefile + cd MFCGrid + $(MAKE) $(PASTHRU) + cd .. + + # Win32::GUI::Grid RC section + + .rc.res: + $(RC) $(RCFLAGS) $< + + # Win32::GUI::Grid demo script section + + pure_all :: demo_to_blib + $(NOECHO) $(NOOP) + + demo_to_blib: $(DEMOS) + $(NOECHO) $(MKPATH) $(INST_DEMODIR) + $(CP) $? $(INST_DEMODIR) + $(NOECHO) $(TOUCH) demo_to_blib + + clean :: + -$(RM_F) demo_to_blib + + __POSTAMBLE + } --- NEW FILE: TODO --- - Watch for new versions of MFC grid - Is build possible under mingw? - Is static build possible, so as not to depend on mfc42.dll? - make clean should clean MFCGrid/Build and MFCGrid/Lib - more tests! - fix 'unreferenced targ' compiler warnings --- MANIFEST DELETED --- Index: Grid.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Grid/Grid.xs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Grid.xs 1 Nov 2005 12:34:46 -0000 1.1 --- Grid.xs 11 Jun 2006 16:42:10 -0000 1.2 *************** *** 3,6 **** --- 3,8 ---- /**********************************************************************/ + /* $Id */ + ////////////////////////////////////////////////////////////////////// // Include *************** *** 69,73 **** #define WM_EXITLOOP (WM_APP+1) ! // Return a COLOREF from a SV COLORREF SvCOLORREF(pTHX_ SV* c) { --- 71,75 ---- #define WM_EXITLOOP (WM_APP+1) ! // Return a COLORREF from a SV COLORREF SvCOLORREF(pTHX_ SV* c) { *************** *** 299,302 **** --- 301,305 ---- int constant (char * name, int arg) { + errno = 0; switch(name[2]) { *************** *** 428,431 **** --- 431,435 ---- } + errno = EINVAL; return 0; } *************** *** 830,833 **** --- 834,839 ---- MODULE = Win32::GUI::Grid PACKAGE = Win32::GUI::Grid + PROTOTYPES: ENABLE + ################################################################## # # *************** *** 2701,2704 **** --- 2707,2711 ---- else if (pCell && pCell->IsKindOf(RUNTIME_CLASS(CGridCellURL))) { + RETVAL = FALSE; next_i = -1; for(i = 3; i < items; i++) { *************** *** 2708,2711 **** --- 2715,2719 ---- next_i = i + 1; ((CGridCellURL*)pCell)->SetAutoLaunchUrl((LONG) SvIV(ST(next_i))); + RETVAL = TRUE; } } *************** *** 2716,2719 **** --- 2724,2728 ---- else if (pCell && pCell->IsKindOf(RUNTIME_CLASS(CGridCellCheck))) { + RETVAL = FALSE; next_i = -1; for(i = 3; i < items; i++) { *************** *** 2723,2726 **** --- 2732,2736 ---- next_i = i + 1; ((CGridCellCheck*)pCell)->SetCheck((LONG) SvIV(ST(next_i))); + RETVAL = TRUE; } } *************** *** 2910,2920 **** # void EnsureVisible(CCellID &cell); # void EnsureVisible(int nRow, int nCol); ! void ! EnsureVisible(object, nRow, nCol) ! CMFCWnd* object ! int nRow ! int nCol ! CODE: ! object->EnsureVisible(nRow, nCol); void --- 2920,2931 ---- # void EnsureVisible(CCellID &cell); # void EnsureVisible(int nRow, int nCol); ! # Duplicate of EnsureCellVisible?? ! # void ! # EnsureVisible(object, nRow, nCol) ! # CMFCWnd* object ! # int nRow ! # int nCol ! # CODE: ! # object->EnsureVisible(nRow, nCol); void Index: Grid.pm =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Grid/Grid.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Grid.pm 1 Nov 2005 12:34:46 -0000 1.1 --- Grid.pm 11 Jun 2006 16:42:10 -0000 1.2 *************** *** 1,108 **** package Win32::GUI::Grid; use strict; ! use vars qw($VERSION @ISA @EXPORT @EXPORT_OK $AUTOLOAD); ! use Carp 'croak','carp'; ! use Win32::GUI; require Exporter; require DynaLoader; - require AutoLoader; [...2095 lines suppressed...] + =item L<Win32::GUI|Win32::GUI> + + =item L<http://perl-win32-gui.sourceforge.net/> + + =item L<http://www.codeproject.com/miscctrl/gridctrl.asp> + + MFC Grid Control by Chris Maunder + + =back + + =head1 DEPENDENCIES + Win32::GUI + Microsoft Foundation Classes (MFC) + + =head1 AUTHOR + + Laurent Rocher (lr...@cp...) =cut Index: Changes =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Grid/Changes,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Changes 1 Nov 2005 12:34:46 -0000 1.1 --- Changes 11 Jun 2006 16:42:10 -0000 1.2 *************** *** 2,45 **** Revision history for Perl extension Win32::GUI::Grid. 0.07 14/02/2004 ! - Use MFC Grid control 2.25 ! - Correct EnsureCellVisible methods ( bad name in XS, but keep EnsureVisible for compatibility) ! - Fix locale setting problem. 0.06 14/02/2004 ! - Fix Clipboard error (Ctrl+C) [Thank to Andrew St. Denis] ! - Fix some Grid draw problem ! - Add WM_PRINTCLIENT support for new Win32::GUI -noflicker option. ! - New Cell Type (Calendar, URL) ! - SetCellOptions : New options 0.05 07/09/2003 ! - Add SetCellEditable method. ! - Add List cell editing. ! - New event _ChangedEdit for COMBO and LIST edit control when select change in list. 0.04 07/08/2003 ! - Correct -heigth option. ! - In InsertColumn, set last parameter optional. ! - Add Column Perl Sort method. 0.03 03/06/2003 ! - Correct Abnormal terminaison when multiple grid instance 0.02 03/06/2003 ! - Correct crash when destroy grid during cell edit. ! - Virtual Mode support. ! - New cell editing support. ! + Numeric ! + Date ! + Time ! + Check ! + Combo ! - Add Perl Sort method. 0.01 28/05/2003 ! - First build Win32::GUI::Grid ! - Use MFC Grid control 2.24 TODO ! - Printing support (???) --- 2,49 ---- Revision history for Perl extension Win32::GUI::Grid. + 0.08 24/05/2006 + - Merge into Win32::GUI core distribution + - Minor fix to constants() XS and AUTOLOAD() functions ( not re-setting $! ) + 0.07 14/02/2004 ! - Use MFC Grid control 2.25 ! - Correct EnsureCellVisible methods ( bad name in XS, but keep EnsureVisible for compatibility) ! - Fix locale setting problem. 0.06 14/02/2004 ! - Fix Clipboard error (Ctrl+C) [Thank to Andrew St. Denis] ! - Fix some Grid draw problem ! - Add WM_PRINTCLIENT support for new Win32::GUI -noflicker option. ! - New Cell Type (Calendar, URL) ! - SetCellOptions : New options 0.05 07/09/2003 ! - Add SetCellEditable method. ! - Add List cell editing. ! - New event _ChangedEdit for COMBO and LIST edit control when select change in list. 0.04 07/08/2003 ! - Correct -heigth option. ! - In InsertColumn, set last parameter optional. ! - Add Column Perl Sort method. 0.03 03/06/2003 ! - Correct Abnormal termination when multiple grid instance 0.02 03/06/2003 ! - Correct crash when destroy grid during cell edit. ! - Virtual Mode support. ! - New cell editing support. ! + Numeric ! + Date ! + Time ! + Check ! + Combo ! - Add Perl Sort method. 0.01 28/05/2003 ! - First build Win32::GUI::Grid ! - Use MFC Grid control 2.24 TODO ! - Printing support (???) --- README DELETED --- --- NEW FILE: GridRC.PL --- #!perl -w use strict; use warnings; use ExtUtils::MakeMaker; # $Id: GridRC.PL,v 1.1 2006/06/11 16:42:10 robertemay Exp $ # perl script to produce the RC file for # Win32::GUI::Grid create Resource # file with a VERSIONINFO section # The variables: my %info = ( Version => MM->parse_version('Grid.pm'), Dllname => 'Grid.dll', Years => '2003..2006', Win32GUIVersion => MM->parse_version('../GUI.pm'), ); # Open the target file if ( @ARGV > 0 ) { my $file = $ARGV[0]; open(my $fh, '>', $file) or die qq(Failed to open '$file': $!); select $fh; } { my $fileVersion = $info{Version}; $fileVersion .= "_00" unless $fileVersion =~ m/_/; $info{FileVersion} = sprintf("%02d,%02d,%02d,00", $fileVersion =~ m/^(.*)\.([^_]*)_?(.*)$/); my $prodVersion = $info{Win32GUIVersion}; $prodVersion .= "_00" unless $prodVersion =~ m/_/; $info{ProductVersion} = sprintf("%02d,%02d,%02d,00", $prodVersion =~ m/^(.*)\.([^_]*)_?(.*)$/); } print <<"__RC"; #include "Winver.h" 1 VERSIONINFO FILEVERSION $info{FileVersion} PRODUCTVERSION $info{ProductVersion} FILEOS VOS__WINDOWS32 FILETYPE VFT_DLL { BLOCK "StringFileInfo" { BLOCK "040904E4" { VALUE "Comments" , "Win32::GUI::Grid, part of the perl Win32::GUI module. Includes code by Chris Maunder from MFCGrid: http://www.codeproject.com/miscctrl/gridctrl.asp" VALUE "CompanyName" , "perl-win32-gui.sourceforge.net" VALUE "FileDescription" , "Win32::GUI::Grid perl extension" VALUE "FileVersion" , "$info{Version}" VALUE "InternalName" , "$info{Dllname}" VALUE "LegalCopyright" , "Copyright © Laurent Rocher $info{Years}" VALUE "LegalTrademarks" , "GNU and Artistic licences" VALUE "OriginalFilename" , "$info{Dllname}" VALUE "ProductName" , "Win32::GUI perl extension" VALUE "ProductVersion" , "$info{Win32GUIVersion}" } } BLOCK "VarFileInfo" { VALUE "Translation", 0x0409, 0x04E4 } } __RC exit(0); __END__ Index: TYPEMAP =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Grid/TYPEMAP,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TYPEMAP 1 Nov 2005 12:34:46 -0000 1.1 --- TYPEMAP 11 Jun 2006 16:42:11 -0000 1.2 *************** *** 1,27 **** TYPEMAP LPCTSTR T_PV - LPCSTR T_PV - LPTSTR T_PV DWORD T_IV UINT T_IV BOOL T_IV - HBITMAP T_HANDLE HDC T_HANDLE - HFONT T_HANDLE HIMAGELIST T_HANDLE HWND T_HANDLE CMFCWnd* T_MFCWND COLORREF T_COLOR - ################################################################################ INPUT T_HANDLE if(SvROK($arg)) { ! if(hv_fetch((HV*)SvRV($arg), \"-handle\", 7, 0) != NULL) ! $var = ($type) SvIV(*(hv_fetch((HV*)SvRV($arg), \"-handle\", 7, 0))); else $var = NULL; } else ! $var = ($type) SvIV($arg); T_MFCWND --- 1,23 ---- TYPEMAP LPCTSTR T_PV DWORD T_IV UINT T_IV BOOL T_IV HDC T_HANDLE HIMAGELIST T_HANDLE HWND T_HANDLE CMFCWnd* T_MFCWND COLORREF T_COLOR ################################################################################ INPUT T_HANDLE if(SvROK($arg)) { ! SV** out=hv_fetch((HV*)SvRV($arg), \"-handle\", 7, 0); ! if(out != NULL) ! $var = INT2PTR($type,SvIV(*out)); else $var = NULL; } else ! $var = INT2PTR($type,SvIV($arg)); T_MFCWND *************** *** 34,39 **** OUTPUT T_HANDLE ! sv_setiv($arg, (IV) $var); T_COLOR sv_setiv($arg, (IV) $var); - --- 30,34 ---- OUTPUT T_HANDLE ! sv_setiv($arg, PTR2IV($var)); T_COLOR sv_setiv($arg, (IV) $var); |
|
From: Robert M. <rob...@us...> - 2006-06-11 16:43:26
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Grid/MFCGrid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20182/MFCGrid Modified Files: GridCellCheck.cpp GridCellCombo.cpp GridCellDateTime.cpp GridCellDateTime.h GridCtrl.cpp Makefile StdAfx.cpp StdAfx.h Log Message: Merge Grid into core distribution Index: GridCellCheck.cpp =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Grid/MFCGrid/GridCellCheck.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GridCellCheck.cpp 1 Nov 2005 12:34:46 -0000 1.1 --- GridCellCheck.cpp 11 Jun 2006 16:42:11 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- // History: // 23 Jul 2001 - Complete rewrite + // 13 Mar 2004 - GetCellExtent and GetCheckPlacement fixed by Yogurt + // - Read-only now honoured - Yogurt // ///////////////////////////////////////////////////////////////////////////// *************** *** 55,59 **** { // Using SM_CXHSCROLL as a guide to the size of the checkbox ! int nWidth = GetSystemMetrics(SM_CXHSCROLL) + 2*GetMargin(); // Yogurt $$LR$$ CSize cellSize = CGridCell::GetCellExtent(pDC); cellSize.cx += nWidth; --- 57,61 ---- { // Using SM_CXHSCROLL as a guide to the size of the checkbox ! int nWidth = GetSystemMetrics(SM_CXHSCROLL) + 2*GetMargin(); CSize cellSize = CGridCell::GetCellExtent(pDC); cellSize.cx += nWidth; *************** *** 105,108 **** --- 107,111 ---- PointCellRelative += m_Rect.TopLeft(); + // Bail if cell is read-only CCellID cell = GetGrid()->GetCellFromPt (PointCellRelative); if (!GetGrid()->IsCellEditable (cell)) *************** *** 163,168 **** } */ ! // Yogurt $$LR$$ ! if (m_Rect.Height() < nWidth + 2 * (int)GetMargin() ) { place.top = m_Rect.top + (m_Rect.Height() - nWidth) / 2; --- 166,171 ---- } */ ! ! if (m_Rect.Height() < nWidth + 2 * static_cast<int> (GetMargin())) { place.top = m_Rect.top + (m_Rect.Height() - nWidth) / 2; *************** *** 171,173 **** return place; ! } --- 174,176 ---- return place; ! } \ No newline at end of file Index: GridCellDateTime.cpp =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Grid/MFCGrid/GridCellDateTime.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GridCellDateTime.cpp 1 Nov 2005 12:34:46 -0000 1.1 --- GridCellDateTime.cpp 11 Jun 2006 16:42:11 -0000 1.2 *************** *** 51,54 **** --- 51,63 ---- } + CSize CGridCellDateTime::GetCellExtent(CDC* pDC) + { + CSize sizeScroll (GetSystemMetrics(SM_CXVSCROLL), GetSystemMetrics(SM_CYHSCROLL)); + CSize sizeCell (CGridCell::GetCellExtent(pDC)); + sizeCell.cx += sizeScroll.cx; + sizeCell.cy = max(sizeCell.cy,sizeScroll.cy); + return sizeCell; + } + BOOL CGridCellDateTime::Edit(int nRow, int nCol, CRect rect, CPoint /* point */, UINT nID, UINT nChar) *************** *** 99,103 **** SetText(strTemp); #else ! SetText(m_cTime.Format(_T("%X"))); // Yogurt $$LR$$ (_T("%H:%M:%S"))); #endif } --- 108,114 ---- SetText(strTemp); #else ! ! // SetText(m_cTime.Format(_T("%H:%M:%S"))); ! SetText(m_cTime.Format(_T("%X"))); #endif } *************** *** 110,128 **** SetText(strTemp); #else ! SetText(m_cTime.Format(_T("%x"))); // Yogurt $$LR$$ (("%d/%m/%Y"))); #endif } } - // Yogurt $$LR$$ - CSize CGridCellDateTime::GetCellExtent(CDC* pDC) - { - CSize sizeScroll (GetSystemMetrics(SM_CXVSCROLL), GetSystemMetrics(SM_CYHSCROLL)); - CSize sizeCell (CGridCell::GetCellExtent(pDC)); - sizeCell.cx += sizeScroll.cx; - sizeCell.cy = max(sizeCell.cy,sizeScroll.cy); - return sizeCell; - } - ///////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////// --- 121,130 ---- SetText(strTemp); #else ! // SetText(m_cTime.Format(("%d/%m/%Y"))); ! SetText(m_cTime.Format(("%x"))); #endif } } ///////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////// *************** *** 261,266 **** CDateTimeCtrl::OnKillFocus(pNewWnd); ! if (GetSafeHwnd() == pNewWnd->GetSafeHwnd()) return; EndEdit(); } --- 263,269 ---- CDateTimeCtrl::OnKillFocus(pNewWnd); ! if (GetSafeHwnd() == pNewWnd->GetSafeHwnd()) { return; + } EndEdit(); } Index: Makefile =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Grid/MFCGrid/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 1 Nov 2005 12:34:46 -0000 1.1 --- Makefile 11 Jun 2006 16:42:11 -0000 1.2 *************** *** 69,98 **** << ! .c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << ! .cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << ! .cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << ! .c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << ! .cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << ! .cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< --- 69,98 ---- << ! .c{$(INTDIR)}.obj: $(CPP) @<< $(CPP_PROJ) $< << ! .cpp{$(INTDIR)}.obj: $(CPP) @<< $(CPP_PROJ) $< << ! .cxx{$(INTDIR)}.obj: $(CPP) @<< $(CPP_PROJ) $< << ! .c{$(INTDIR)}.sbr: $(CPP) @<< $(CPP_PROJ) $< << ! .cpp{$(INTDIR)}.sbr: $(CPP) @<< $(CPP_PROJ) $< << ! .cxx{$(INTDIR)}.sbr: $(CPP) @<< $(CPP_PROJ) $< Index: GridCellDateTime.h =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Grid/MFCGrid/GridCellDateTime.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GridCellDateTime.h 1 Nov 2005 12:34:46 -0000 1.1 --- GridCellDateTime.h 11 Jun 2006 16:42:11 -0000 1.2 *************** *** 30,33 **** --- 30,34 ---- CGridCellDateTime(DWORD dwStyle); virtual ~CGridCellDateTime(); + virtual CSize GetCellExtent(CDC* pDC); // editing cells *************** *** 37,41 **** virtual CWnd* GetEditWnd() const; virtual void EndEdit(); ! virtual CSize GetCellExtent(CDC* pDC); CTime* GetTime() {return &m_cTime;}; --- 38,42 ---- virtual CWnd* GetEditWnd() const; virtual void EndEdit(); ! CTime* GetTime() {return &m_cTime;}; Index: StdAfx.h =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Grid/MFCGrid/StdAfx.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StdAfx.h 1 Nov 2005 12:34:46 -0000 1.1 --- StdAfx.h 11 Jun 2006 16:42:12 -0000 1.2 *************** *** 4,9 **** // ! #if !defined(AFX_STDAFX_H__19E18FB7_DFF6_11D1_8CE7_000000000000__INCLUDED_) ! #define AFX_STDAFX_H__19E18FB7_DFF6_11D1_8CE7_000000000000__INCLUDED_ #if _MSC_VER >= 1000 --- 4,9 ---- // ! #if !defined(AFX_STDAFX_H__34B6D7A8_9CDC_11D1_9C11_00A0243D1382__INCLUDED_) ! #define AFX_STDAFX_H__34B6D7A8_9CDC_11D1_9C11_00A0243D1382__INCLUDED_ #if _MSC_VER >= 1000 *************** *** 21,26 **** //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. ! #endif // !defined(AFX_STDAFX_H__19E18FB7_DFF6_11D1_8CE7_000000000000__INCLUDED_) --- 21,29 ---- + // #define for if(0);else for + + //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. ! #endif // !defined(AFX_STDAFX_H__34B6D7A8_9CDC_11D1_9C11_00A0243D1382__INCLUDED_) Index: StdAfx.cpp =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Grid/MFCGrid/StdAfx.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StdAfx.cpp 1 Nov 2005 12:34:46 -0000 1.1 --- StdAfx.cpp 11 Jun 2006 16:42:12 -0000 1.2 *************** *** 1,4 **** // stdafx.cpp : source file that includes just the standard includes ! // GridViewDemo.pch will be the pre-compiled header // stdafx.obj will contain the pre-compiled type information --- 1,4 ---- // stdafx.cpp : source file that includes just the standard includes ! // GridCtrlDemo.pch will be the pre-compiled header // stdafx.obj will contain the pre-compiled type information Index: GridCtrl.cpp =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Grid/MFCGrid/GridCtrl.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GridCtrl.cpp 1 Nov 2005 12:34:46 -0000 1.1 --- GridCtrl.cpp 11 Jun 2006 16:42:11 -0000 1.2 *************** *** 2333,2336 **** --- 2333,2337 ---- str += _T("\t"); } + if (row != Selection.GetMaxRow()) str += _T("\r\n"); *************** *** 3692,3696 **** else { ! m_arColWidths.InsertAt(nColumn, (int)0); if (!GetVirtualMode()) { --- 3693,3697 ---- else { ! m_arColWidths.InsertAt(nColumn, (UINT)0); if (!GetVirtualMode()) { *************** *** 3767,3771 **** else { ! m_arRowHeights.InsertAt(nRow, (int)0); if (!GetVirtualMode()) m_RowData.InsertAt(nRow, new GRID_ROW); --- 3768,3772 ---- else { ! m_arRowHeights.InsertAt(nRow, (UINT)0); if (!GetVirtualMode()) m_RowData.InsertAt(nRow, new GRID_ROW); Index: GridCellCombo.cpp =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Grid/MFCGrid/GridCellCombo.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GridCellCombo.cpp 1 Nov 2005 12:34:46 -0000 1.1 --- GridCellCombo.cpp 11 Jun 2006 16:42:11 -0000 1.2 *************** *** 31,34 **** --- 31,35 ---- // the constructor param list. // 29 Nov 1998 - bug fix in onkeydown (Markus Irtenkauf) + // 13 Mar 2004 - GetCellExtent fixed by Yogurt // ///////////////////////////////////////////////////////////////////////////// *************** *** 449,455 **** } CSize CGridCellCombo::GetCellExtent(CDC* pDC) { ! CSize sizeScroll(GetSystemMetrics(SM_CXVSCROLL), GetSystemMetrics(SM_CYHSCROLL)); //Yogurt $$LR$$ CSize sizeCell (CGridCell::GetCellExtent(pDC)); sizeCell.cx += sizeScroll.cx; --- 450,457 ---- } + CSize CGridCellCombo::GetCellExtent(CDC* pDC) { ! CSize sizeScroll (GetSystemMetrics(SM_CXVSCROLL), GetSystemMetrics(SM_CYHSCROLL)); CSize sizeCell (CGridCell::GetCellExtent(pDC)); sizeCell.cx += sizeScroll.cx; |
|
From: Robert M. <rob...@us...> - 2006-06-11 16:42:32
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Grid/t In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20182/t Added Files: 01_load.t 02_new.t 98_pod.t 99_pod_coverage.t Log Message: Merge Grid into core distribution --- NEW FILE: 99_pod_coverage.t --- #!perl -wT # Win32::GUI::Grid test suite. # $Id: 99_pod_coverage.t,v 1.1 2006/06/11 16:42:16 robertemay Exp $ # Check the POD covers all method calls use strict; use warnings; use Test::More; eval "use Test::Pod::Coverage 1.04"; plan skip_all => "Test::Pod::Coverage 1.04 required for testing POD coverage" if $@; plan skip_all => "Pod Coverage tests for Win32::GUI::Grid done by core" if $ENV{W32G_CORE}; all_pod_coverage_ok( { also_private => [ qr/^constant$/, ], } ); --- NEW FILE: 02_new.t --- #!perl -wT # Win32::GUI::Grid test suite # $Id: 02_new.t,v 1.1 2006/06/11 16:42:16 robertemay Exp $ # # - check we can create a new Grid object use strict; use warnings; BEGIN { $| = 1 } # Autoflush use Test::More tests => 2; use Win32::GUI(); use Win32::GUI::Grid(); can_ok('Win32::GUI::Grid', 'new'); my $W = Win32::GUI::Window->new(); my $S = $W->AddGrid(-name => 'MyGrid'); isa_ok($S, 'Win32::GUI::Grid', 'Correct object type created'); --- NEW FILE: 98_pod.t --- #!perl -wT # Win32::GUI::Grid test suite. # $Id: 98_pod.t,v 1.1 2006/06/11 16:42:16 robertemay Exp $ # Check that our pod documentation has valid syntax use strict; use warnings; BEGIN { $| = 1 } # Autoflush use Test::More; eval "use Test::Pod 1.14"; plan skip_all => "Test::Pod 1.14 required for testing POD" if $@; plan skip_all => "Pod tests for Win32::GUI::Grid done by core" if $ENV{W32G_CORE}; all_pod_files_ok(); --- NEW FILE: 01_load.t --- #!perl -wT # Win32::GUI::Grid test suite # $Id: 01_load.t,v 1.1 2006/06/11 16:42:16 robertemay Exp $ # # - check pre-requsites # - check module loads # - check module has a version use strict; use warnings; BEGIN { $| = 1 } # Autoflush # Pre-requisites: Bail out if we havent got Test::More eval "use Test::More"; if($@) { # As we haven't got Test::More, can't use diag() print "#\n# Test::More required to perform any Win32::GUI::Grid test\n"; chomp $@; $@ =~ s/^/# /gm; print "$@\n"; print "Bail Out! Test::More not available\n"; exit(1); } plan( tests => 3 ); # Pre-requisites: Check that we're on windows or cygwin # bail out if we're not if ( not ($^O =~ /MSwin32|cygwin/i)) { diag("\nWin32::GUI::Grid can only run on MSWin32 or cygwin, not '$^O'"); print "Bail out! Incompatible Operating System\n"; } pass("Correct OS: $^O"); # Check that Win32::GUI::Grid loads, and bail out of all # tests if it doesn't use_ok('Win32::GUI::Grid') or print STDOUT "Bail out! Can't load Win32::GUI::Grid"; # Check that Win32::GUI::Grid has a version ok(defined $Win32::GUI::Grid::VERSION, "Win32::GUI::Grid version check"); |
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Grid/samples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20182/samples Removed Files: one.bmp test1.pl test2.pl test3.pl test4.pl test5.pl test6.pl three.bmp two.bmp Log Message: Merge Grid into core distribution --- test5.pl DELETED --- --- two.bmp DELETED --- --- test3.pl DELETED --- --- test2.pl DELETED --- --- one.bmp DELETED --- --- test4.pl DELETED --- --- test6.pl DELETED --- --- test1.pl DELETED --- --- three.bmp DELETED --- |
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Grid/demos In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20182/demos Added Files: one.bmp test1.pl test2.pl test3.pl test4.pl test5.pl test6.pl three.bmp two.bmp Log Message: Merge Grid into core distribution --- NEW FILE: test5.pl --- #! perl -w # # - Custom Cell Type # - Sort function # use strict; use warnings; use Win32::GUI qw(WS_CLIPCHILDREN); use Win32::GUI::Grid; # main Window my $Window = new Win32::GUI::Window ( -title => "Win32::GUI::Grid test 5", -pos => [100, 100], -size => [400, 400], -name => "Window", -addstyle => WS_CLIPCHILDREN, ) or die "new Window"; # Grid Window my $Grid = new Win32::GUI::Grid ( -parent => $Window, -name => "Grid", -pos => [0, 0], ) or die "new Grid"; # Grid cell base $Grid->SetDefCellType(GVIT_NUMERIC); # Preset Cell type before cell creation # Init Grid $Grid->SetEditable(1); $Grid->SetRows(10); $Grid->SetColumns(10); $Grid->SetFixedRows(1); $Grid->SetFixedColumns(1); # Fill Grid for my $row (0..$Grid->GetRows()) { for my $col (0..$Grid->GetColumns()) { if ($row == 0) { $Grid->SetCellText($row, $col,"Column : $col"); } elsif ($col == 0) { $Grid->SetCellText($row, $col, "Row : $row"); } else { # $Grid->SetCellType($row, $col, GVIT_NUMERIC); # Set cell type after creation. $Grid->SetCellText($row, $col, $row*$col); } } } # Set Date edit control in cell (1,1) $Grid->SetCellText(1, 1, ""); $Grid->SetCellType(1, 1, GVIT_DATE); # Set Date edit control in cell (2,1) $Grid->SetCellText(2, 1, ""); $Grid->SetCellType(2, 1, GVIT_DATECAL); # Set Time edit control in cell (1,2) $Grid->SetCellText(1, 2, ""); $Grid->SetCellType(1, 2, GVIT_TIME); # Set Check edit control in cell (1,3) $Grid->SetCellText(1, 3, ""); $Grid->SetCellType(1, 3, GVIT_CHECK); $Grid->SetCellCheck(1, 3, 1); print "Cell Check : ", $Grid->GetCellCheck(1, 3), "\n"; # Set Combobox edit control in cell (1,4) $Grid->SetCellText(1, 4, ""); $Grid->SetCellType(1, 4, GVIT_COMBO); $Grid->SetCellOptions(1, 4, ["Option 1", "Option 2", "Option 3"]); # Set Listbox control in cell (1,5) $Grid->SetCellText(1, 5, ""); $Grid->SetCellType(1, 5, GVIT_LIST); $Grid->SetCellOptions(1, 5, ["Option 1", "Option 2", "Option 3"]); # Set Url control in cell (1,6) $Grid->SetCellText(1, 6, "www.perl.com"); $Grid->SetCellType(1, 6, GVIT_URL); $Grid->SetCellOptions(1, 6, -autolaunch => 0); # Set Url control in cell (2,6) $Grid->SetCellText(2, 6, "www.perl.com"); $Grid->SetCellType(2, 6, GVIT_URL); # Set uneditable cell (2,6) $Grid->SetCellEditable(2, 6, 0); # Sort Numeric reverse order (Method 1) # $Grid->SortNumericCells(5, 0); # Sort Numeric reverse order (Method 2) # $Grid->SortCells(5, 0, sub { my ($e1, $e2) = @_; return (int($e1) - int ($e2)); } ); # Sort Numeric reverse order (Method 3) # $Grid->SetSortFunction (sub { my ($e1, $e2) = @_; return (int($e1) - int ($e2)); } ); # $Grid->SortCells(7, 0); # $Grid->SetSortFunction (); # remove sort method # Resize Grid Cell $Grid->AutoSize(); # Event loop $Window->Show(); Win32::GUI::Dialog(); exit(0); # Main window event handler sub Window_Terminate { return -1; } sub Window_Resize { my ($width, $height) = ($Window->GetClientRect)[2..3]; $Grid->Resize ($width, $height); } sub Grid_BeginEdit { my ($col, $row) = @_; print "Begin Edit ($col, $row)\n"; } sub Grid_ChangedEdit { my ($col, $row, $str) = @_; print "Changed Edit ($col, $row, $str)\n"; } sub Grid_EndEdit { my ($col, $row) = @_; print "End Edit ($col, $row)\n"; } --- NEW FILE: two.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: test3.pl --- #! perl -w # # Test Grid method # - Default cell setting # - font method # use strict; use warnings; use FindBin(); use Win32::GUI(); use Win32::GUI::Grid; # main Window my $Window = new Win32::GUI::Window ( -title => "Win32::GUI::Grid test 3", -pos => [100, 100], -size => [400, 400], -name => "Window", ) or die "new Window"; # Grid Window my $Grid = $Window->AddGrid ( -name => "Grid", -pos => [0, 0], ) or die "new Grid"; # Image list my $IL = new Win32::GUI::ImageList(16, 16, 24, 3, 10); $IL->Add("$FindBin::Bin/one.bmp"); $IL->Add("$FindBin::Bin/two.bmp"); $IL->Add("$FindBin::Bin/three.bmp"); # Attach ImageList to grid $Grid->SetImageList($IL); # Set default cell style $Grid->SetDefCellTextColor(0,0, '#FF0000'); $Grid->SetDefCellTextColor(1,0, '#00FF00'); $Grid->SetDefCellTextColor(0,1, '#0000FF'); $Grid->SetDefCellBackColor(0,0, '#0000FF'); $Grid->SetDefCellBackColor(1,0, '#FF0000'); $Grid->SetDefCellBackColor(0,1, '#00FF00'); $Grid->SetDefCellFormat(0, 0, DT_RIGHT|DT_VCENTER|DT_SINGLELINE|DT_END_ELLIPSIS|DT_NOPREFIX); $Grid->SetDefCellFormat(0, 1, DT_RIGHT|DT_VCENTER|DT_SINGLELINE|DT_END_ELLIPSIS|DT_NOPREFIX); $Grid->SetDefCellFormat(1, 0, DT_LEFT|DT_WORDBREAK); # Change default font my %font = $Grid->GetDefCellFont(0,0); $font {-bold} = 1; $font {-height} = 10; $Grid->SetDefCellFont(0,0, %font); # Create Cells after set default style. (required for format ONLY) $Grid->SetRows(50); $Grid->SetColumns(10); $Grid->SetFixedRows(1); $Grid->SetFixedColumns(1); # Fill Grid for my $row (0..$Grid->GetRows()) { for my $col (0..$Grid->GetColumns()) { if ($row == 0) { $Grid->SetCellText($row, $col,"Column : $col"); $Grid->SetCellImage($row, $col, 0); # Add bitmap } elsif ($col == 0) { $Grid->SetCellText($row, $col, "Row : $row"); $Grid->SetCellImage($row, $col, 1); # Add bitmap } else { $Grid->SetCellText($row, $col, "Cell : ($row,$col)"); $Grid->SetCellImage($row, $col, 2); # Add bitmap } } } # Set Cell font $Grid->SetCellFont(0, 0, -name => 'Arial' , -size => 12, -italic => 1, -bold => 1); # Set font from a Win32::GUI::Font my $F = new Win32::GUI::Font( -name => "MS Sans Serif", -size => 10, -bold => 1, ); $Grid->SetCellFont(0, 1, $F->Info()); # Resize Grid Cell $Grid->AutoSize(); # Event loop $Window->Show(); Win32::GUI::Dialog(); exit(0); # Main window event handler sub Window_Terminate { return -1; } sub Window_Resize { my ($width, $height) = ($Window->GetClientRect)[2..3]; $Grid->Resize ($width, $height); } sub Grid_Click { my ($row, $col) = @_; # Get font information print "\nFont for cell ($row, $col) :\n"; my %font = $Grid->GetCellFont($row, $col); for my $key (keys %font) { print $key, " => ", $font{$key}, "\n"; } } --- NEW FILE: test2.pl --- #! perl -w # # Test Grid method # - create option # - Color method # - ImageList support # - Event # - POINT, RECT method. use strict; use warnings; use FindBin(); use Win32::GUI qw(WS_CLIPCHILDREN); use Win32::GUI::Grid; # main Window my $Window = new Win32::GUI::Window ( -title => "Win32::GUI::Grid test 2", -pos => [100, 100], -size => [400, 400], -name => "Window", -addstyle => WS_CLIPCHILDREN, ) or die "new Window"; # Grid Window my $Grid = $Window->AddGrid ( -name => "Grid", -pos => [0, 0], -rows => 50, -columns => 10, -fixedrows => 1, -fixedcolumns => 1, -editable => 1, ) or die "new Grid"; # Image list my $IL = new Win32::GUI::ImageList(16, 16, 24, 3, 10); $IL->Add("$FindBin::Bin/one.bmp"); $IL->Add("$FindBin::Bin/two.bmp"); $IL->Add("$FindBin::Bin/three.bmp"); # Attach ImageList to grid $Grid->SetImageList($IL); # Change some color (different color format) $Grid->SetGridBkColor([66,66,66]); $Grid->SetGridLineColor('#0000ff'); $Grid->SetTitleTipBackClr('#00ff00'); $Grid->SetDefCellTextColor(0,0, 0x9F9F9F); $Grid->SetDefCellBackColor(0,0, 0x003300); # Some test my ($x, $y) = $Grid->GetCellOrigin(1, 1); print "CellOrigin(1,1) = ($x, $y)\n"; my ($left, $top, $right, $bottom) = $Grid->GetCellRect(1,1); print "GetCellRect(1,1) ($left, $top, $right, $bottom)\n"; ($left, $top, $right, $bottom) = $Grid->GetTextRect(1,1); print "GetTextRect(1,1) ($left, $top, $right, $bottom)\n"; ($x, $y) = $Grid->GetCellFromPt(85, 50); print "GetCellFromPt(85,50) = ($x, $y)\n"; # Fill Grid for my $row (0..$Grid->GetRows()) { for my $col (0..$Grid->GetColumns()) { if ($row == 0) { $Grid->SetCellFormat($row, $col, DT_LEFT|DT_WORDBREAK); $Grid->SetCellText($row, $col,"Column : $col"); $Grid->SetCellImage($row, $col, 0); # Add bitmap } elsif ($col == 0) { $Grid->SetCellFormat($row, $col, DT_RIGHT|DT_VCENTER|DT_SINGLELINE|DT_END_ELLIPSIS|DT_NOPREFIX); $Grid->SetCellText($row, $col, "Row : $row"); $Grid->SetCellImage($row, $col, 1); # Add bitmap } else { $Grid->SetCellFormat($row, $col, DT_RIGHT|DT_VCENTER|DT_SINGLELINE|DT_END_ELLIPSIS|DT_NOPREFIX); $Grid->SetCellText($row, $col, "Cell : ($row,$col)"); $Grid->SetCellImage($row, $col, 2); # Add bitmap } } } # Resize Grid Cell $Grid->AutoSize(); # Some test ($x, $y) = $Grid->GetCellOrigin(1, 1); print "CellOrigin(1,1) = ($x, $y)\n"; ($left, $top, $right, $bottom) = $Grid->GetCellRect(1,1); print "GetCellRect(1,1) ($left, $top, $right, $bottom)\n"; ($left, $top, $right, $bottom) = $Grid->GetTextRect(1,1); print "GetTextRect(1,1) ($left, $top, $right, $bottom)\n"; ($x, $y) = $Grid->GetCellFromPt(85, 50); print "GetCellFromPt(85,50) = ($x, $y)\n"; # Event loop $Window->Show(); Win32::GUI::Dialog(); exit(0); # Main window event handler sub Window_Terminate { return -1; } sub Window_Resize { my ($width, $height) = ($Window->GetClientRect)[2..3]; $Grid->Resize ($width, $height); } sub Grid_Click { my ($col, $row) = @_; print "Click ($col, $row)\n"; } sub Grid_RClick { my ($col, $row) = @_; print "Right Click ($col, $row)\n"; } sub Grid_DblClick { my ($col, $row) = @_; print "Double Click ($col, $row)\n"; } sub Grid_Changing { my ($col, $row) = @_; print "Selection Changing ($col, $row)\n"; } sub Grid_Changed { my ($col, $row) = @_; print "Selection Changed ($col, $row)\n"; } sub Grid_BeginEdit { my ($col, $row) = @_; print "Begin Edit ($col, $row)\n"; } sub Grid_EndEdit { my ($col, $row) = @_; print "End Edit ($col, $row)\n"; } sub Grid_BeginDrag { my ($col, $row) = @_; print "Begin Drag ($col, $row)\n"; } --- NEW FILE: one.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: test4.pl --- #! perl -w # # Test Grid method # - Virtual mode # - EndEdit event in virtual mode # use strict; use warnings; use Win32::GUI qw(WS_CLIPCHILDREN); use Win32::GUI::Grid; # main Window my $Window = new Win32::GUI::Window ( -title => "Win32::GUI::Grid test 4", -pos => [100, 100], -size => [400, 400], -name => "Window", -addstyle => WS_CLIPCHILDREN, ) or die "new Window"; # Grid Window my $Grid = $Window->AddGrid ( -name => "Grid", -pos => [0, 0], -rows => 50, # Use create option -columns => 10, -fixedrows => 1, -fixedcolumns => 1, -editable => 1, -virtual => 1, ) or die "new Grid"; # $Grid->SetVirtualMode(1); # Set virtual before set rows and columns # $Grid->SetRows(50); # $Grid->SetColumns(10); # $Grid->SetFixedRows(1); # $Grid->SetFixedColumns(1); # $Grid->SetEditable(1); $Grid->SetCellBkColor(2, 2, 0xFF0000); # Event loop $Window->Show(); Win32::GUI::Dialog(); # Main window event handler sub Window_Terminate { return -1; } sub Window_Resize { my ($width, $height) = ($Window->GetClientRect)[2..3]; $Grid->Resize ($width, $height); } # Virtual Grid request data sub Grid_GetData { my ($row, $col) = @_; return "Cell ($row, $col)"; } sub Grid_EndEdit { my ($col, $row, $str) = @_; print "End Edit ($col, $row) = $str\n"; return 1; } --- NEW FILE: test6.pl --- #! perl -w # # Test multiple Grid instance # use strict; use warnings; use Win32::GUI qw(WS_CLIPCHILDREN); use Win32::GUI::Grid; # main Window my $Window = new Win32::GUI::Window ( -title => "Win32::GUI::Grid test 6", -pos => [100, 100], -size => [400, 400], -name => "Window", -pushstyle => WS_CLIPCHILDREN, ) or die "new Window"; # Grid Window my $Grid = new Win32::GUI::Grid ( -parent => $Window, -name => "Grid", -pos => [0, 0], -rows => 10, -columns => 10, -fixedrows => 1, -fixedcolumns => 1, ) or die "new Grid"; my $Grid2 = new Win32::GUI::Grid ( -parent => $Window, -name => "Grid2", -pos => [0, 0], -rows => 20, -columns => 20, -fixedrows => 1, -fixedcolumns => 1, ) or die "new Grid2"; # Fill Grid for my $row (0..$Grid->GetRows()) { for my $col (0..$Grid->GetColumns()) { if ($row == 0) { $Grid->SetCellText($row, $col,"Column : $col"); } elsif ($col == 0) { $Grid->SetCellText($row, $col, "Row : $row"); } else { $Grid->SetCellText($row, $col, $row*$col); } } } for my $row (0..$Grid2->GetRows()) { for my $col (0..$Grid2->GetColumns()) { if ($row == 0) { $Grid2->SetCellText($row, $col,"Column : $col"); } elsif ($col == 0) { $Grid2->SetCellText($row, $col, "Row : $row"); } else { $Grid2->SetCellText($row, $col, $row*$col); } } } # Resize Grid Cell $Grid->AutoSize(); $Grid2->AutoSize(); # Event loop $Window->Show(); Win32::GUI::Dialog(); exit(0); # Main window event handler sub Window_Terminate { return -1; } sub Window_Resize { my ($width, $height) = ($Window->GetClientRect)[2..3]; $Grid->Resize ($width, $height/2); $Grid2->Move (0, $height/2); $Grid2->Resize ($width, $height/2); } sub Grid_Click { my ($row, $col) = @_; print "Grid cell ($row, $col)\n"; } sub Grid2_Click { my ($row, $col) = @_; print "Grid2 cell ($row, $col)\n"; } --- NEW FILE: test1.pl --- #! perl -w # # Test Basic Grid method # use strict; use Win32::GUI qw(WS_CLIPCHILDREN); use Win32::GUI::Grid; # main Window my $Window = new Win32::GUI::Window ( -title => "Win32::GUI::Grid test 1", -pos => [100, 100], -size => [400, 400], -name => "Window", -addstyle => WS_CLIPCHILDREN, ) or die "new Window"; # Grid Window my $Grid = new Win32::GUI::Grid ( -parent => $Window, -name => "Grid", -pos => [0, 0], ) or die "new Grid"; # Init Grid $Grid->SetEditable(1); $Grid->SetRows(50); $Grid->SetColumns(10); $Grid->SetFixedRows(1); $Grid->SetFixedColumns(1); # Fill Grid for my $row (0..$Grid->GetRows()) { for my $col (0..$Grid->GetColumns()) { if ($row == 0) { $Grid->SetCellFormat($row, $col, DT_LEFT|DT_WORDBREAK); $Grid->SetCellText($row, $col,"Column : $col"); } elsif ($col == 0) { $Grid->SetCellFormat($row, $col, DT_RIGHT|DT_VCENTER|DT_SINGLELINE|DT_END_ELLIPSIS|DT_NOPREFIX); $Grid->SetCellText($row, $col, "Row : $row"); } else { $Grid->SetCellFormat($row, $col, DT_RIGHT|DT_VCENTER|DT_SINGLELINE|DT_END_ELLIPSIS|DT_NOPREFIX); $Grid->SetCellText($row, $col, "Cell : ($row,$col)"); } } } # Resize Grid Cell $Grid->AutoSize(); # Event loop $Window->Show(); Win32::GUI::Dialog(); exit(0); # Main window event handler sub Window_Terminate { return -1; } sub Window_Resize { my ($width, $height) = ($Window->GetClientRect)[2..3]; $Grid->Resize ($width, $height); } --- NEW FILE: three.bmp --- (This appears to be a binary file; contents omitted.) |
|
From: Robert M. <rob...@us...> - 2006-06-11 16:41:15
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Grid/demos In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20010/demos Log Message: Directory /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Grid/demos added to the repository |
|
From: Robert M. <rob...@us...> - 2006-06-11 16:39:47
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Grid/t In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19013/t Log Message: Directory /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Grid/t added to the repository |
