Update of /cvsroot/perl-win32-gui/Win32-GUI/samples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28625/samples
Modified Files: NotifyIcon.pl Log Message: Fix build/test on Perl 5.6.1 Index: NotifyIcon.pl =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/samples/NotifyIcon.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** NotifyIcon.pl 11 Jan 2006 21:26:16 -0000 1.1 --- NotifyIcon.pl 14 Apr 2006 01:52:28 -0000 1.2 *************** *** 18,22 **** use warnings; ! use Win32; use Win32::GUI 1.03_02, qw(MB_OK MB_ICONHAND ES_WANTRETURN WS_CLIPCHILDREN WS_EX_TOPMOST); use Win32::GUI::BitmapInline(); --- 18,22 ---- use warnings; ! use Win32(); use Win32::GUI 1.03_02, qw(MB_OK MB_ICONHAND ES_WANTRETURN WS_CLIPCHILDREN WS_EX_TOPMOST); use Win32::GUI::BitmapInline(); *************** *** 52,56 **** icon => undef, ni => undef, ! v5 => ($Win32::GUI::NotifyIcon::SHELLDLL_VERSION >= 5), events => [], max_events => 100, --- 52,56 ---- icon => undef, ni => undef, ! 'v5' => ($Win32::GUI::NotifyIcon::SHELLDLL_VERSION >= 5), events => [], max_events => 100, *************** *** 129,133 **** $mw->AddLabel( ! -text => "shell32.dll\t\t" . Win32::GetFileVersion("shell32"), -left => $col1_ctrl_left, -top => $row1_gb_top + (4 * $padding), --- 129,133 ---- $mw->AddLabel( ! -text => "shell32.dll\t\t" . Win32::GUI::GetDllVersion("shell32"), -left => $col1_ctrl_left, -top => $row1_gb_top + (4 * $padding), *************** *** 401,404 **** --- 401,405 ---- Win32::GUI::Dialog(); $mw->Hide(); + undef $mw; exit(0); *************** *** 574,586 **** } ! { ! my $text=''; ! for my $e (@{$cfg{events}}) { ! $text .= "$e\r\n"; ! } ! ! $win->ETF->SetSel(0,-1); ! $win->ETF->ReplaceSel($text); ! } return; --- 575,580 ---- } ! $win->ETF->SetSel(0,-1); ! $win->ETF->ReplaceSel(join("\r\n", @{$cfg{events}})); return;