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
