Update of /cvsroot/perl-win32-gui/Win32-GUI
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27355
Modified Files:
CHANGELOG GUI.h GUI_Helpers.cpp Tooltip.xs
Log Message:
Cygwin build fixes
Index: GUI.h
===================================================================
RCS file: /cvsroot/perl-win32-gui/Win32-GUI/GUI.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** GUI.h 24 Jun 2006 13:33:30 -0000 1.29
--- GUI.h 30 Aug 2006 21:57:58 -0000 1.30
***************
*** 789,792 ****
--- 789,796 ----
#endif
+ #ifndef TTM_SETTITLE
+ # define TTM_SETTITLE TTM_SETTITLEA
+ #endif
+
#else
#define WNDPROC_CAST FARPROC
Index: Tooltip.xs
===================================================================
RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Tooltip.xs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Tooltip.xs 3 Aug 2006 22:20:53 -0000 1.8
--- Tooltip.xs 30 Aug 2006 21:57:58 -0000 1.9
***************
*** 412,416 ****
XST_mIV(count++, (IV) ti.uId);
} else {
! XST_mIV(count++, (IV) ti.hwnd);
XST_mPV(count++, "-id");
XST_mIV(count++, ti.uId);
--- 412,416 ----
XST_mIV(count++, (IV) ti.uId);
} else {
! XST_mIV(count++, PTR2IV(ti.hwnd));
XST_mPV(count++, "-id");
XST_mIV(count++, ti.uId);
***************
*** 429,435 ****
} else if (IS_INTRESOURCE(ti.lpszText)) {
XST_mPV(count++, "-text");
! XST_mIV(count++, (IV)ti.lpszText);
XST_mPV(count++, "-hinst");
! XST_mIV(count++, (IV)ti.hinst);
} else {
XST_mPV(count++, "-text");
--- 429,435 ----
} else if (IS_INTRESOURCE(ti.lpszText)) {
XST_mPV(count++, "-text");
! XST_mIV(count++, PTR2IV(ti.lpszText));
XST_mPV(count++, "-hinst");
! XST_mIV(count++, PTR2IV(ti.hinst));
} else {
XST_mPV(count++, "-text");
***************
*** 535,539 ****
XST_mIV(count++, (IV) ti.uId);
} else {
! XST_mIV(count++, (IV) ti.hwnd);
XST_mPV(count++, "-id");
XST_mIV(count++, ti.uId);
--- 535,539 ----
XST_mIV(count++, (IV) ti.uId);
} else {
! XST_mIV(count++, PTR2IV(ti.hwnd));
XST_mPV(count++, "-id");
XST_mIV(count++, ti.uId);
***************
*** 552,558 ****
} else if (IS_INTRESOURCE(ti.lpszText)) {
XST_mPV(count++, "-text");
! XST_mIV(count++, (IV)ti.lpszText);
XST_mPV(count++, "-hinst");
! XST_mIV(count++, (IV)ti.hinst);
} else {
XST_mPV(count++, "-text");
--- 552,558 ----
} else if (IS_INTRESOURCE(ti.lpszText)) {
XST_mPV(count++, "-text");
! XST_mIV(count++, PTR2IV(ti.lpszText));
XST_mPV(count++, "-hinst");
! XST_mIV(count++, PTR2IV(ti.hinst));
} else {
XST_mPV(count++, "-text");
***************
*** 809,813 ****
XST_mIV(count++, (IV) ti.uId);
} else {
! XST_mIV(count++, (IV) ti.hwnd);
XST_mPV(count++, "-id");
XST_mIV(count++, ti.uId);
--- 809,813 ----
XST_mIV(count++, (IV) ti.uId);
} else {
! XST_mIV(count++, PTR2IV(ti.hwnd));
XST_mPV(count++, "-id");
XST_mIV(count++, ti.uId);
***************
*** 826,832 ****
} else if (IS_INTRESOURCE(ti.lpszText)) {
XST_mPV(count++, "-text");
! XST_mIV(count++, (IV)ti.lpszText);
XST_mPV(count++, "-hinst");
! XST_mIV(count++, (IV)ti.hinst);
} else {
XST_mPV(count++, "-text");
--- 826,832 ----
} else if (IS_INTRESOURCE(ti.lpszText)) {
XST_mPV(count++, "-text");
! XST_mIV(count++, PTR2IV(ti.lpszText));
XST_mPV(count++, "-hinst");
! XST_mIV(count++, PTR2IV(ti.hinst));
} else {
XST_mPV(count++, "-text");
***************
*** 891,895 ****
XST_mIV(count++, (IV) hti.ti.uId);
} else {
! XST_mIV(count++, (IV) hti.ti.hwnd);
XST_mPV(count++, "-id");
XST_mIV(count++, hti.ti.uId);
--- 891,895 ----
XST_mIV(count++, (IV) hti.ti.uId);
} else {
! XST_mIV(count++, PTR2IV(hti.ti.hwnd));
XST_mPV(count++, "-id");
XST_mIV(count++, hti.ti.uId);
***************
*** 908,914 ****
} else if (IS_INTRESOURCE(hti.ti.lpszText)) {
XST_mPV(count++, "-text");
! XST_mIV(count++, (IV)hti.ti.lpszText);
XST_mPV(count++, "-hinst");
! XST_mIV(count++, (IV)hti.ti.hinst);
} else {
XST_mPV(count++, "-text");
--- 908,914 ----
} else if (IS_INTRESOURCE(hti.ti.lpszText)) {
XST_mPV(count++, "-text");
! XST_mIV(count++, PTR2IV(hti.ti.lpszText));
XST_mPV(count++, "-hinst");
! XST_mIV(count++, PTR2IV(hti.ti.hinst));
} else {
XST_mPV(count++, "-text");
Index: GUI_Helpers.cpp
===================================================================
RCS file: /cvsroot/perl-win32-gui/Win32-GUI/GUI_Helpers.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** GUI_Helpers.cpp 3 Aug 2006 22:24:37 -0000 1.21
--- GUI_Helpers.cpp 30 Aug 2006 21:57:58 -0000 1.22
***************
*** 361,365 ****
}
}
! oldhfont = SelectObject(hdc, hfont);
if(GetTextExtentPoint32(
hdc, perlcs->cs.lpszName, strlen(perlcs->cs.lpszName), &mySize
--- 361,365 ----
}
}
! oldhfont = (HFONT)SelectObject(hdc, hfont);
if(GetTextExtentPoint32(
hdc, perlcs->cs.lpszName, strlen(perlcs->cs.lpszName), &mySize
Index: CHANGELOG
===================================================================
RCS file: /cvsroot/perl-win32-gui/Win32-GUI/CHANGELOG,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -d -r1.96 -r1.97
*** CHANGELOG 3 Aug 2006 22:24:37 -0000 1.96
--- CHANGELOG 30 Aug 2006 21:57:58 -0000 1.97
***************
*** 6,9 ****
--- 6,14 ----
Win32-GUI ChangeLog
===================
+ + [Robert May] : 30 August 2006 - Cygwin build fixes
+ - GUI_Helpers.cpp - SelectObject cast to HFONT
+ - Tooltip.xs - use PTR2IV() for casting pointers to IV
+ - GUI.h - add missing SETTITLE definition for MinGW headers
+
+ [Robert May] : 3 August 2006 - Bug Fixes
- GUI_Helpers.cpp - fix potential memory leak in CalcControlSize
