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
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
1
|
2
|
3
|
4
|
5
|
6
|
7
|
|
8
|
9
|
10
|
11
|
12
|
13
|
14
|
|
15
(17) |
16
(7) |
17
|
18
|
19
|
20
|
21
|
|
22
|
23
|
24
|
25
|
26
|
27
|
28
|
|
29
|
30
(4) |
31
|
|
|
|
|
|
From: Robert M. <rob...@us...> - 2007-07-30 22:04:54
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-ReleaseNotes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29107/Win32-GUI-ReleaseNotes Modified Files: RN_1_06.pod Log Message: Build fixes for Cygwin from Reini Urban Index: RN_1_06.pod =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-ReleaseNotes/RN_1_06.pod,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RN_1_06.pod 16 Jul 2007 19:36:59 -0000 1.3 --- RN_1_06.pod 30 Jul 2007 22:04:49 -0000 1.4 *************** *** 143,146 **** --- 143,151 ---- They have been removed. + =item Build process fixes + + A number of warnign when building under cygwin were fixed - + patches submitted by Reini Urban. + =back *************** *** 256,259 **** --- 261,266 ---- =item Joseph Cordero + =item Reini Urban + =back |
|
From: Robert M. <rob...@us...> - 2007-07-30 22:04:54
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/build_tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29107/build_tools Modified Files: updateRC.pl Log Message: Build fixes for Cygwin from Reini Urban Index: updateRC.pl =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/build_tools/updateRC.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** updateRC.pl 3 Aug 2005 21:45:58 -0000 1.1 --- updateRC.pl 30 Jul 2007 22:04:49 -0000 1.2 *************** *** 19,23 **** use BuildTools; ! my $rcfile = "GUI.rc"; my $version = BuildTools::macro_subst('__W32G_VERSION__'); --- 19,25 ---- use BuildTools; ! $|++; #AUTOFLUSH ! ! my $rcfile = 'GUI.rc'; my $version = BuildTools::macro_subst('__W32G_VERSION__'); *************** *** 25,36 **** my $changed = 0; ! my $outtext = ''; # Parse $version into 4 parts: ! my($maj, $min, $rc, $extra) = split(/\.|_/, $version . ".00.00.00"); ! print "Checking RC file ... "; ! open(my $in, "<$rcfile") or die "Filaed to open $rcfile for reading: $!"; while (my $inline = <$in>) { my $outline = $inline; --- 27,38 ---- my $changed = 0; ! my $outtext = q(); # Parse $version into 4 parts: ! my($maj, $min, $rc, $extra) = split(/\.|_/, $version . '.00.00.00'); ! print 'Checking RC file ... '; ! open(my $in, '<', $rcfile) or die "Failed to open $rcfile for reading: $!"; while (my $inline = <$in>) { my $outline = $inline; *************** *** 60,69 **** close($in); ! # write out the new rcfile ! open(my $out, ">$rcfile") or die "Failed to open $rcfile for writing"; ! print $out $outtext; ! close($out); ! print $changed ? "updated.\n" : "no change.\n"; exit(0); --- 62,77 ---- close($in); ! # write out the new rcfile, if it changed ! if($changed) { ! my $out; ! if(!open($out, '>', $rcfile)) { ! chmod 0644, $rcfile; ! open($out, '>', $rcfile) or die "Failed to open $rcfile for writing"; ! } ! print $out $outtext; ! close($out); ! } ! print $changed ? 'updated' : 'no change', ".\n"; exit(0); |
|
From: Robert M. <rob...@us...> - 2007-07-30 22:04:54
|
Update of /cvsroot/perl-win32-gui/Win32-GUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29107 Modified Files: CHANGELOG Makefile.PL Log Message: Build fixes for Cygwin from Reini Urban Index: Makefile.PL =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Makefile.PL,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** Makefile.PL 2 Nov 2006 20:39:18 -0000 1.24 --- Makefile.PL 30 Jul 2007 22:04:49 -0000 1.25 *************** *** 280,283 **** --- 280,292 ---- } + # gcc-3.4 issues a warning if -Wdeclaration-after-statement is + # used with cpp files (c++ mode). So remove it. + sub cflags { + my $inherited = shift->SUPER::cflags(@_); + $inherited =~ s/-Wdeclaration-after-statement//mg; + return $inherited; + } + + # Remove the Test-More dependency from the PPD file, as it is not # a requirement for a binary distribution *************** *** 361,365 **** $rc_frag .= <<'RC_FRAG3' ! GUI.rc: GUI.pm $(PERL) -I$(BUILD_TOOLS) $(BUILD_TOOLS)/updateRC.pl --- 370,374 ---- $rc_frag .= <<'RC_FRAG3' ! GUI.rc: $(PERL) -I$(BUILD_TOOLS) $(BUILD_TOOLS)/updateRC.pl Index: CHANGELOG =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/CHANGELOG,v retrieving revision 1.127 retrieving revision 1.128 diff -C2 -d -r1.127 -r1.128 *** CHANGELOG 16 Jul 2007 19:36:59 -0000 1.127 --- CHANGELOG 30 Jul 2007 22:04:49 -0000 1.128 *************** *** 6,9 **** --- 6,15 ---- Win32-GUI ChangeLog =================== + + [Robert May] : 30 July 2007 - Bug Fixes + - build_tools/updateRC, Makefile - fix problem with GUI.rc being readonly + on cygwin, only re-write GUI.rc if it changes [Reini Urban] + - Makefile.PL - fix warnings from gcc 3.4 with + -Wdeclaration-after-statement [Reini Urban] + + [Robert May] : 16 July 2007 - Bug Fixes - GUI.pm - fix Win32::GUI::Imagelist::AddMasked (Tracker: 1734697) |
|
From: Robert M. <rob...@us...> - 2007-07-30 18:36:09
|
Sorry for the spam - Rob. |
|
From: Robert M. <rob...@us...> - 2007-07-16 19:37:00
|
Update of /cvsroot/perl-win32-gui/Win32-GUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18276 Modified Files: CHANGELOG Log Message: Bring releasenotes up to date Index: CHANGELOG =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/CHANGELOG,v retrieving revision 1.126 retrieving revision 1.127 diff -C2 -d -r1.126 -r1.127 *** CHANGELOG 16 Jul 2007 19:31:50 -0000 1.126 --- CHANGELOG 16 Jul 2007 19:36:59 -0000 1.127 *************** *** 14,17 **** --- 14,19 ---- - GUI.xs - modify Dialog() and DoEvents() to allow for dialog navigation to work within MDI child windows. [Salvador Oritz] + --- Win32::GUI::ReleaseNotes --- + - RN_1_06.pod - bring up to date with new changes + [Robert May] : 15 July 2007 - Bug Fixes |
|
From: Robert M. <rob...@us...> - 2007-07-16 19:37:00
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-ReleaseNotes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18276/Win32-GUI-ReleaseNotes Modified Files: RN_1_06.pod Log Message: Bring releasenotes up to date Index: RN_1_06.pod =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-ReleaseNotes/RN_1_06.pod,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RN_1_06.pod 20 Jan 2007 19:45:45 -0000 1.2 --- RN_1_06.pod 16 Jul 2007 19:36:59 -0000 1.3 *************** *** 13,22 **** full detail. ! This release is a XXX release addressing the issues ! below. =head2 New Features ! There are no new features in this release. =head2 Bug Fixes --- 13,54 ---- full detail. ! This release is a primarily a bug-fix release addressing the issues ! below. There are a small number of new features. =head2 New Features ! =over ! ! =item More constants ! ! Win32::GUI::Constants now has over 2000 constants. Please keep ! reporting any that you need that are missing. ! ! =item Win32::GUI::DC::DrawFrameControl can DFCS_ADJUSTRECT ! ! DrawFrameControl() will now adjust it's input parameters ! if the DFCS_ADJUSTRECT flag is set. ! ! =item Dialog navigation for MDI Windows ! ! Salvadore Oritz submitted a patch to allow 'TAB' navigation ! between controls of an MDI child window. The '-dialogui' is ! now functional on MDI child windows. ! ! =item Confusion with GetParent() and Treeview windows ! ! The GetParent() method usually gets the parent window, but for ! the Treeview class it gets the parent node: ! ! $parent_node = $tree_view->GetParent($node); ! ! This made it difficult to get the parent window. Now, if the ! GetParent() method is called without an arguements: ! ! $parent_window = $tree_view->GetParent(); ! ! Then it will give you the parent window. ! ! =back =head2 Bug Fixes *************** *** 26,31 **** =item Baloon Tooltip info and warning icons swapped ! Fix inverted info and warning icon for balloon ! tooltips =item Textfield::GetLine() truncates lines --- 58,63 ---- =item Baloon Tooltip info and warning icons swapped ! The info and warning icon for balloon tooltips ! were the wrong way round. This is fixed. =item Textfield::GetLine() truncates lines *************** *** 35,38 **** --- 67,82 ---- lines. + =item '-prompt' option to Textfield + + The '-prompt' option to the Textfield constructor would + generate warnings and place the label incorrectly when + used to supply a label only: + + -prompt => 'Some Label:', + + This should now be fixed. Note that if you were relying on + the previouly incorrect placement (always against the left + border), then you may need to re-position your labels. + =item Error During Global Destruction *************** *** 49,52 **** --- 93,146 ---- Various memory leaks have been resolved. + =item Win32::GUI::Scintilla buffer sizes + + There were several places in the Scintilla wrapper + code where buffer of the wrong sizes were allocated. + This has been fixed. + + =item Win32::GUI::Scroll return value + + On failure Win32::GUI::Scroll was supposed to return undef, + but was returning random garbage. This has been fixed, + along with updates to the documentation. + + =item Win32::GUI::RichEdit::LimitText() + + There was a typo in the function name (LimiteText()). Both + spellings are now supported. + + =item ListView BeginLabelEdit event + + The second arguement was being set incorrectly when the callback + was made. This is now fixed. + + =item Crash when destroying a window during a callback + + It is possible to write code that destroys a window during one + of it's one callbacks. This could crash perl. Hopefully this + is now fixed. + + =item All Poly* drawing functions broken + + Polygon(), PolyBezier(), PolyBezierTo(), PolyLine() and + PolyLineTo() now all work. + + =item Comboxbox constructor - using multiple types + + The Win32::GUI::Combobox constructor has been updated to handle + the '-simple', '-dropdown' and '-dropdownlist' options more + intuatively. The docuentation has been updated to explain that + only one of these options should be used, and what happens + if more than one is used. + + =item Win32::GUI::Imagelist::AddMasked broken + + This call should now work. + + =item Win32::GUI::Acceptfiles() generates warning + + The AcceptFiles() method was using some undefined constants. + They have been removed. + =back *************** *** 152,155 **** --- 246,259 ---- =item Brian Millham + =item Glenn Munroe + + =item George + + =item Glenn Linderman + + =item Salvadore Oritz + + =item Joseph Cordero + =back |
|
From: Robert M. <rob...@us...> - 2007-07-16 19:31:49
|
Update of /cvsroot/perl-win32-gui/Win32-GUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16396 Modified Files: CHANGELOG GUI.xs Log Message: Update Dialog() and DoEvents() to allow dialog navigation for MDI child windows Index: GUI.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/GUI.xs,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** GUI.xs 15 Jul 2007 19:01:15 -0000 1.65 --- GUI.xs 16 Jul 2007 19:31:50 -0000 1.66 *************** *** 1050,1053 **** --- 1050,1054 ---- HACCEL acc; LPPERLWIN32GUI_USERDATA perlud; + LPPERLWIN32GUI_USERDATA tperlud; CODE: stayhere = 1; *************** *** 1081,1088 **** acc = perlud->hAcc; } if( !( (fIsMDI && TranslateMDISysAccel((HWND)perlud->dwData, &msg)) || (acc && TranslateAccelerator(phwnd, acc, &msg)) || ! (fIsDialog && IsDialogMessage(phwnd, &msg)) ) ){ TranslateMessage(&msg); --- 1082,1101 ---- acc = perlud->hAcc; } + // ### If the parent window is a MDIFrame the active MDIChild + // ### can be THE DialogBox + if(fIsMDI + && (thwnd = (HWND)SendMessage((HWND)perlud->dwData, WM_MDIGETACTIVE, (WPARAM) 0, (LPARAM) NULL)) + && (tperlud = (LPPERLWIN32GUI_USERDATA) GetWindowLong(thwnd, GWL_USERDATA)) + && ValidUserData(tperlud)) + { + fIsDialog = tperlud->dwPlStyle & PERLWIN32GUI_DIALOGUI; + } + else { + thwnd = phwnd; + } if( !( (fIsMDI && TranslateMDISysAccel((HWND)perlud->dwData, &msg)) || (acc && TranslateAccelerator(phwnd, acc, &msg)) || ! (fIsDialog && IsDialogMessage(thwnd, &msg)) ) ){ TranslateMessage(&msg); *************** *** 1125,1128 **** --- 1138,1142 ---- HACCEL acc; LPPERLWIN32GUI_USERDATA perlud; + LPPERLWIN32GUI_USERDATA tperlud; CODE: stayhere = 1; *************** *** 1152,1159 **** acc = perlud->hAcc; } if( !( (fIsMDI && TranslateMDISysAccel((HWND)perlud->dwData, &msg)) || (acc && TranslateAccelerator(phwnd, acc, &msg)) || ! (fIsDialog && IsDialogMessage(phwnd, &msg)) ) ){ TranslateMessage(&msg); --- 1166,1185 ---- acc = perlud->hAcc; } + // ### If the parent window is a MDIFrame the active MDIChild + // ### can be THE DialogBox + if(fIsMDI + && (thwnd = (HWND)SendMessage((HWND)perlud->dwData, WM_MDIGETACTIVE, (WPARAM) 0, (LPARAM) NULL)) + && (tperlud = (LPPERLWIN32GUI_USERDATA) GetWindowLong(thwnd, GWL_USERDATA)) + && ValidUserData(tperlud)) + { + fIsDialog = tperlud->dwPlStyle & PERLWIN32GUI_DIALOGUI; + } + else { + thwnd = phwnd; + } if( !( (fIsMDI && TranslateMDISysAccel((HWND)perlud->dwData, &msg)) || (acc && TranslateAccelerator(phwnd, acc, &msg)) || ! (fIsDialog && IsDialogMessage(thwnd, &msg)) ) ){ TranslateMessage(&msg); Index: CHANGELOG =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/CHANGELOG,v retrieving revision 1.125 retrieving revision 1.126 diff -C2 -d -r1.125 -r1.126 *** CHANGELOG 16 Jul 2007 19:28:28 -0000 1.125 --- CHANGELOG 16 Jul 2007 19:31:50 -0000 1.126 *************** *** 11,14 **** --- 11,17 ---- - GUI.pm - remove constants from AcceptFiles() [Joseph Cordero] - Treeview.xs - fix GetParent() method to get the parent window, rather + than the parent node if called with no arguements. [Salvador Oritz] + - GUI.xs - modify Dialog() and DoEvents() to allow for dialog navigation + to work within MDI child windows. [Salvador Oritz] + [Robert May] : 15 July 2007 - Bug Fixes |
|
From: Robert M. <rob...@us...> - 2007-07-16 19:28:28
|
Update of /cvsroot/perl-win32-gui/Win32-GUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15210 Modified Files: CHANGELOG TreeView.xs Log Message: Allow Treeview::GetParent to return parent window if called with no arguements Index: CHANGELOG =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/CHANGELOG,v retrieving revision 1.124 retrieving revision 1.125 diff -C2 -d -r1.124 -r1.125 *** CHANGELOG 16 Jul 2007 19:26:23 -0000 1.124 --- CHANGELOG 16 Jul 2007 19:28:28 -0000 1.125 *************** *** 10,13 **** --- 10,14 ---- - GUI.pm - fix -prompt option to Textfield (Tracker: 1734697) - GUI.pm - remove constants from AcceptFiles() [Joseph Cordero] + - Treeview.xs - fix GetParent() method to get the parent window, rather + [Robert May] : 15 July 2007 - Bug Fixes Index: TreeView.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/TreeView.xs,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** TreeView.xs 13 Apr 2006 22:17:07 -0000 1.8 --- TreeView.xs 16 Jul 2007 19:28:28 -0000 1.9 *************** *** 585,594 **** # (@)METHOD:GetParent(NODE) # Returns the handle of the parent node for the given B<NODE>. HTREEITEM ! GetParent(handle,item) HWND handle HTREEITEM item CODE: ! RETVAL = TreeView_GetParent(handle, item); OUTPUT: RETVAL --- 585,612 ---- # (@)METHOD:GetParent(NODE) # Returns the handle of the parent node for the given B<NODE>. + # + # NOTE: With no B<NODE> parameter this is the standard + # L<GetParent()|Win32::GUI::Reference::Methods/GetParent> + # method, returning the parent window. HTREEITEM ! GetParent(handle,item = NULL) HWND handle HTREEITEM item CODE: ! if(items == 1) { /* NOTE this is the XS defined 'items' var, not 'item' */ ! SV *SvParent; ! HWND parentHandle = GetParent(handle); ! ! if (parentHandle && (SvParent = SV_SELF_FROM_WINDOW(parentHandle)) && SvROK(SvParent)) { ! XPUSHs(SvParent); ! XSRETURN(1); ! } ! else { ! XSRETURN_UNDEF; ! } ! } ! else { ! RETVAL = TreeView_GetParent(handle, item); ! } OUTPUT: RETVAL |
|
From: Robert M. <rob...@us...> - 2007-07-16 19:26:22
|
Update of /cvsroot/perl-win32-gui/Win32-GUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14418 Modified Files: CHANGELOG GUI.pm Log Message: Fixup misuse of constants in Win32::GUI::AcceptFiles() Index: GUI.pm =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/GUI.pm,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** GUI.pm 16 Jul 2007 19:24:51 -0000 1.64 --- GUI.pm 16 Jul 2007 19:26:23 -0000 1.65 *************** *** 293,297 **** my $accept = shift; ! my $old_accept = $win->GetWindowLong(GWL_EXSTYLE) & WS_EX_ACCEPTFILES() ? 1 : 0; if(defined $accept) { --- 293,298 ---- my $accept = shift; ! # my $old_accept = $win->GetWindowLong(GWL_EXSTYLE) & WS_EX_ACCEPTFILES() ? 1 : 0; ! my $old_accept = $win->GetWindowLong(-20) & 0x00000010 ? 1 : 0; if(defined $accept) { Index: CHANGELOG =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/CHANGELOG,v retrieving revision 1.123 retrieving revision 1.124 diff -C2 -d -r1.123 -r1.124 *** CHANGELOG 16 Jul 2007 19:24:51 -0000 1.123 --- CHANGELOG 16 Jul 2007 19:26:23 -0000 1.124 *************** *** 9,12 **** --- 9,13 ---- - GUI.pm - fix Win32::GUI::Imagelist::AddMasked (Tracker: 1734697) - GUI.pm - fix -prompt option to Textfield (Tracker: 1734697) + - GUI.pm - remove constants from AcceptFiles() [Joseph Cordero] + [Robert May] : 15 July 2007 - Bug Fixes |
|
From: Robert M. <rob...@us...> - 2007-07-16 19:24:50
|
Update of /cvsroot/perl-win32-gui/Win32-GUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13671 Modified Files: CHANGELOG GUI.pm Log Message: Re-write Win32::GUI::Textfield::new() to fix up -prompt option Index: GUI.pm =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/GUI.pm,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** GUI.pm 16 Jul 2007 19:22:22 -0000 1.63 --- GUI.pm 16 Jul 2007 19:24:51 -0000 1.64 *************** *** 1388,1391 **** --- 1388,1393 ---- # -left => 75, # -top => 150, + # -width => 100, + # -height => 20, # -prompt => "Your name:", # ); *************** *** 1407,1475 **** my($class, $parent, @options) = @_; my %options = @options; if(exists $options{-prompt}) { ! my $add = 0; ! my ($text, $left, $width, $height, ); ! my $visible = 1; ! # Convert -pos and -size options to -left, -top, -width and -height options ! if (exists $options{-pos}) { ! $options{-left} = $options{-pos}[0]; ! $options{-top} = $options{-pos}[1]; ! } ! if (exists $options{-size}) { ! $options{-width} = $options{-size}[0]; ! $options{-height} = $options{-size}[1]; ! } if(ref($options{-prompt}) eq "ARRAY") { ! $left = pop(@{$options{'-prompt'}}); ! $text = pop(@{$options{'-prompt'}}); ! if($left < 0) { ! $width = -$left; ! $left += $options{-left}; ! } else { ! $width = $left; ! $left = $options{-left}; ! $add = 1; ! } ! } else { ! $text = $options{-prompt}; } ! if(exists $options{-height}) { ! $height = $options{-height}-3; ! } else { ! $height = 0; } ! if(exists $options{-visible}) { ! $visible = $options{-visible}; } my $prompt = new Win32::GUI::Label( $parent, ! -name => $options{-name} . '_Prompt', ! -width => $width, ! -left => $left, ! -top => $options{-top} + 3, -text => $text, ! -height => $height, ! -visible => $visible, ); ! $options{-left} += $prompt->Width if $add; ! # Update array options ! for (my $i = 0; $i < @options; $i += 2) { ! if ($options[$i] eq '-left') { ! $options[$i+1] = $options{-left}; ! last; ! } ! if ($options[$i] eq '-pos') { ! $options[$i+1][0] = $options{-left}; ! last; ! } } ! } ! return Win32::GUI->_new( ! Win32::GUI::_constant("WIN32__GUI__EDIT"), ! $class, $parent, @options, ! ); } --- 1409,1500 ---- my($class, $parent, @options) = @_; my %options = @options; + + # Create the textfield, invisible, and we'll + # make it visible if necessary at the end + my $visible = exists $options{-visible} ? $options{-visible} : 1; + my $textfield = Win32::GUI->_new( + Win32::GUI::_constant("WIN32__GUI__EDIT"), + $class, $parent, @options, '-visible', 0 + ); + + # If we failed to create it, then return undef + return undef unless $textfield; + + # If we have a -prompt option, then we need to + # create a label, and position it and the + # textfield correctly if(exists $options{-prompt}) { ! my ($text, $adjust); + # extract the information we need from + # the -prompt option if(ref($options{-prompt}) eq "ARRAY") { ! $text = shift(@{$options{'-prompt'}}); ! $adjust = shift(@{$options{'-prompt'}}) || 0; } ! else { ! $text = $options{-prompt}; } ! ! # Convert -pos to -left and -top, ! if (exists $options{-pos}) { ! $options{-left} = $options{-pos}[0]; ! $options{-top} = $options{-pos}[1]; } + + ## Create the label; Setting width and height to + # zero creates it the right size for the text. + # XXX: This will inherit the font from the + # parent window, ignoring any -font option + # passed. my $prompt = new Win32::GUI::Label( $parent, ! -name => $textfield->{-name} . '_Prompt', -text => $text, ! -left => $options{-left} || 0, ! -top => ($options{-top} || 0) + 3, ! -width => 0, ! -height => 0, ! -visible => 0, ); ! # If we failed to create it, then return undef ! return undef unless $prompt; ! # Adjust the positions: ! # $adjust < 0 : the textfield is in the correct ! # position, move the label left ! # $adjust > 0 : the label is in the correct ! # position, move the textfield right ! # $adjust == 0: both are correct, do nothing ! # $adjust undefined: label needs moving to ! # the left of the textfield, which we will ! # do by setting $adjust appropriately ! if(!defined $adjust) { ! $adjust = -($prompt->Width() + 5); } ! ! if($adjust < 0) { ! my $left = $prompt->Left(); ! $prompt->Left($left + $adjust); ! } ! elsif ($adjust > 0) { ! my $left = $textfield->Left(); ! $textfield->Left($left + $adjust); ! } ! else { ! # Adjust is zero, or we have ! # an error; in either case ! # do nothing ! } ! ! # Make the prompt visible if needed ! $prompt->Show() if $visible; ! } # finish processing prompt ! ! # Make the textfield visible if needed ! $textfield->Show() if $visible; ! ! return $textfield; } Index: CHANGELOG =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/CHANGELOG,v retrieving revision 1.122 retrieving revision 1.123 diff -C2 -d -r1.122 -r1.123 *** CHANGELOG 16 Jul 2007 19:22:22 -0000 1.122 --- CHANGELOG 16 Jul 2007 19:24:51 -0000 1.123 *************** *** 8,11 **** --- 8,12 ---- + [Robert May] : 16 July 2007 - Bug Fixes - GUI.pm - fix Win32::GUI::Imagelist::AddMasked (Tracker: 1734697) + - GUI.pm - fix -prompt option to Textfield (Tracker: 1734697) + [Robert May] : 15 July 2007 - Bug Fixes |
|
From: Robert M. <rob...@us...> - 2007-07-16 19:22:22
|
Update of /cvsroot/perl-win32-gui/Win32-GUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12904 Modified Files: CHANGELOG GUI.pm Log Message: Fix ImageList::AddMasked Index: GUI.pm =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/GUI.pm,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** GUI.pm 15 Jul 2007 18:23:06 -0000 1.62 --- GUI.pm 16 Jul 2007 19:22:22 -0000 1.63 *************** *** 2400,2404 **** my($self, $bitmap, $colorMask) = @_; $bitmap = new Win32::GUI::Bitmap($bitmap) unless ref($bitmap); ! return $self->AddBitmapMasked($bitmap); } --- 2400,2404 ---- my($self, $bitmap, $colorMask) = @_; $bitmap = new Win32::GUI::Bitmap($bitmap) unless ref($bitmap); ! return $self->AddBitmapMasked($bitmap, $colorMask); } Index: CHANGELOG =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/CHANGELOG,v retrieving revision 1.121 retrieving revision 1.122 diff -C2 -d -r1.121 -r1.122 *** CHANGELOG 15 Jul 2007 19:08:40 -0000 1.121 --- CHANGELOG 16 Jul 2007 19:22:22 -0000 1.122 *************** *** 6,9 **** --- 6,12 ---- Win32-GUI ChangeLog =================== + + [Robert May] : 16 July 2007 - Bug Fixes + - GUI.pm - fix Win32::GUI::Imagelist::AddMasked (Tracker: 1734697) + + [Robert May] : 15 July 2007 - Bug Fixes - GUI.pm - fix bltr direction in Animate Window [Tim Hansell] |
|
From: Robert M. <rob...@us...> - 2007-07-15 19:19:47
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-DIBitmap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21083/Win32-GUI-DIBitmap Modified Files: DIBitmap.xs Log Message: Mark up possible error Index: DIBitmap.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-DIBitmap/DIBitmap.xs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DIBitmap.xs 3 Aug 2006 22:24:37 -0000 1.3 --- DIBitmap.xs 15 Jul 2007 19:19:44 -0000 1.4 *************** *** 1611,1614 **** --- 1611,1615 ---- } else + /* XXX this looks wrong - the cast should be to UINT, not BYTE??? */ *((UINT*)&value) = (BYTE) SvIV(ST(3)); } |
|
From: Robert M. <rob...@us...> - 2007-07-15 19:08:40
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Scintilla In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16697/Win32-GUI-Scintilla Modified Files: Scintilla.PL Log Message: Fix some buffer size issues Index: Scintilla.PL =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Scintilla/Scintilla.PL,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Scintilla.PL 15 Oct 2006 14:07:46 -0000 1.5 --- Scintilla.PL 15 Jul 2007 19:08:40 -0000 1.6 *************** *** 197,205 **** $self->SetUndoCollection(0); ! open F, "<$file" or return 0; ! while ( <F> ) { $self->AppendText($_); } ! close F; $self->SetUndoCollection(1); --- 197,205 ---- $self->SetUndoCollection(0); ! open my $fh, "<$file" or return 0; ! while ( <$fh> ) { $self->AppendText($_); } ! close $fh; $self->SetUndoCollection(1); *************** *** 218,228 **** my ($self, $file) = @_; ! open F, ">$file" or return 0; ! for my $i (0..$self->GetLineCount()) { ! print F $self->GetLine ($i); } ! close F; $self->SetSavePoint(); --- 218,228 ---- my ($self, $file) = @_; ! open my $fh, ">$file" or return 0; ! for my $i (0 .. ($self->GetLineCount() - 1)) { ! print $fh $self->GetLine ($i); } ! close $fh; $self->SetSavePoint(); *************** *** 389,395 **** 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"; --- 389,395 ---- print ' my ($self) = @_;',"\n"; print ' my $line = $self->GetLineFromPosition ($self->GetCurrentPos());',"\n"; ! print ' my $length = $self->LineLength($line);',"\n"; ! print ' my $text = " " x $length;',"\n\n"; ! print ' if ($self->SendMessageNP (2027, $length, $text)) {',"\n"; print ' return $text;',"\n"; print ' } else {',"\n"; *************** *** 403,408 **** 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"; --- 403,408 ---- print 'sub GetLine {', "\n"; print ' my ($self, $line) = @_;', "\n"; ! print ' my $length = $self->LineLength($line);', "\n"; ! print ' my $text = " " x $length;', "\n\n"; print ' if ($self->SendMessageNP (2153, $line, $text)) {', "\n"; print ' return $text;', "\n"; *************** *** 464,474 **** 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"; } --- 464,472 ---- print 'sub GetText {', "\n"; print ' my $self = shift;', "\n"; ! print ' my $length = $self->SendMessageNN(2182, 0, 0); # includes trailing NUL', "\n"; ! print ' my $text = " " x $length;', "\n\n"; ! print ' $self->SendMessageNP (2182, $length, $text);', "\n"; ! print ' $text =~ s/.$//; # remove trailing NUL (regexp is faster than sbstr)', "\n"; ! print ' return $text;', "\n"; print '}', "\n"; } *************** *** 487,491 **** 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"; } --- 485,489 ---- print ' return $pos unless defined wantarray;', "\n"; print ' my @res = unpack("LLpLL", $texttofind);', "\n"; ! print ' return ($res[3], $res[4]); # pos , length', "\n"; print '}', "\n"; } *************** *** 705,709 **** # 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); --- 703,707 ---- # find out if we are folding or unfolding ! for $lineNum (1..$lineCount) { # XXX Should this be 0 .. $linecount - 1 ??? if ($self->GetFoldLevel($lineNum) & Win32::GUI::Scintilla::SC_FOLDLEVELHEADERFLAG) { $expanding = not $self->GetFoldExpanded($lineNum); |
|
From: Robert M. <rob...@us...> - 2007-07-15 19:08:39
|
Update of /cvsroot/perl-win32-gui/Win32-GUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16697 Modified Files: CHANGELOG Log Message: Fix some buffer size issues Index: CHANGELOG =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/CHANGELOG,v retrieving revision 1.120 retrieving revision 1.121 diff -C2 -d -r1.120 -r1.121 *** CHANGELOG 15 Jul 2007 19:06:09 -0000 1.120 --- CHANGELOG 15 Jul 2007 19:08:40 -0000 1.121 *************** *** 28,31 **** --- 28,34 ---- - Constants.PL, Tags.pm, 52_tags.t - add a whole bunch more constants (mainly control notification codes), and update tests + --- Win32::GUI::Scintilla --- + - Scintilla.PL - fix line count in SaveFile(). Fix buffer sizes in various + places. + [Robert May] : 20 January 2007 - Restore Original WndProc |
|
From: Robert M. <rob...@us...> - 2007-07-15 19:06:12
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Constants/t In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15548/Win32-GUI-Constants/t Modified Files: 52_tags.t Log Message: Add more constants Index: 52_tags.t =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Constants/t/52_tags.t,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** 52_tags.t 3 Aug 2006 22:19:07 -0000 1.4 --- 52_tags.t 15 Jul 2007 19:06:09 -0000 1.5 *************** *** 60,64 **** VK_BROWSER_REFRESH VK_BROWSER_BACK VK_VOLUME_UP VK_OEM_JUMP VK_NUMPAD4 VK_HANJA VK_W 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 --- 60,65 ---- VK_BROWSER_REFRESH VK_BROWSER_BACK VK_VOLUME_UP VK_OEM_JUMP VK_NUMPAD4 VK_HANJA VK_W VK_LSHIFT VK_OEM_4 VK_MODECHANGE ) ], ! animation => [ qw( ACS_CENTER ACS_TRANSPARENT ACS_AUTOPLAY ACS_TIMER ! ACM_OPEN ACM_PLAY ACM_STOP ACN_START ACN_STOP ) ], bitmap => [ qw( OBM_DNARROWD OBM_UPARROWI OBM_DNARROWI OBM_CHECKBOXES OBM_RGARROWI OBM_DNARROW *************** *** 73,77 **** BS_TYPEMASK BS_LEFTTEXT BS_TEXT BS_ICON BS_BITMAP BS_LEFT BS_RIGHT BS_CENTER BS_TOP BS_BOTTOM BS_VCENTER BS_PUSHLIKE BS_MULTILINE BS_NOTIFY BS_FLAT BS_RIGHTBUTTON ! IMAGE_CURSOR IMAGE_BITMAP IMAGE_ENHMETAFILE IMAGE_ICON ) ], class => [ qw( COLOR_WINDOW COLOR_BACKGROUND COLOR_3DHIGHLIGHT COLOR_MENUTEXT COLOR_WINDOWTEXT --- 74,84 ---- BS_TYPEMASK BS_LEFTTEXT BS_TEXT BS_ICON BS_BITMAP BS_LEFT BS_RIGHT BS_CENTER BS_TOP BS_BOTTOM BS_VCENTER BS_PUSHLIKE BS_MULTILINE BS_NOTIFY BS_FLAT BS_RIGHTBUTTON ! IMAGE_CURSOR IMAGE_BITMAP IMAGE_ENHMETAFILE IMAGE_ICON ! BM_GETCHECK BM_SETCHECK BM_GETSTATE BM_SETSTATE BM_SETSTYLE BM_CLICK BM_GETIMAGE ! BM_SETIMAGE ! BCM_FIRST BCM_GETIDEALSIZE BCM_SETIMAGELIST BCM_GETIMAGELIST BCM_SETTEXTMARGIN ! BCM_GETTEXTMARGIN ! BN_CLICKED BN_PAINT BN_HILITE BN_UNHILITE BN_DISABLE BN_DOUBLECLICKED BN_PUSHED ! BN_UNPUSHED BN_DBLCLK BN_SETFOCUS BN_KILLFOCUS) ], class => [ qw( COLOR_WINDOW COLOR_BACKGROUND COLOR_3DHIGHLIGHT COLOR_MENUTEXT COLOR_WINDOWTEXT *************** *** 91,95 **** CBS_DISABLENOSCROLL CBS_UPPERCASE CBS_LOWERCASE CBES_EX_NOEDITIMAGE CBES_EX_NOEDITIMAGEINDENT CBES_EX_PATHWORDBREAKPROC CBES_EX_NOSIZELIMIT ! CBES_EX_CASESENSITIVE ) ], cursor => [ qw( IDC_ARROW IDC_IBEAM IDC_WAIT IDC_CROSS IDC_UPARROW IDC_SIZENWSE --- 98,113 ---- CBS_DISABLENOSCROLL CBS_UPPERCASE CBS_LOWERCASE CBES_EX_NOEDITIMAGE CBES_EX_NOEDITIMAGEINDENT CBES_EX_PATHWORDBREAKPROC CBES_EX_NOSIZELIMIT ! CBES_EX_CASESENSITIVE ! CB_OKAY CB_ERR CB_ERRSPACE ! CB_GETEDITSEL CB_LIMITTEXT CB_SETEDITSEL CB_ADDSTRING CB_DELETESTRING CB_DIR ! CB_GETCOUNT CB_GETCURSEL CB_GETLBTEXT CB_GETLBTEXTLEN CB_INSERTSTRING CB_RESETCONTENT ! CB_FINDSTRING CB_SELECTSTRING CB_SETCURSEL CB_SHOWDROPDOWN CB_GETITEMDATA CB_SETITEMDATA ! CB_GETDROPPEDCONTROLRECT CB_SETITEMHEIGHT CB_GETITEMHEIGHT CB_SETEXTENDEDUI ! CB_GETEXTENDEDUI CB_GETDROPPEDSTATE CB_FINDSTRINGEXACT CB_SETLOCALE CB_GETLOCALE ! CB_GETTOPINDEX CB_SETTOPINDEX CB_GETHORIZONTALEXTENT CB_SETHORIZONTALEXTENT ! CB_GETDROPPEDWIDTH CB_SETDROPPEDWIDTH CB_INITSTORAGE CB_MULTIPLEADDSTRING ! CB_GETCOMBOBOXINFO ! CBN_ERRSPACE CBN_SELCHANGE CBN_DBLCLK CBN_SETFOCUS CBN_KILLFOCUS CBN_EDITCHANGE ! CBN_EDITUPDATE CBN_DROPDOWN CBN_CLOSEUP CBN_SELENDOK CBN_SELENDCANCEL ) ], cursor => [ qw( IDC_ARROW IDC_IBEAM IDC_WAIT IDC_CROSS IDC_UPARROW IDC_SIZENWSE *************** *** 152,160 **** ILS_SATURATE ILS_GLOW ILS_NORMAL ILS_SHADOW CLR_NONE CLR_DEFAULT IMAGE_CURSOR IMAGE_BITMAP IMAGE_ENHMETAFILE IMAGE_ICON ) ], ! label => [ qw( IMAGE_CURSOR IMAGE_BITMAP IMAGE_ENHMETAFILE IMAGE_ICON ) ], listbox => [ qw( LBS_NOTIFY LBS_SORT LBS_NOREDRAW LBS_MULTIPLESEL LBS_OWNERDRAWFIXED LBS_OWNERDRAWVARIABLE LBS_HASSTRINGS LBS_USETABSTOPS LBS_NOINTEGRALHEIGHT LBS_MULTICOLUMN LBS_WANTKEYBOARDINPUT ! LBS_EXTENDEDSEL LBS_DISABLENOSCROLL LBS_NODATA LBS_NOSEL LBS_COMBOBOX LBS_STANDARD ) ], listview => [ qw( LVS_ICON LVS_REPORT LVS_SMALLICON LVS_LIST LVS_TYPEMASK LVS_SINGLESEL LVS_SHOWSELALWAYS --- 170,190 ---- ILS_SATURATE ILS_GLOW ILS_NORMAL ILS_SHADOW CLR_NONE CLR_DEFAULT IMAGE_CURSOR IMAGE_BITMAP IMAGE_ENHMETAFILE IMAGE_ICON ) ], ! label => [ qw( IMAGE_CURSOR IMAGE_BITMAP IMAGE_ENHMETAFILE IMAGE_ICON ! STM_SETICON STM_GETICON STM_SETIMAGE STM_GETIMAGE STM_MSGMAX ! STN_CLICKED STN_DBLCLK STN_ENABLE STN_DISABLE) ], listbox => [ qw( LBS_NOTIFY LBS_SORT LBS_NOREDRAW LBS_MULTIPLESEL LBS_OWNERDRAWFIXED LBS_OWNERDRAWVARIABLE LBS_HASSTRINGS LBS_USETABSTOPS LBS_NOINTEGRALHEIGHT LBS_MULTICOLUMN LBS_WANTKEYBOARDINPUT ! LBS_EXTENDEDSEL LBS_DISABLENOSCROLL LBS_NODATA LBS_NOSEL LBS_COMBOBOX LBS_STANDARD ! LB_OKAY LB_ERR LB_ERRSPACE ! LB_ADDSTRING LB_INSERTSTRING LB_DELETESTRING LB_SELITEMRANGEEX LB_RESETCONTENT ! LB_SETSEL LB_SETCURSEL LB_GETSEL LB_GETCURSEL LB_GETTEXT LB_GETTEXTLEN LB_GETCOUNT ! LB_SELECTSTRING LB_DIR LB_GETTOPINDEX LB_FINDSTRING LB_GETSELCOUNT LB_GETSELITEMS ! LB_SETTABSTOPS LB_GETHORIZONTALEXTENT LB_SETHORIZONTALEXTENT LB_SETCOLUMNWIDTH ! LB_ADDFILE LB_SETTOPINDEX LB_GETITEMRECT LB_GETITEMDATA LB_SETITEMDATA LB_SELITEMRANGE ! LB_SETANCHORINDEX LB_GETANCHORINDEX LB_SETCARETINDEX LB_GETCARETINDEX LB_SETITEMHEIGHT ! LB_GETITEMHEIGHT LB_FINDSTRINGEXACT LB_SETLOCALE LB_GETLOCALE LB_SETCOUNT LB_INITSTORAGE ! LB_ITEMFROMPOINT LB_MULTIPLEADDSTRING LB_GETLISTBOXINFO ! LBN_ERRSPACE LBN_SELCHANGE LBN_DBLCLK LBN_SELCANCEL LBN_SETFOCUS LBN_KILLFOCUS ) ], listview => [ qw( LVS_ICON LVS_REPORT LVS_SMALLICON LVS_LIST LVS_TYPEMASK LVS_SINGLESEL LVS_SHOWSELALWAYS *************** *** 216,224 **** GT_USECRLF GT_SELECTION SF_NCRFORNONASCII SF_TEXT SF_TEXTIZED SF_RTFVAL SF_UNICODE SF_RTF SF_RTFNOOBJS SF_USECODEPAGE SFF_PLAINRTF SFF_PWD SFF_SELECTION ! SFF_WRITEXTRAPAR SFF_PERSISTVIEWSCALE SFF_KEEPDOCINFO ) ], scrollbar => [ qw( SB_THUMBTRACK SB_LINEUP SB_BOTTOM SB_LEFT SB_ENDSCROLL SB_PAGEUP SB_HORZ SB_BOTH SB_THUMBPOSITION SB_PAGELEFT SB_LINERIGHT SB_LINELEFT SB_VERT SB_RIGHT SB_CTL ! SB_PAGEDOWN SB_TOP SB_LINEDOWN SB_PAGERIGHT ) ], slider => [ qw( TBTS_BOTTOM TBTS_LEFT TBTS_RIGHT TBTS_TOP ) ], splitter => [ qw( ) ], --- 246,264 ---- GT_USECRLF GT_SELECTION SF_NCRFORNONASCII SF_TEXT SF_TEXTIZED SF_RTFVAL SF_UNICODE SF_RTF SF_RTFNOOBJS SF_USECODEPAGE SFF_PLAINRTF SFF_PWD SFF_SELECTION ! SFF_WRITEXTRAPAR SFF_PERSISTVIEWSCALE SFF_KEEPDOCINFO ! EN_MSGFILTER EN_REQUESTRESIZE EN_SELCHANGE EN_DROPFILES EN_PROTECTED EN_CORRECTTEXT ! EN_STOPNOUNDO EN_IMECHANGE EN_SAVECLIPBOARD EN_OLEOPFAILED EN_OBJECTPOSITIONS ! EN_LINK EN_DRAGDROPDONE EN_PARAGRAPHEXPANDED EN_PAGECHANGE EN_LOWFIRTF EN_ALIGNLTR ! EN_ALIGNRTL EN_SETFOCUS EN_KILLFOCUS EN_CHANGE EN_UPDATE EN_ERRSPACE EN_MAXTEXT ! EN_HSCROLL EN_VSCROLL EN_ALIGN_LTR_EC EN_ALIGN_RTL_EC ! ) ], scrollbar => [ qw( SB_THUMBTRACK SB_LINEUP SB_BOTTOM SB_LEFT SB_ENDSCROLL SB_PAGEUP SB_HORZ SB_BOTH SB_THUMBPOSITION SB_PAGELEFT SB_LINERIGHT SB_LINELEFT SB_VERT SB_RIGHT SB_CTL ! SB_PAGEDOWN SB_TOP SB_LINEDOWN SB_PAGERIGHT ! SBM_SETPOS SBM_GETPOS SBM_SETRANGE SBM_SETRANGEREDRAW SBM_GETRANGE SBM_ENABLE_ARROWS ! SBM_SETSCROLLINFO SBM_GETSCROLLINFO SBM_GETSCROLLBARINFO ! SBS_HORZ SBS_VERT SBS_TOPALIGN SBS_LEFTALIGN SBS_BOTTOMALIGN SBS_RIGHTALIGN ! SBS_SIZEBOXTOPLEFTALIGN SBS_SIZEBOXBOTTOMRIGHTALIGN SBS_SIZEBOX SBS_SIZEGRIP) ], slider => [ qw( TBTS_BOTTOM TBTS_LEFT TBTS_RIGHT TBTS_TOP ) ], splitter => [ qw( ) ], |
|
From: Robert M. <rob...@us...> - 2007-07-15 19:06:12
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Constants In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15548/Win32-GUI-Constants Modified Files: Constants.PL Constants.pm Tags.pm Log Message: Add more constants Index: Constants.pm =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Constants/Constants.pm,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Constants.pm 31 Oct 2006 22:21:49 -0000 1.7 --- Constants.pm 15 Jul 2007 19:06:09 -0000 1.8 *************** *** 17,21 **** =cut ! our $VERSION = '0.02'; our $XS_VERSION = $VERSION; eval $VERSION; --- 17,21 ---- =cut ! our $VERSION = '0.03'; our $XS_VERSION = $VERSION; eval $VERSION; *************** *** 134,138 **** (e.g. C<Win32::GUI::Constants::CW_USEDEFAULT>) ! =item -B<exportpkg>, I<pkgname> Causes exported symbols to be exported to the I<pkgname> --- 134,138 ---- (e.g. C<Win32::GUI::Constants::CW_USEDEFAULT>) ! =item B<-exportpkg>, I<pkgname> Causes exported symbols to be exported to the I<pkgname> Index: Constants.PL =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Constants/Constants.PL,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Constants.PL 15 Oct 2006 12:16:22 -0000 1.8 --- Constants.PL 15 Jul 2007 19:06:09 -0000 1.9 *************** *** 343,346 **** --- 343,355 ---- OPAQUE 2 + # Animation Control Messages + ACM_OPEN 1124 # (WM_USER+100) + ACM_PLAY 1125 # (WM_USER+101) + ACM_STOP 1126 # (WM_USER+102) + + # Animation Control Notifications + ACN_START 1 + ACN_STOP 2 + # Animation control styles ACS_CENTER 0x0001 *************** *** 393,396 **** --- 402,434 ---- BF_MONO 0x8000 + # Button Messages + BM_GETCHECK 0x00F0 + BM_SETCHECK 0x00F1 + BM_GETSTATE 0x00F2 + BM_SETSTATE 0x00F3 + BM_SETSTYLE 0x00F4 + BM_CLICK 0x00F5 + BM_GETIMAGE 0x00F6 + BM_SETIMAGE 0x00F7 + BCM_FIRST 0x1600 + BCM_GETIDEALSIZE 0x1601 # (BCM_FIRST + 0x0001) + BCM_SETIMAGELIST 0x1602 # (BCM_FIRST + 0x0002) + BCM_GETIMAGELIST 0x1603 # (BCM_FIRST + 0x0003) + BCM_SETTEXTMARGIN 0x1604 # (BCM_FIRST + 0x0004) + BCM_GETTEXTMARGIN 0x1605 # (BCM_FIRST + 0x0005) + + # Button Notifications + BN_CLICKED 0 + BN_PAINT 1 + BN_HILITE 2 + BN_UNHILITE 3 + BN_DISABLE 4 + BN_DOUBLECLICKED 5 + BN_PUSHED 2 # BN_HILITE + BN_UNPUSHED 3 # BN_UNHILITE + BN_DBLCLK 5 # BN_DOUBLECLICKED + BN_SETFOCUS 6 + BN_KILLFOCUS 7 + # Button Styles: BS_PUSHBUTTON 0x00000000 *************** *** 435,438 **** --- 473,532 ---- BTNS_WHOLEDROPDOWN 0x0080 + # Combo Box return values + CB_OKAY 0 + CB_ERR -1 + CB_ERRSPACE -2 + + # Combo Box Messages + CB_GETEDITSEL 0x0140 + CB_LIMITTEXT 0x0141 + CB_SETEDITSEL 0x0142 + CB_ADDSTRING 0x0143 + CB_DELETESTRING 0x0144 + CB_DIR 0x0145 + CB_GETCOUNT 0x0146 + CB_GETCURSEL 0x0147 + CB_GETLBTEXT 0x0148 + CB_GETLBTEXTLEN 0x0149 + CB_INSERTSTRING 0x014A + CB_RESETCONTENT 0x014B + CB_FINDSTRING 0x014C + CB_SELECTSTRING 0x014D + CB_SETCURSEL 0x014E + CB_SHOWDROPDOWN 0x014F + CB_GETITEMDATA 0x0150 + CB_SETITEMDATA 0x0151 + CB_GETDROPPEDCONTROLRECT 0x0152 + CB_SETITEMHEIGHT 0x0153 + CB_GETITEMHEIGHT 0x0154 + CB_SETEXTENDEDUI 0x0155 + CB_GETEXTENDEDUI 0x0156 + CB_GETDROPPEDSTATE 0x0157 + CB_FINDSTRINGEXACT 0x0158 + CB_SETLOCALE 0x0159 + CB_GETLOCALE 0x015A + CB_GETTOPINDEX 0x015b + CB_SETTOPINDEX 0x015c + CB_GETHORIZONTALEXTENT 0x015d + CB_SETHORIZONTALEXTENT 0x015e + CB_GETDROPPEDWIDTH 0x015f + CB_SETDROPPEDWIDTH 0x0160 + CB_INITSTORAGE 0x0161 + CB_MULTIPLEADDSTRING 0x0163 + CB_GETCOMBOBOXINFO 0x0164 + + # Combo Box notifications + CBN_ERRSPACE -1 + CBN_SELCHANGE 1 + CBN_DBLCLK 2 + CBN_SETFOCUS 3 + CBN_KILLFOCUS 4 + CBN_EDITCHANGE 5 + CBN_EDITUPDATE 6 + CBN_DROPDOWN 7 + CBN_CLOSEUP 8 + CBN_SELENDOK 9 + CBN_SELENDCANCEL 10 + # Combo Box styles CBS_SIMPLE 0x0001 *************** *** 450,454 **** CBS_LOWERCASE 0x4000 ! # Combo box extended styles CBES_EX_NOEDITIMAGE 0x00000001 CBES_EX_NOEDITIMAGEINDENT 0x00000002 --- 544,548 ---- CBS_LOWERCASE 0x4000 ! # Extended Combo box styles CBES_EX_NOEDITIMAGE 0x00000001 CBES_EX_NOEDITIMAGEINDENT 0x00000002 *************** *** 792,795 **** --- 886,919 ---- EM_GETIMESTATUS 0x00D9 + # (Rich)Edit control notification codes + EN_MSGFILTER 0x0700 + EN_REQUESTRESIZE 0x0701 + EN_SELCHANGE 0x0702 + EN_DROPFILES 0x0703 + EN_PROTECTED 0x0704 + EN_CORRECTTEXT 0x0705 + EN_STOPNOUNDO 0x0706 + EN_IMECHANGE 0x0707 + EN_SAVECLIPBOARD 0x0708 + EN_OLEOPFAILED 0x0709 + EN_OBJECTPOSITIONS 0x070a + EN_LINK 0x070b + EN_DRAGDROPDONE 0x070c + EN_PARAGRAPHEXPANDED 0x070d + EN_PAGECHANGE 0x070e + EN_LOWFIRTF 0x070f + EN_ALIGNLTR 0x0710 + EN_ALIGNRTL 0x0711 + EN_SETFOCUS 0x0100 + EN_KILLFOCUS 0x0200 + EN_CHANGE 0x0300 + EN_UPDATE 0x0400 + EN_ERRSPACE 0x0500 + EN_MAXTEXT 0x0501 + EN_HSCROLL 0x0601 + EN_VSCROLL 0x0602 + EN_ALIGN_LTR_EC 0x0700 + EN_ALIGN_RTL_EC 0x0701 + # Richedit Event notification masks ENM_NONE 0x00000000 *************** *** 1078,1081 **** --- 1202,1290 ---- OIC_INFORMATION 32516 # OIC_NOTE + # Owner Draw Types + ODT_MENU 1 + ODT_LISTBOX 2 + ODT_COMBOBOX 3 + ODT_BUTTON 4 + ODT_STATIC 5 + ODT_HEADER 100 + ODT_TAB 101 + ODT_LISTVIEW 102 + + # Owner Draw Actions + ODA_DRAWENTIRE 0x0001 + ODA_SELECT 0x0002 + ODA_FOCUS 0x0004 + + # Owner Draw States + ODS_SELECTED 0x0001 + ODS_GRAYED 0x0002 + ODS_DISABLED 0x0004 + ODS_CHECKED 0x0008 + ODS_FOCUS 0x0010 + ODS_DEFAULT 0x0020 + ODS_COMBOBOXEDIT 0x1000 + ODS_HOTLIGHT 0x0040 + ODS_INACTIVE 0x0080 + ODS_NOACCEL 0x0100 + ODS_NOFOCUSRECT 0x0200 + + # Listbox return values + LB_OKAY 0 + LB_ERR -1 + LB_ERRSPACE -2 + + # Listbox messages + LB_ADDSTRING 0x0180 + LB_INSERTSTRING 0x0181 + LB_DELETESTRING 0x0182 + LB_SELITEMRANGEEX 0x0183 + LB_RESETCONTENT 0x0184 + LB_SETSEL 0x0185 + LB_SETCURSEL 0x0186 + LB_GETSEL 0x0187 + LB_GETCURSEL 0x0188 + LB_GETTEXT 0x0189 + LB_GETTEXTLEN 0x018A + LB_GETCOUNT 0x018B + LB_SELECTSTRING 0x018C + LB_DIR 0x018D + LB_GETTOPINDEX 0x018E + LB_FINDSTRING 0x018F + LB_GETSELCOUNT 0x0190 + LB_GETSELITEMS 0x0191 + LB_SETTABSTOPS 0x0192 + LB_GETHORIZONTALEXTENT 0x0193 + LB_SETHORIZONTALEXTENT 0x0194 + LB_SETCOLUMNWIDTH 0x0195 + LB_ADDFILE 0x0196 + LB_SETTOPINDEX 0x0197 + LB_GETITEMRECT 0x0198 + LB_GETITEMDATA 0x0199 + LB_SETITEMDATA 0x019A + LB_SELITEMRANGE 0x019B + LB_SETANCHORINDEX 0x019C + LB_GETANCHORINDEX 0x019D + LB_SETCARETINDEX 0x019E + LB_GETCARETINDEX 0x019F + LB_SETITEMHEIGHT 0x01A0 + LB_GETITEMHEIGHT 0x01A1 + LB_FINDSTRINGEXACT 0x01A2 + LB_SETLOCALE 0x01A5 + LB_GETLOCALE 0x01A6 + LB_SETCOUNT 0x01A7 + LB_INITSTORAGE 0x01A8 + LB_ITEMFROMPOINT 0x01A9 + LB_MULTIPLEADDSTRING 0x01B1 + LB_GETLISTBOXINFO 0x01B2 + + # Listbox notifications + LBN_ERRSPACE -2 + LBN_SELCHANGE 1 + LBN_DBLCLK 2 + LBN_SELCANCEL 3 + LBN_SETFOCUS 4 + LBN_KILLFOCUS 5 + # Listbox styles LBS_NOTIFY 0x0001 *************** *** 1418,1422 **** SB_BOTH 3 ! # Status Bar styles (?) SBT_OWNERDRAW 0x1000 SBT_NOBORDERS 0x0100 --- 1627,1654 ---- SB_BOTH 3 ! # Scroll bar messages ! SBM_SETPOS 0x00E0 ! SBM_GETPOS 0x00E1 ! SBM_SETRANGE 0x00E2 ! SBM_SETRANGEREDRAW 0x00E6 ! SBM_GETRANGE 0x00E3 ! SBM_ENABLE_ARROWS 0x00E4 ! SBM_SETSCROLLINFO 0x00E9 ! SBM_GETSCROLLINFO 0x00EA ! SBM_GETSCROLLBARINFO 0x00EB ! ! # Scroll Bar styles ! SBS_HORZ 0x0000 ! SBS_VERT 0x0001 ! SBS_TOPALIGN 0x0002 ! SBS_LEFTALIGN 0x0002 ! SBS_BOTTOMALIGN 0x0004 ! SBS_RIGHTALIGN 0x0004 ! SBS_SIZEBOXTOPLEFTALIGN 0x0002 ! SBS_SIZEBOXBOTTOMRIGHTALIGN 0x0004 ! SBS_SIZEBOX 0x0008 ! SBS_SIZEGRIP 0x0010 ! ! # Status Bar styles SBT_OWNERDRAW 0x1000 SBT_NOBORDERS 0x0100 *************** *** 1664,1667 **** --- 1896,1912 ---- SE_ERR_NOASSOC 31 + # Static Control Messages + STM_SETICON 0x0170 + STM_GETICON 0x0171 + STM_SETIMAGE 0x0172 + STM_GETIMAGE 0x0173 + STM_MSGMAX 0x0174 + + # Static Control Notifications + STN_CLICKED 0 + STN_DBLCLK 1 + STN_ENABLE 2 + STN_DISABLE 3 + # ShowWindow() commands SW_HIDE 0 *************** *** 1701,1704 **** --- 1946,1967 ---- HWND_NOTOPMOST -2 + # Text Align constants (use with SetTextAlign) + TA_NOUPDATECP 0 + TA_UPDATECP 1 + TA_LEFT 0 + TA_RIGHT 2 + TA_CENTER 6 + TA_TOP 0 + TA_BOTTOM 8 + TA_BASELINE 24 + TA_RTLREADING 256 + TA_MASK 287 # (TA_BASELINE+TA_CENTER+TA_UPDATECP+TA_RTLREADING) + VTA_BASELINE 24 # TA_BASELINE + VTA_LEFT 8 # TA_BOTTOM + VTA_RIGHT 0 # TA_TOP + VTA_CENTER 6 # TA_CENTER + VTA_BOTTOM 2 # TA_RIGHT + VTA_TOP 0 # TA_LEFT + # Toolbar button states TBSTATE_CHECKED 0x01 Index: Tags.pm =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Constants/Tags.pm,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Tags.pm 3 Aug 2006 22:20:38 -0000 1.5 --- Tags.pm 15 Jul 2007 19:06:09 -0000 1.6 *************** *** 81,90 **** accelerator => [ qw( ^VK_ ) ], ! animation => [ qw( ^ACS_ ) ], bitmap => [ qw( ^OBM_ ) ], brush => [ qw() ], button => undef, class => [ qw( ^COLOR_ ^CS_ ) ], ! combobox => [ qw( ^CBS_ ^CBES_ ) ], cursor => [ qw( ^IDC_ ^OCR_ ) ], datetime => [ qw( ^DTS_ ) ], --- 81,90 ---- accelerator => [ qw( ^VK_ ) ], ! animation => [ qw( ^ACS_ ^ACM_ ^ACN_ ) ], bitmap => [ qw( ^OBM_ ) ], brush => [ qw() ], button => undef, class => [ qw( ^COLOR_ ^CS_ ) ], ! combobox => [ qw( ^CB_ ^CBS_ ^CBES_ ^CBN_ ) ], cursor => [ qw( ^IDC_ ^OCR_ ) ], datetime => [ qw( ^DTS_ ) ], *************** *** 94,99 **** icon => [ qw( ^IDI_ ^OIC_ ) ], imagelist => [ qw( ^ILC_ ^ILD_ ^ILS_ ^CLR_NONE$ ^CLR_DEFAULT$ ^IMAGE_ ) ], ! label => [ qw( ^IMAGE_ ) ], ! listbox => [ qw( ^LBS_ ) ], listview => [ qw( ^LVS_ ^LVIS_ ^LVIR_ ^LVSIL_ ^CLR_NONE$ ) ], mdi => [ qw() ], --- 94,99 ---- icon => [ qw( ^IDI_ ^OIC_ ) ], imagelist => [ qw( ^ILC_ ^ILD_ ^ILS_ ^CLR_NONE$ ^CLR_DEFAULT$ ^IMAGE_ ) ], ! label => [ qw( ^IMAGE_ ^STM_ ^STN_ ) ], ! listbox => [ qw( ^LB_ ^LBN_ ^LBS_ ) ], listview => [ qw( ^LVS_ ^LVIS_ ^LVIR_ ^LVSIL_ ^CLR_NONE$ ) ], mdi => [ qw() ], *************** *** 105,110 **** rebar => [ qw( ^CLR_DEFAULT$ ^RBBS_ ) ], region => [ qw( ^RGN_ ) ], ! richedit => [ qw( ^CP_ ^EM_ ^ENM_ ^ES_ ^GT_ ^SF_ ^SFF_ ) ], ! scrollbar => [ qw( ^SB_ ) ], slider => [ qw( ^TBTS_ ) ], splitter => [ qw() ], --- 105,110 ---- rebar => [ qw( ^CLR_DEFAULT$ ^RBBS_ ) ], region => [ qw( ^RGN_ ) ], ! richedit => [ qw( ^CP_ ^EM_ ^ENM_ ^EN_ ^ES_ ^GT_ ^SF_ ^SFF_ ) ], ! scrollbar => [ qw( ^SB_ ^SBM_ ^SBS_ ) ], slider => [ qw( ^TBTS_ ) ], splitter => [ qw() ], *************** *** 196,200 **** ^BS_PUSHBOX$ ^BS_OWNERDRAW$ ^BS_TYPEMASK$ ^BS_LEFTTEXT$ ^BS_TEXT$ ^BS_ICON$ ^BS_BITMAP$ ^BS_LEFT$ ^BS_RIGHT$ ^BS_CENTER$ ^BS_TOP$ ^BS_BOTTOM$ ^BS_VCENTER$ ! ^BS_PUSHLIKE$ ^BS_MULTILINE$ ^BS_NOTIFY$ ^BS_FLAT$ ^BS_RIGHTBUTTON$ ^IMAGE_ ) ] } sub tag_dc() { [ --- 196,201 ---- ^BS_PUSHBOX$ ^BS_OWNERDRAW$ ^BS_TYPEMASK$ ^BS_LEFTTEXT$ ^BS_TEXT$ ^BS_ICON$ ^BS_BITMAP$ ^BS_LEFT$ ^BS_RIGHT$ ^BS_CENTER$ ^BS_TOP$ ^BS_BOTTOM$ ^BS_VCENTER$ ! ^BS_PUSHLIKE$ ^BS_MULTILINE$ ^BS_NOTIFY$ ^BS_FLAT$ ^BS_RIGHTBUTTON$ ^IMAGE_ ! ^BM_ ^BCM_ ^BN_ ) ] } sub tag_dc() { [ |
|
From: Robert M. <rob...@us...> - 2007-07-15 19:06:12
|
Update of /cvsroot/perl-win32-gui/Win32-GUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15548 Modified Files: CHANGELOG Log Message: Add more constants Index: CHANGELOG =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/CHANGELOG,v retrieving revision 1.119 retrieving revision 1.120 diff -C2 -d -r1.119 -r1.120 *** CHANGELOG 15 Jul 2007 19:01:15 -0000 1.119 --- CHANGELOG 15 Jul 2007 19:06:09 -0000 1.120 *************** *** 25,28 **** --- 25,31 ---- - GUI.xs - tidy up the implementation of the Scroll() function, make it really return UNDEF on failure, and improve documentation. + --- Win32::GUI::Constants --- + - Constants.PL, Tags.pm, 52_tags.t - add a whole bunch more constants (mainly control + notification codes), and update tests + [Robert May] : 20 January 2007 - Restore Original WndProc |
|
From: Robert M. <rob...@us...> - 2007-07-15 19:01:16
|
Update of /cvsroot/perl-win32-gui/Win32-GUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13775 Modified Files: CHANGELOG GUI.xs Log Message: Improve Scroll() method to be easier to maintain, update docs and code to match Index: GUI.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/GUI.xs,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** GUI.xs 20 Jan 2007 17:09:22 -0000 1.64 --- GUI.xs 15 Jul 2007 19:01:15 -0000 1.65 *************** *** 1291,1301 **** ########################################################################### ! # (@)METHOD:Scroll(scrollbar,operation,position[,SB_THUMBTRACK_flag]) # Handles scrollbar scrolling if you don't want to do it yourself. This is # most useful in the Scroll event handler for a window or dialog box. # # B<scrollbar> can be: ! # 0 : Horizontal scrollbar ! # 1 : Vertical scrollbar # # B<operation> is an identifier for the operation being performed on the --- 1291,1301 ---- ########################################################################### ! # (@)METHOD:Scroll(scrollbar,operation[,position, [thumbtrack_flag]]) # Handles scrollbar scrolling if you don't want to do it yourself. This is # most useful in the Scroll event handler for a window or dialog box. # # B<scrollbar> can be: ! # SB_HOR(0) : Horizontal scrollbar ! # SB_VERT(1) : Vertical scrollbar # # B<operation> is an identifier for the operation being performed on the *************** *** 1305,1320 **** # SB_THUMBTRACK, SB_TOP, SB_LEFT, SB_BOTTOM, SB_RIGHT, or SB_ENDSCROLL # ! # Returns the position of the scrollbar or undef on failure. # ! DWORD ! Scroll(handle, scrollbar, operation, position, ... ) HWND handle ! int scrollbar ! int operation ! int position PREINIT: SCROLLINFO si; CODE: ! si.cbSize = sizeof(SCROLLINFO); si.fMask = SIF_ALL; if(GetScrollInfo(handle,scrollbar,&si)) { --- 1305,1330 ---- # SB_THUMBTRACK, SB_TOP, SB_LEFT, SB_BOTTOM, SB_RIGHT, or SB_ENDSCROLL # ! # B<position> is ignored unless B<operation> is SB_THUMBPOSITION, or ! # B<operation> is SB_THUMBTRACK and B<thumbtrack_flag> is TRUE. If ! # B<position> is not provided (or provided and equal to -1), then ! # the position used is taken from the internal scrollbar structure: ! # this is the prefered method of operation. # ! # B<thumbtrack_flag> indicates whether SB_THUMBTRACK messages are ! # processed (TRUE) or not (FALSE). It defaults to false. ! # ! # Returns the new position of the scrollbar, or undef on failure. ! # ! int ! Scroll(handle, scrollbar, operation, position = -1, thumbtrack_flag = 0) HWND handle ! int scrollbar ! int operation ! int position ! BOOL thumbtrack_flag PREINIT: SCROLLINFO si; CODE: ! si.cbSize = sizeof(si); si.fMask = SIF_ALL; if(GetScrollInfo(handle,scrollbar,&si)) { *************** *** 1322,1357 **** switch(operation) { case SB_THUMBTRACK: ! if (items <= 4 || ! SvIV(ST(4))) ! { break; } ! /* fall through */ case SB_THUMBPOSITION: ! if (position == -1) ! { si.nPos = si.nTrackPos; ! } else ! { si.nPos = position; } ! break; case SB_LINEUP: si.nPos--; ! break; case SB_LINEDOWN: si.nPos++; ! break; case SB_PAGEUP: si.nPos -= si.nPage; ! break; case SB_PAGEDOWN: si.nPos += si.nPage; ! break; case SB_TOP: si.nPos = si.nMin; ! break; case SB_BOTTOM: si.nPos = si.nMax; ! break; } RETVAL = SetScrollInfo(handle, scrollbar, &si, 1); } OUTPUT: RETVAL --- 1332,1375 ---- switch(operation) { case SB_THUMBTRACK: ! if(!thumbtrack_flag) { ! /* No tracking */ ! break; } ! /* fall through */ case SB_THUMBPOSITION: ! if(position == -1) { ! si.nPos = si.nTrackPos; } ! else { ! si.nPos = position; ! } ! break; case SB_LINEUP: si.nPos--; ! break; case SB_LINEDOWN: si.nPos++; ! break; case SB_PAGEUP: si.nPos -= si.nPage; ! break; case SB_PAGEDOWN: si.nPos += si.nPage; ! break; case SB_TOP: si.nPos = si.nMin; ! break; case SB_BOTTOM: si.nPos = si.nMax; ! break; ! default: ! XSRETURN_UNDEF; ! break; } RETVAL = SetScrollInfo(handle, scrollbar, &si, 1); } + else { + XSRETURN_UNDEF; + } OUTPUT: RETVAL *************** *** 1818,1822 **** ########################################################################### # (@)INTERNAL:_UserData() ! # Return a reference to an HV, stored in the perlud.UserData member # of the PERLWIN32GUI_USERDATA struct HV * --- 1836,1840 ---- ########################################################################### # (@)INTERNAL:_UserData() ! # Return a reference to an HV, stored in the perlud.userData member # of the PERLWIN32GUI_USERDATA struct HV * Index: CHANGELOG =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/CHANGELOG,v retrieving revision 1.118 retrieving revision 1.119 diff -C2 -d -r1.118 -r1.119 *** CHANGELOG 15 Jul 2007 18:58:28 -0000 1.118 --- CHANGELOG 15 Jul 2007 19:01:15 -0000 1.119 *************** *** 23,26 **** --- 23,28 ---- - TYPEMAP - correct UINT to be T_UV - Toolbar.xs - LoadImages() correct typo in docs + - GUI.xs - tidy up the implementation of the Scroll() function, make it + really return UNDEF on failure, and improve documentation. + [Robert May] : 20 January 2007 - Restore Original WndProc |
|
From: Robert M. <rob...@us...> - 2007-07-15 18:58:27
|
Update of /cvsroot/perl-win32-gui/Win32-GUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12973 Modified Files: CHANGELOG Toolbar.xs Log Message: Fix typo in LoadImage() docs Index: Toolbar.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Toolbar.xs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Toolbar.xs 16 Mar 2006 21:11:12 -0000 1.7 --- Toolbar.xs 15 Jul 2007 18:58:28 -0000 1.8 *************** *** 983,990 **** ########################################################################### ! # (@)METHOD:LoadImages([IDBITAMP=IDB_HIST_LARGE_COLOR],[HINSTANCE=HINST_COMMCTRL]) # Loads bitmaps into a toolbar control's image list. # ! # IDBITAMP when HINSTANCE == HINST_COMMCTRL, # IDB_HIST_LARGE_COLOR = Explorer bitmaps in large size. # IDB_HIST_SMALL_COLOR = Explorer bitmaps in small size. --- 983,990 ---- ########################################################################### ! # (@)METHOD:LoadImages([IDBITMAP=IDB_HIST_LARGE_COLOR],[HINSTANCE=HINST_COMMCTRL]) # Loads bitmaps into a toolbar control's image list. # ! # IDBITMAP when HINSTANCE == HINST_COMMCTRL, # IDB_HIST_LARGE_COLOR = Explorer bitmaps in large size. # IDB_HIST_SMALL_COLOR = Explorer bitmaps in small size. Index: CHANGELOG =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/CHANGELOG,v retrieving revision 1.117 retrieving revision 1.118 diff -C2 -d -r1.117 -r1.118 *** CHANGELOG 15 Jul 2007 18:56:25 -0000 1.117 --- CHANGELOG 15 Jul 2007 18:58:28 -0000 1.118 *************** *** 22,25 **** --- 22,26 ---- - RichEdit.xs - add alias LimitText() to correct spelling of LimiteText() - TYPEMAP - correct UINT to be T_UV + - Toolbar.xs - LoadImages() correct typo in docs + [Robert May] : 20 January 2007 - Restore Original WndProc |
|
From: Robert M. <rob...@us...> - 2007-07-15 18:56:26
|
Update of /cvsroot/perl-win32-gui/Win32-GUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12253 Modified Files: CHANGELOG TYPEMAP Log Message: Fix typemap (UINT => T_UV) Index: TYPEMAP =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/TYPEMAP,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TYPEMAP 3 Aug 2006 22:21:09 -0000 1.9 --- TYPEMAP 15 Jul 2007 18:56:25 -0000 1.10 *************** *** 18,22 **** LPTSTR T_PV DWORD T_IV ! UINT T_IV INT T_IV BOOL T_IV --- 18,22 ---- LPTSTR T_PV DWORD T_IV ! UINT T_UV INT T_IV BOOL T_IV Index: CHANGELOG =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/CHANGELOG,v retrieving revision 1.116 retrieving revision 1.117 diff -C2 -d -r1.116 -r1.117 *** CHANGELOG 15 Jul 2007 18:54:55 -0000 1.116 --- CHANGELOG 15 Jul 2007 18:56:25 -0000 1.117 *************** *** 21,24 **** --- 21,25 ---- [Glenn Munroe: Tracker 1706901] - RichEdit.xs - add alias LimitText() to correct spelling of LimiteText() + - TYPEMAP - correct UINT to be T_UV + [Robert May] : 20 January 2007 - Restore Original WndProc |
|
From: Robert M. <rob...@us...> - 2007-07-15 18:54:54
|
Update of /cvsroot/perl-win32-gui/Win32-GUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11518 Modified Files: CHANGELOG RichEdit.xs Log Message: Add ALIAS LimitText to Richedit to fix spelling error (LimiteText) Index: RichEdit.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/RichEdit.xs,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** RichEdit.xs 25 Apr 2006 21:24:52 -0000 1.8 --- RichEdit.xs 15 Jul 2007 18:54:55 -0000 1.9 *************** *** 147,150 **** --- 147,151 ---- ########################################################################### # (@)METHOD:LimiteText(LENGTH) + # (@)METHOD:LimitText(LENGTH) # (@)METHOD:SetMaxLength(LENGTH) # Sets the RichEdit control's maximum length (up to 2GB) *************** *** 155,158 **** --- 156,160 ---- ALIAS: Win32::GUI::RichEdit::SetMaxLength = 1 + Win32::GUI::RichEdit::LimitText = 2 CODE: RETVAL = SendMessage(handle, EM_EXLIMITTEXT, 0, (LPARAM) length); Index: CHANGELOG =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/CHANGELOG,v retrieving revision 1.115 retrieving revision 1.116 diff -C2 -d -r1.115 -r1.116 *** CHANGELOG 15 Jul 2007 18:52:38 -0000 1.115 --- CHANGELOG 15 Jul 2007 18:54:55 -0000 1.116 *************** *** 20,23 **** --- 20,24 ---- - Listview.xs - Correct second arg to OnBeginLabelEdit [Glenn Munroe: Tracker 1706901] + - RichEdit.xs - add alias LimitText() to correct spelling of LimiteText() + [Robert May] : 20 January 2007 - Restore Original WndProc |
|
From: Robert M. <rob...@us...> - 2007-07-15 18:52:38
|
Update of /cvsroot/perl-win32-gui/Win32-GUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10721 Modified Files: CHANGELOG ListView.xs Log Message: Fix first arg to Listview BeginLabelEdit event (#1706901] Index: CHANGELOG =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/CHANGELOG,v retrieving revision 1.114 retrieving revision 1.115 diff -C2 -d -r1.114 -r1.115 *** CHANGELOG 15 Jul 2007 18:47:13 -0000 1.114 --- CHANGELOG 15 Jul 2007 18:52:38 -0000 1.115 *************** *** 18,21 **** --- 18,23 ---- - GUI_Events.cpp, GUI_MessageLoops.cpp - handle window being destroyed in callback by checking validity with IsWindow(hwnd) in many places + - Listview.xs - Correct second arg to OnBeginLabelEdit + [Glenn Munroe: Tracker 1706901] + [Robert May] : 20 January 2007 - Restore Original WndProc Index: ListView.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/ListView.xs,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ListView.xs 16 Mar 2006 23:14:31 -0000 1.13 --- ListView.xs 15 Jul 2007 18:52:38 -0000 1.14 *************** *** 230,235 **** case LVN_BEGINLABELEDIT: PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_CONTROL6, "BeginLabelEdit", ! PERLWIN32GUI_ARGTYPE_LONG, (LONG) lv_notify->iItem, -1); --- 230,236 ---- case LVN_BEGINLABELEDIT: + pItem = &((LV_DISPINFO*)lParam)->item; PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_CONTROL6, "BeginLabelEdit", ! PERLWIN32GUI_ARGTYPE_LONG, (LONG) pItem->iItem, -1); |
|
From: Robert M. <rob...@us...> - 2007-07-15 18:47:13
|
Update of /cvsroot/perl-win32-gui/Win32-GUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8818 Modified Files: CHANGELOG GUI_Events.cpp GUI_MessageLoops.cpp Log Message: Fix crashes when windows destroyed during callbacks to perl Index: CHANGELOG =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/CHANGELOG,v retrieving revision 1.113 retrieving revision 1.114 diff -C2 -d -r1.113 -r1.114 *** CHANGELOG 15 Jul 2007 18:39:51 -0000 1.113 --- CHANGELOG 15 Jul 2007 18:47:13 -0000 1.114 *************** *** 16,19 **** --- 16,21 ---- - DC.xs - Rework DrawFrameControl() to allow DFCS_ADJUSTRECT to modify input parameters + - GUI_Events.cpp, GUI_MessageLoops.cpp - handle window being destroyed in + callback by checking validity with IsWindow(hwnd) in many places + [Robert May] : 20 January 2007 - Restore Original WndProc Index: GUI_Events.cpp =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/GUI_Events.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** GUI_Events.cpp 3 Aug 2006 22:20:02 -0000 1.14 --- GUI_Events.cpp 15 Jul 2007 18:47:13 -0000 1.15 *************** *** 10,13 **** --- 10,26 ---- #include "GUI.h" + /* IMPORTANT: + * Whenever we make a callback into perl, we cannot know what evil things + * the script writer will have done. In particular, it is possible for + * the called code to cause the window for which the event is being + * handled to be destroyed before the callback returns. If this happens + * we will have a non-NULL perlud pointer, but the underlying memory + * will have been freed. Don't try to access perlud after a callback + * without checking that the window still exists. Currently the code + * below gets the window handle BEFORE the callback (from perud->svSelf), + * and checks it afterwards with IsWindow(). This is not infallable as the + * hwnd could have been recycled - this is, however, unlikely + */ + /* ########################################################################## *************** *** 47,50 **** --- 60,64 ---- int PerlResult = 1; + HWND hwnd = handle_From(NOTXSCALL perlud->svSelf); perlud->dwPlStyle &= ~PERLWIN32GUI_EVENTHANDLING; *************** *** 101,104 **** --- 115,120 ---- LEAVE; + if(!IsWindow(hwnd)) return PerlResult; + // Must set after event call because this event can generate more event. perlud->dwPlStyle |= PERLWIN32GUI_EVENTHANDLING; *************** *** 163,166 **** --- 179,184 ---- LEAVE; + if(!IsWindow(hwnd)) return PerlResult; + // Must set after event call because this event can generate more event. perlud->dwPlStyle |= PERLWIN32GUI_EVENTHANDLING; *************** *** 279,282 **** --- 297,301 ---- SV* acc_sub = NULL; int PerlResult = 1; + HWND hwnd = handle_From(NOTXSCALL perlud->svSelf); perlud->dwPlStyle &= ~PERLWIN32GUI_EVENTHANDLING; *************** *** 298,308 **** // Find for a child with AcceleratorName name if (strcmp (perlud->szWindowName, AcceleratorName) != 0) { - - HWND hWndParent = handle_From(NOTXSCALL perlud->svSelf); st_FindChildWindow st; st.perlchild = NULL; st.Name = AcceleratorName; ! EnumChildWindows(hWndParent, (WNDENUMPROC) FindChildWindowsProc, (LPARAM) &st); perlchild = st.perlchild; } --- 317,325 ---- // Find for a child with AcceleratorName name if (strcmp (perlud->szWindowName, AcceleratorName) != 0) { st_FindChildWindow st; st.perlchild = NULL; st.Name = AcceleratorName; ! EnumChildWindows(hwnd, (WNDENUMPROC) FindChildWindowsProc, (LPARAM) &st); perlchild = st.perlchild; } *************** *** 334,337 **** --- 351,356 ---- LEAVE; + if(!IsWindow(hwnd)) return PerlResult; + // Must set after event call because this event can generate more event. perlud->dwPlStyle |= PERLWIN32GUI_EVENTHANDLING; *************** *** 363,366 **** --- 382,387 ---- LEAVE; + if(!IsWindow(hwnd)) return PerlResult; + // Must set after event call because this event can generate more event. perlud->dwPlStyle |= PERLWIN32GUI_EVENTHANDLING; *************** *** 394,397 **** --- 415,420 ---- LEAVE; + if(!IsWindow(hwnd)) return PerlResult; + // Must set after event call because this event can generate more event. perlud->dwPlStyle |= PERLWIN32GUI_EVENTHANDLING; *************** *** 426,429 **** --- 449,454 ---- LEAVE; + if(!IsWindow(hwnd)) return PerlResult; + // Must set after event call because this event can generate more event. perlud->dwPlStyle |= PERLWIN32GUI_EVENTHANDLING; *************** *** 448,452 **** int count; int argtype; ! static char *textneeded = NULL; if(textneeded != NULL) { safefree(textneeded); --- 473,478 ---- int count; int argtype; ! HWND hwnd = handle_From(NOTXSCALL perlud->svSelf); ! static char *textneeded = NULL; /* XXX: Not Thread Safe */ if(textneeded != NULL) { safefree(textneeded); *************** *** 515,518 **** --- 541,546 ---- LEAVE; + if(!IsWindow(hwnd)) return textneeded; + // Must set after event call because this event can generate more event. perlud->dwPlStyle |= PERLWIN32GUI_EVENTHANDLING; *************** *** 583,586 **** --- 611,616 ---- LEAVE; + if(!IsWindow(hwnd)) return textneeded; + // Must set after event call because this event can generate more event. perlud->dwPlStyle |= PERLWIN32GUI_EVENTHANDLING; *************** *** 609,612 **** --- 639,643 ---- int PerlResult = 1; + HWND hwnd = handle_From(NOTXSCALL perlud->svSelf); perlud->dwPlStyle &= ~PERLWIN32GUI_EVENTHANDLING; *************** *** 674,677 **** --- 705,710 ---- LEAVE; + if(!IsWindow(hwnd)) return PerlResult; + // Must set after event call because this event can generate more event. perlud->dwPlStyle |= PERLWIN32GUI_EVENTHANDLING; *************** *** 733,736 **** --- 766,771 ---- LEAVE; + if(!IsWindow(hwnd)) return PerlResult; + // Must set after event call because this event can generate more event. perlud->dwPlStyle |= PERLWIN32GUI_EVENTHANDLING; *************** *** 758,761 **** --- 793,797 ---- SV** events = NULL; int PerlResult = 1; + HWND hwnd = handle_From(NOTXSCALL perlud->svSelf); perlud->dwPlStyle &= ~PERLWIN32GUI_EVENTHANDLING; *************** *** 829,832 **** --- 865,870 ---- LEAVE; + if(!IsWindow(hwnd)) return PerlResult; + // Must set after event call because this event can generate more event. perlud->dwPlStyle |= PERLWIN32GUI_EVENTHANDLING; *************** *** 888,891 **** --- 926,931 ---- LEAVE; + if(!IsWindow(hwnd)) return PerlResult; + // Must set after event call because this event can generate more event. perlud->dwPlStyle |= PERLWIN32GUI_EVENTHANDLING; *************** *** 906,909 **** --- 946,950 ---- SV* newdc; int PerlResult = 1; + HWND hwnd = handle_From(NOTXSCALL perlud->svSelf); perlud->dwPlStyle &= ~PERLWIN32GUI_EVENTHANDLING; *************** *** 949,952 **** --- 990,995 ---- LEAVE; + if(!IsWindow(hwnd)) return PerlResult; + // Must set after event call because this event can generate more event. perlud->dwPlStyle |= PERLWIN32GUI_EVENTHANDLING; *************** *** 998,1001 **** --- 1041,1046 ---- LEAVE; + if(!IsWindow(hwnd)) return PerlResult; + // Must set after event call because this event can generate more event. perlud->dwPlStyle |= PERLWIN32GUI_EVENTHANDLING; Index: GUI_MessageLoops.cpp =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/GUI_MessageLoops.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** GUI_MessageLoops.cpp 16 Jul 2006 11:08:27 -0000 1.22 --- GUI_MessageLoops.cpp 15 Jul 2007 18:47:13 -0000 1.23 *************** *** 262,269 **** PerlResult = OnEvent[childud->iClass](NOTXSCALL childud, uMsg, wParam, lParam); ! if (childud->avHooks != NULL) DoHook(NOTXSCALL childud, (UINT) HIWORD(wParam), wParam, lParam, &PerlResult, WM_COMMAND); ! if(childud->forceResult != 0) { perlud->forceResult = childud->forceResult; childud->forceResult = 0; --- 262,269 ---- PerlResult = OnEvent[childud->iClass](NOTXSCALL childud, uMsg, wParam, lParam); ! if (IsWindow((HWND)lParam) && childud->avHooks != NULL) DoHook(NOTXSCALL childud, (UINT) HIWORD(wParam), wParam, lParam, &PerlResult, WM_COMMAND); ! if(IsWindow((HWND)lParam) && childud->forceResult != 0) { perlud->forceResult = childud->forceResult; childud->forceResult = 0; *************** *** 328,335 **** } ! if (childud->avHooks != NULL) DoHook(NOTXSCALL childud, (UINT) (((LPNMHDR) lParam)->code), wParam, lParam, &PerlResult, WM_NOTIFY); ! if(childud->forceResult != 0) { perlud->forceResult = childud->forceResult; childud->forceResult = 0; --- 328,335 ---- } ! if (IsWindow(((LPNMHDR)lParam)->hwndFrom) && childud->avHooks != NULL) DoHook(NOTXSCALL childud, (UINT) (((LPNMHDR) lParam)->code), wParam, lParam, &PerlResult, WM_NOTIFY); ! if (IsWindow(((LPNMHDR)lParam)->hwndFrom) && childud->forceResult != 0) { perlud->forceResult = childud->forceResult; childud->forceResult = 0; *************** *** 654,658 **** // Hook processing ! if(perlud->avHooks != NULL) { DoHook(NOTXSCALL perlud, uMsg, wParam, lParam, &PerlResult,0); } --- 654,658 ---- // Hook processing ! if(IsWindow(hwnd) && perlud->avHooks != NULL) { DoHook(NOTXSCALL perlud, uMsg, wParam, lParam, &PerlResult,0); } *************** *** 660,669 **** // Default processing if(PerlResult == -1) { ! PostMessage(hwnd, WM_EXITLOOP, (WPARAM) -1, 0); PerlResult = 0; ! } else if (PerlResult != 0) { PerlResult = CommonMsgLoop(NOTXSCALL hwnd, uMsg, wParam, lParam, perlud->WndProc); } ! else if (perlud->forceResult != 0) { return perlud->forceResult; } --- 660,673 ---- // Default processing if(PerlResult == -1) { ! if(IsWindow(hwnd)) { ! PostMessage(hwnd, WM_EXITLOOP, (WPARAM) -1, 0); ! } else { ! PostThreadMessage(GetCurrentThreadId(), WM_EXITLOOP, (WPARAM) -1, 0); ! } PerlResult = 0; ! } else if (IsWindow(hwnd) && PerlResult != 0) { PerlResult = CommonMsgLoop(NOTXSCALL hwnd, uMsg, wParam, lParam, perlud->WndProc); } ! else if (IsWindow(hwnd) && perlud->forceResult != 0) { return perlud->forceResult; } *************** *** 996,1007 **** } ! if (perlud->avHooks != NULL) DoHook(NOTXSCALL perlud, uMsg,wParam,lParam,&PerlResult,0); ! ! if (PerlResult != 0) { PerlResult = CommonMsgLoop(NOTXSCALL hwnd, uMsg, wParam, lParam, perlud->WndProc); } ! else if ( perlud->forceResult != 0) { return perlud->forceResult; } --- 1000,1010 ---- } ! if (IsWindow(hwnd) && perlud->avHooks != NULL) DoHook(NOTXSCALL perlud, uMsg,wParam,lParam,&PerlResult,0); ! if (IsWindow(hwnd) && PerlResult != 0) { PerlResult = CommonMsgLoop(NOTXSCALL hwnd, uMsg, wParam, lParam, perlud->WndProc); } ! else if (IsWindow(hwnd) && perlud->forceResult != 0) { return perlud->forceResult; } *************** *** 1102,1109 **** // Hook for non interactive control ! if (perlud->avHooks != NULL && !(perlud->dwPlStyle & PERLWIN32GUI_INTERACTIVE)) DoHook(NOTXSCALL perlud, uMsg,wParam,lParam,&PerlResult,0); ! if (PerlResult != 0) { // If interactive control, call ControlMsgLoop if (perlud->dwPlStyle & PERLWIN32GUI_INTERACTIVE) --- 1105,1112 ---- // Hook for non interactive control ! if (IsWindow(hwnd) && perlud->avHooks != NULL && !(perlud->dwPlStyle & PERLWIN32GUI_INTERACTIVE)) DoHook(NOTXSCALL perlud, uMsg,wParam,lParam,&PerlResult,0); ! if (IsWindow(hwnd) && PerlResult != 0) { // If interactive control, call ControlMsgLoop if (perlud->dwPlStyle & PERLWIN32GUI_INTERACTIVE) *************** *** 1112,1116 **** PerlResult = CommonMsgLoop(NOTXSCALL hwnd, uMsg, wParam, lParam, perlud->WndProc); } ! else if (perlud->forceResult != 0) { return perlud->forceResult; } --- 1115,1119 ---- PerlResult = CommonMsgLoop(NOTXSCALL hwnd, uMsg, wParam, lParam, perlud->WndProc); } ! else if (IsWindow(hwnd) && perlud->forceResult != 0) { return perlud->forceResult; } |
|
From: Robert M. <rob...@us...> - 2007-07-15 18:39:50
|
Update of /cvsroot/perl-win32-gui/Win32-GUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6004 Modified Files: CHANGELOG DC.xs Log Message: Re-implement DrawFrameControl allowing DFCS_ADJUSTRECT to function Index: DC.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/DC.xs,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** DC.xs 15 Jul 2007 18:37:14 -0000 1.17 --- DC.xs 15 Jul 2007 18:39:51 -0000 1.18 *************** *** 867,889 **** # (@)METHOD:DrawFrameControl(LEFT, TOP, RIGHT, BOTTOM, TYPE, STATE) # Draws a frame control of the specified type and style. BOOL DrawFrameControl(handle, left, top, right, bottom, type, state) ! HDC handle ! int left ! int top ! int right ! int bottom UINT type UINT state ! PREINIT: ! RECT rc; ! CODE: ! rc.left = left; ! rc.top = top; ! rc.right = right; ! rc.bottom = bottom; ! RETVAL = DrawFrameControl(handle, &rc, type, state); ! OUTPUT: ! RETVAL ########################################################################### --- 867,890 ---- # (@)METHOD:DrawFrameControl(LEFT, TOP, RIGHT, BOTTOM, TYPE, STATE) # Draws a frame control of the specified type and style. + # + # If STATE includes DFCS_ADJUSTRECT, then the input parameters + # LEFT, TOP, RIGHT, BOTTOM are ajusted to exclude the surrounding edge + # of the push button. If any of LEFT, TOP, RIGHT, BOTTOM are readonly, + # then DFCS_ADJUSTRECT will be ignored for the readonly parameters. BOOL DrawFrameControl(handle, left, top, right, bottom, type, state) ! HDC handle ! RECT rc = { (LONG)SvIV(ST(1)), (LONG)SvIV(ST(2)), (LONG)SvIV(ST(3)), (LONG)SvIV(ST(4)) }; UINT type UINT state ! C_ARGS: ! handle, &rc, type, state ! POSTCALL: ! if (state & DFCS_ADJUSTRECT) { ! if(!SvREADONLY(ST(1))) { sv_setiv_mg(ST(1), (IV)rc.left); } ! if(!SvREADONLY(ST(2))) { sv_setiv_mg(ST(2), (IV)rc.top); } ! if(!SvREADONLY(ST(3))) { sv_setiv_mg(ST(3), (IV)rc.right); } ! if(!SvREADONLY(ST(4))) { sv_setiv_mg(ST(4), (IV)rc.bottom); } ! } ########################################################################### Index: CHANGELOG =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/CHANGELOG,v retrieving revision 1.112 retrieving revision 1.113 diff -C2 -d -r1.112 -r1.113 *** CHANGELOG 15 Jul 2007 18:37:14 -0000 1.112 --- CHANGELOG 15 Jul 2007 18:39:51 -0000 1.113 *************** *** 14,17 **** --- 14,19 ---- PolyLineTo(). [George] - DC.xs - Fix DrawText() documentation + - DC.xs - Rework DrawFrameControl() to allow DFCS_ADJUSTRECT to modify + input parameters + [Robert May] : 20 January 2007 - Restore Original WndProc |
|
From: Robert M. <rob...@us...> - 2007-07-15 18:37:13
|
Update of /cvsroot/perl-win32-gui/Win32-GUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5215 Modified Files: CHANGELOG DC.xs Log Message: Fix DrawText documentation Index: DC.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/DC.xs,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** DC.xs 15 Jul 2007 18:29:00 -0000 1.16 --- DC.xs 15 Jul 2007 18:37:14 -0000 1.17 *************** *** 456,460 **** ########################################################################### ! # (@)METHOD:DrawText(STRING, LEFT, TOP, RIGHT, BOTTOM, WIDTH, HEIGHT, [FORMAT=DT_LEFT|DT_SINGLELINE|DT_TOP]) # Draws formatted text in the specified rectangle. It formats the text # according to the specified method. --- 456,460 ---- ########################################################################### ! # (@)METHOD:DrawText(STRING, LEFT, TOP, RIGHT, BOTTOM, [FORMAT=DT_LEFT|DT_SINGLELINE|DT_TOP]) # Draws formatted text in the specified rectangle. It formats the text # according to the specified method. Index: CHANGELOG =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/CHANGELOG,v retrieving revision 1.111 retrieving revision 1.112 diff -C2 -d -r1.111 -r1.112 *** CHANGELOG 15 Jul 2007 18:29:00 -0000 1.111 --- CHANGELOG 15 Jul 2007 18:37:14 -0000 1.112 *************** *** 13,16 **** --- 13,17 ---- - DC.xs - Fix Polygon(), PolyBezier(), PolyBezierTo(), PolyLine(), PolyLineTo(). [George] + - DC.xs - Fix DrawText() documentation + [Robert May] : 20 January 2007 - Restore Original WndProc |
