Menu
▾
▴
perl-win32-gui-cvscommit — Send-only list for receiving email when commits are made to project CVS
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(6) |
Nov
(31) |
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(6) |
Feb
|
Mar
(17) |
Apr
(17) |
May
(27) |
Jun
(67) |
Jul
(26) |
Aug
(15) |
Sep
(2) |
Oct
(24) |
Nov
(6) |
Dec
|
| 2007 |
Jan
(4) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(28) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
(21) |
Feb
(45) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
(3) |
Mar
|
Apr
(3) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Aldo C. <aca...@us...> - 2011-07-16 14:51:05
|
Update of /cvsroot/perl-win32-gui/Win32-GUI
In directory vz-cvs-2.sog:/tmp/cvs-serv30632
Modified Files:
CHANGELOG GUI.h GUI.xs GUI_Helpers.cpp GUI_Options.cpp
Log Message:
Fixed -background GDI object leak, added -newui option for BrowseForFolder
Index: GUI_Options.cpp
===================================================================
RCS file: /cvsroot/perl-win32-gui/Win32-GUI/GUI_Options.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** GUI_Options.cpp 8 Apr 2010 21:26:48 -0000 1.17
--- GUI_Options.cpp 16 Jul 2011 14:51:03 -0000 1.18
***************
*** 58,62 ****
eventID = PERLWIN32GUI_NEM_TIMER;
} else if(strcmp(name, "Paint") == 0) {
! eventID = PERLWIN32GUI_NEM_PAINT;
} else if(strcmp(name, "Click") == 0) {
eventID = PERLWIN32GUI_NEM_CLICK;
--- 58,62 ----
eventID = PERLWIN32GUI_NEM_TIMER;
} else if(strcmp(name, "Paint") == 0) {
! eventID = PERLWIN32GUI_NEM_PAINT;
} else if(strcmp(name, "Click") == 0) {
eventID = PERLWIN32GUI_NEM_CLICK;
***************
*** 72,78 ****
eventID = PERLWIN32GUI_NEM_LOSTFOCUS;
} else if(strcmp(name, "DropFiles") == 0) {
! eventID = PERLWIN32GUI_NEM_DROPFILE;
} else if(strcmp(name, "Char") == 0) {
! eventID = PERLWIN32GUI_NEM_CHAR;
} else {
W32G_WARN("Win32::GUI: Unrecognized event name '%s' in -names!", name);
--- 72,78 ----
eventID = PERLWIN32GUI_NEM_LOSTFOCUS;
} else if(strcmp(name, "DropFiles") == 0) {
! eventID = PERLWIN32GUI_NEM_DROPFILE;
} else if(strcmp(name, "Char") == 0) {
! eventID = PERLWIN32GUI_NEM_CHAR;
} else {
W32G_WARN("Win32::GUI: Unrecognized event name '%s' in -names!", name);
***************
*** 81,85 ****
if(eventID != 0) {
// Clear current event if necessary
! if ( hv_exists(perlcs->hvEvents, name, strlen(name)) )
hv_delete(perlcs->hvEvents, name, strlen(name),G_DISCARD);
// Store event
--- 81,85 ----
if(eventID != 0) {
// Clear current event if necessary
! if ( hv_exists(perlcs->hvEvents, name, strlen(name)) )
hv_delete(perlcs->hvEvents, name, strlen(name),G_DISCARD);
// Store event
***************
*** 89,93 ****
SwitchBit(perlcs->dwEventMask, eventID, 1);
} else {
! SwitchBit(perlcs->dwEventMask, eventID, 0);
}
}
--- 89,93 ----
SwitchBit(perlcs->dwEventMask, eventID, 1);
} else {
! SwitchBit(perlcs->dwEventMask, eventID, 0);
}
}
***************
*** 124,128 ****
if(strcmp(option, "-class") == 0) {
next_i = i + 1;
! perlcs->cs.lpszClass = (LPCTSTR) classname_From(NOTXSCALL ST(next_i));
} else if(strcmp(option, "-text") == 0
|| strcmp(option, "-caption") == 0
--- 124,128 ----
if(strcmp(option, "-class") == 0) {
next_i = i + 1;
! perlcs->cs.lpszClass = (LPCTSTR) classname_From(NOTXSCALL ST(next_i));
} else if(strcmp(option, "-text") == 0
|| strcmp(option, "-caption") == 0
***************
*** 201,208 ****
lb.lbStyle = BS_SOLID;
lb.lbColor = perlcs->clrBackground;
! if(perlcs->hBackgroundBrush != NULL) {
DeleteObject((HGDIOBJ) perlcs->hBackgroundBrush);
}
perlcs->hBackgroundBrush = CreateBrushIndirect(&lb);
}
storing = newSViv((IV) perlcs->clrBackground);
--- 201,209 ----
lb.lbStyle = BS_SOLID;
lb.lbColor = perlcs->clrBackground;
! if(perlcs->hBackgroundBrush != NULL && perlcs->bDeleteBackgroundBrush) {
DeleteObject((HGDIOBJ) perlcs->hBackgroundBrush);
}
perlcs->hBackgroundBrush = CreateBrushIndirect(&lb);
+ perlcs->bDeleteBackgroundBrush = TRUE;
}
storing = newSViv((IV) perlcs->clrBackground);
***************
*** 210,213 ****
--- 211,223 ----
storing = newSViv((IV) perlcs->hBackgroundBrush);
stored = hv_store_mg(NOTXSCALL perlcs->hvSelf, "-backgroundbrush", 16, storing, 0);
+ } else if(strcmp(option, "-backgroundbrush") == 0) {
+ next_i = i + 1;
+ if(perlcs->hBackgroundBrush != NULL && perlcs->bDeleteBackgroundBrush) {
+ DeleteObject((HGDIOBJ) perlcs->hBackgroundBrush);
+ }
+ perlcs->hBackgroundBrush = (HBRUSH) handle_From(NOTXSCALL ST(next_i));;
+ perlcs->bDeleteBackgroundBrush = FALSE;
+ storing = newSViv((IV) perlcs->hBackgroundBrush);
+ stored = hv_store_mg(NOTXSCALL perlcs->hvSelf, "-backgroundbrush", 16, storing, 0);
} else if(strcmp(option, "-size") == 0) {
next_i = i + 1;
***************
*** 297,301 ****
SwitchBit(perlcs->dwPlStyle, PERLWIN32GUI_NEM, 0);
SwitchBit(perlcs->dwPlStyle, PERLWIN32GUI_OEM, 1);
! } else if(stricmp(SvPV_nolen(ST(next_i)), "byref") == 0) {
SwitchBit(perlcs->dwPlStyle, PERLWIN32GUI_NEM, 1);
SwitchBit(perlcs->dwPlStyle, PERLWIN32GUI_OEM, 0);
--- 307,311 ----
SwitchBit(perlcs->dwPlStyle, PERLWIN32GUI_NEM, 0);
SwitchBit(perlcs->dwPlStyle, PERLWIN32GUI_OEM, 1);
! } else if(stricmp(SvPV_nolen(ST(next_i)), "byref") == 0) {
SwitchBit(perlcs->dwPlStyle, PERLWIN32GUI_NEM, 1);
SwitchBit(perlcs->dwPlStyle, PERLWIN32GUI_OEM, 0);
***************
*** 613,617 ****
LPREBARBANDINFO rbbi,
int * index) {
!
int i, next_i;
char * option;
--- 623,627 ----
LPREBARBANDINFO rbbi,
int * index) {
!
int i, next_i;
char * option;
***************
*** 748,752 ****
if(strcmp(option, "-text") == 0) {
next_i = i + 1;
! if(SvPOK(ST(next_i)))
ti->lpszText = SvPV_nolen(ST(next_i));
else if (SvIOK(ST(next_i)))
--- 758,762 ----
if(strcmp(option, "-text") == 0) {
next_i = i + 1;
! if(SvPOK(ST(next_i)))
ti->lpszText = SvPV_nolen(ST(next_i));
else if (SvIOK(ST(next_i)))
***************
*** 864,868 ****
if(eventID != 0) {
// Clear current event if necessary
! if ( hv_exists(hvEvents, name, strlen(name)) )
hv_delete(hvEvents, name, strlen(name),G_DISCARD);
// Store event
--- 874,878 ----
if(eventID != 0) {
// Clear current event if necessary
! if ( hv_exists(hvEvents, name, strlen(name)) )
hv_delete(hvEvents, name, strlen(name),G_DISCARD);
// Store event
***************
*** 911,915 ****
#endif
}
!
next_i = -1;
for(i = from_i; i < items; i++) {
--- 921,925 ----
#endif
}
!
next_i = -1;
for(i = from_i; i < items; i++) {
***************
*** 940,947 ****
char* key;
I32 keylen;
!
if (hvEvents == NULL)
hvEvents = newHV();
!
hash = (HV*) SvRV(ST(next_i));
hv_iterinit( hash );
--- 950,957 ----
char* key;
I32 keylen;
!
if (hvEvents == NULL)
hvEvents = newHV();
!
hash = (HV*) SvRV(ST(next_i));
hv_iterinit( hash );
***************
*** 952,956 ****
} else if(strncmp(option, "-on", 3) == 0 && (char) option[3] >= 'A' && (char) option[3] <= 'Z') {
next_i = i + 1;
!
if (hvEvents == NULL)
hvEvents = newHV();
--- 962,966 ----
} else if(strncmp(option, "-on", 3) == 0 && (char) option[3] >= 'A' && (char) option[3] <= 'Z') {
next_i = i + 1;
!
if (hvEvents == NULL)
hvEvents = newHV();
***************
*** 994,1001 ****
}
}
!
// if we found events, store it into parent window.
if (hvEvents != NULL) {
!
SV* svParent = SV_SELF_FROM_WINDOW (nid->hWnd);
if (svParent != NULL && nid->uID != 0) {
--- 1004,1011 ----
}
}
!
// if we found events, store it into parent window.
if (hvEvents != NULL) {
!
SV* svParent = SV_SELF_FROM_WINDOW (nid->hWnd);
if (svParent != NULL && nid->uID != 0) {
***************
*** 1014,1018 ****
// Get notifyicon object from parent
SV** notifyicon = hv_fetch_mg(NOTXSCALL (HV*) SvRV(svParent), NotifyIconName, strlen(NotifyIconName), FALSE);
! if(notifyicon != NULL && SvROK(*notifyicon)) {
// Get NEM Events Hash
sv** events = hv_fetch_mg(NOTXSCALL (HV*) SvRV(*notifyicon), "-events", 7, FALSE);
--- 1024,1028 ----
// Get notifyicon object from parent
SV** notifyicon = hv_fetch_mg(NOTXSCALL (HV*) SvRV(svParent), NotifyIconName, strlen(NotifyIconName), FALSE);
! if(notifyicon != NULL && SvROK(*notifyicon)) {
// Get NEM Events Hash
sv** events = hv_fetch_mg(NOTXSCALL (HV*) SvRV(*notifyicon), "-events", 7, FALSE);
***************
*** 1025,1029 ****
while ( val = hv_iternextsv( hvEvents, &key, &keylen ) ) {
if ( hv_exists((HV*) SvRV(*events), key, keylen) )
! hv_delete((HV*) SvRV(*events), key, keylen, G_DISCARD);
hv_store_mg(NOTXSCALL (HV*) SvRV(*events), key, keylen, newSVsv(val), 0);
}
--- 1035,1039 ----
while ( val = hv_iternextsv( hvEvents, &key, &keylen ) ) {
if ( hv_exists((HV*) SvRV(*events), key, keylen) )
! hv_delete((HV*) SvRV(*events), key, keylen, G_DISCARD);
hv_store_mg(NOTXSCALL (HV*) SvRV(*events), key, keylen, newSVsv(val), 0);
}
Index: GUI.xs
===================================================================
RCS file: /cvsroot/perl-win32-gui/Win32-GUI/GUI.xs,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** GUI.xs 8 Apr 2010 21:26:48 -0000 1.68
--- GUI.xs 16 Jul 2011 14:51:03 -0000 1.69
***************
*** 731,734 ****
--- 731,735 ----
perlud->clrBackground = perlcs.clrBackground;
perlud->hBackgroundBrush = perlcs.hBackgroundBrush;
+ perlud->bDeleteBackgroundBrush = perlcs.bDeleteBackgroundBrush;
perlud->hvEvents = perlcs.hvEvents;
perlud->dwEventMask = perlcs.dwEventMask;
***************
*** 927,930 ****
--- 928,932 ----
perlcs.clrBackground = perlud->clrBackground;
perlcs.hBackgroundBrush = perlud->hBackgroundBrush;
+ perlcs.bDeleteBackgroundBrush = perlud->bDeleteBackgroundBrush;
perlcs.hvEvents = perlud->hvEvents;
perlcs.dwEventMask = perlud->dwEventMask;
***************
*** 944,947 ****
--- 946,950 ----
printf("XS(Change): BEFORE clrBackground = 0x%x\n", perlcs.clrBackground);
printf("XS(Change): BEFORE hBackgroundBrush = 0x%x\n", perlcs.hBackgroundBrush);
+ printf("XS(Change): BEFORE bDeleteBackgroundBrush = %d\n", perlcs.bDeleteBackgroundBrush);
#endif
// #### parse new window options
***************
*** 970,973 ****
--- 973,977 ----
printf("XS(Change): AFTER clrBackground = 0x%x\n", perlcs.clrBackground);
printf("XS(Change): AFTER hBackgroundBrush = 0x%x\n", perlcs.hBackgroundBrush);
+ printf("XS(Change): AFTER bDeleteBackgroundBrush = %d\n", perlcs.bDeleteBackgroundBrush);
#endif
// #### Perform changes
***************
*** 987,990 ****
--- 991,995 ----
perlud->clrBackground = perlcs.clrBackground;
perlud->hBackgroundBrush = perlcs.hBackgroundBrush;
+ perlud->bDeleteBackgroundBrush = perlcs.bDeleteBackgroundBrush;
perlud->hvEvents = perlcs.hvEvents;
perlud->dwEventMask = perlcs.dwEventMask;
***************
*** 5166,5169 ****
--- 5171,5178 ----
# -includefiles => 0/1 (default 0)
# the list will include files as well folders
+ # -newui => 0/1 (default 0)
+ # use the "new" user interface (which has a "New folder" button)
+ # -nonewfolder => 0/1 (default 0)
+ # hides the "New folder" button (only meaningful with -newui => 1)
# -owner => WINDOW
# A Win32::GUI::Window or Win32::GUI::DialogBox object specifiying the
***************
*** 5312,5315 ****
--- 5321,5326 ----
} else BitmaskOption("-includefiles", bi.ulFlags, BIF_BROWSEINCLUDEFILES)
} else BitmaskOption("-printeronly", bi.ulFlags, BIF_BROWSEFORPRINTER)
+ } else BitmaskOption("-newui", bi.ulFlags, BIF_NEWDIALOGSTYLE)
+ } else BitmaskOption("-nonewfolder", bi.ulFlags, BIF_NONEWFOLDERBUTTON)
} else if(strcmp(option, "-directory") == 0) {
next_i = i + 1;
Index: GUI.h
===================================================================
RCS file: /cvsroot/perl-win32-gui/Win32-GUI/GUI.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** GUI.h 8 Apr 2010 21:26:48 -0000 1.32
--- GUI.h 16 Jul 2011 14:51:03 -0000 1.33
***************
*** 271,274 ****
--- 271,275 ----
COLORREF clrBackground;
HBRUSH hBackgroundBrush;
+ BOOL bDeleteBackgroundBrush;
HV* hvEvents;
DWORD dwEventMask;
***************
*** 296,299 ****
--- 297,301 ----
COLORREF clrBackground;
HBRUSH hBackgroundBrush;
+ BOOL bDeleteBackgroundBrush;
WNDPROC WndProc;
HV* hvEvents;
Index: GUI_Helpers.cpp
===================================================================
RCS file: /cvsroot/perl-win32-gui/Win32-GUI/GUI_Helpers.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** GUI_Helpers.cpp 8 Apr 2010 21:26:48 -0000 1.27
--- GUI_Helpers.cpp 16 Jul 2011 14:51:03 -0000 1.28
***************
*** 124,128 ****
perlud->userData = NULL;
}
!
// If we stored an original wndproc, then restore it so that
// WM_NCDESTORY messages get there.
--- 124,133 ----
perlud->userData = NULL;
}
!
! // If we stored a brush, destroy it
! if (perlud->bDeleteBackgroundBrush && perlud->hBackgroundBrush != NULL) {
! DeleteObject((HGDIOBJ) perlud->hBackgroundBrush);
! }
!
// If we stored an original wndproc, then restore it so that
// WM_NCDESTORY messages get there.
***************
*** 130,134 ****
SetWindowLongPtr(hwnd_self, GWLP_WNDPROC, (IV)(perlud->WndProc));
}
!
// Free perlpud
safefree (perlud);
--- 135,139 ----
SetWindowLongPtr(hwnd_self, GWLP_WNDPROC, (IV)(perlud->WndProc));
}
!
// Free perlpud
safefree (perlud);
***************
*** 201,205 ****
pHv = hv_fetch_mg(NOTXSCALL (HV*) SvRV(pSv), "-handle", 7, 0);
if(pHv != NULL) {
!
hReturn = INT2PTR(HWND,SvIV(*pHv));
//printf("hReturn(1) is %i \n",hReturn);
--- 206,210 ----
pHv = hv_fetch_mg(NOTXSCALL (HV*) SvRV(pSv), "-handle", 7, 0);
if(pHv != NULL) {
!
hReturn = INT2PTR(HWND,SvIV(*pHv));
//printf("hReturn(1) is %i \n",hReturn);
***************
*** 635,639 ****
void DrawSplitter(NOTXSPROC HWND hwnd, int x, int y, int w, int h) {
! static WORD _dotPatternBmp[8] = { 0x00aa, 0x0055, 0x00aa, 0x0055,
0x00aa, 0x0055, 0x00aa, 0x0055};
--- 640,644 ----
void DrawSplitter(NOTXSPROC HWND hwnd, int x, int y, int w, int h) {
! static WORD _dotPatternBmp[8] = { 0x00aa, 0x0055, 0x00aa, 0x0055,
0x00aa, 0x0055, 0x00aa, 0x0055};
***************
*** 758,762 ****
if(ValidUserData(perlud)) {
PERLUD_FETCH; /* fetch context */
!
//Tracker 1941264: Check if perlud->avHooks contains NULL. This was causing
//a crash although it should not be possible that this is zero. It's likely
--- 763,767 ----
if(ValidUserData(perlud)) {
PERLUD_FETCH; /* fetch context */
!
//Tracker 1941264: Check if perlud->avHooks contains NULL. This was causing
//a crash although it should not be possible that this is zero. It's likely
Index: CHANGELOG
===================================================================
RCS file: /cvsroot/perl-win32-gui/Win32-GUI/CHANGELOG,v
retrieving revision 1.149
retrieving revision 1.150
diff -C2 -d -r1.149 -r1.150
*** CHANGELOG 8 Apr 2010 21:26:48 -0000 1.149
--- CHANGELOG 16 Jul 2011 14:51:03 -0000 1.150
***************
*** 6,9 ****
--- 6,15 ----
Win32-GUI ChangeLog
===================
+ + [Aldo Calpini] : 16 July 2011 - Fixed -background GDI object leak, added -newui option for BrowseForFolder
+ - GUI.h
+ - GUI.xs
+ - GUI_Helpers.cpp
+ - GUI_Options.cpp
+
+ [Jeremy White] : 08 April 2010 - Initial change to build with a 64bit compiler
- DC.xs
|
Update of /cvsroot/perl-win32-gui/Win32-GUI In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv24291 Modified Files: CHANGELOG DC.xs Font.xs GUI.h GUI.xs GUI_Events.cpp GUI_Helpers.cpp GUI_MessageLoops.cpp GUI_Options.cpp Header.xs ListView.xs MDI.xs Rebar.xs RichEdit.xs Splitter.xs TabStrip.xs Toolbar.xs Tooltip.xs TreeView.xs Window.xs Log Message: Initial change to build with a 64bit compiler Index: GUI.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/GUI.xs,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** GUI.xs 31 Jan 2008 00:28:14 -0000 1.67 --- GUI.xs 8 Apr 2010 21:26:48 -0000 1.68 *************** *** 111,115 **** # is called. The status specifies whether the key is up or down. # ! # keyCode -- If A..Z0..9, use the ASCII code. Otherwise, use # a virtual key code. Example: VK_SHIFT # --- 111,115 ---- # is called. The status specifies whether the key is up or down. # ! # keyCode -- If A..Z0..9, use the ASCII code. Otherwise, use # a virtual key code. Example: VK_SHIFT [...1391 lines suppressed...] # B<OBJECT> can have one of the following values: --- 5662,5666 ---- # (@)METHOD:GetStockObject(OBJECT) # Returns the handle of the specified predefined system object (pen, brush ! # or font). # # B<OBJECT> can have one of the following values: *************** *** 5840,5844 **** hr = (*pDllGetVersion)(&dvi); ! if(SUCCEEDED(hr)) { major = dvi.dwMajorVersion; --- 5840,5844 ---- hr = (*pDllGetVersion)(&dvi); ! if(SUCCEEDED(hr)) { major = dvi.dwMajorVersion; Index: TabStrip.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/TabStrip.xs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TabStrip.xs 8 Apr 2004 21:23:39 -0000 1.3 --- TabStrip.xs 8 Apr 2010 21:26:48 -0000 1.4 *************** *** 395,399 **** TC_ITEM Item; int iIndex; ! unsigned int chText; int i, next_i; CODE: --- 395,399 ---- TC_ITEM Item; int iIndex; ! STRLEN chText; int i, next_i; CODE: *************** *** 507,511 **** PREINIT: TC_ITEM Item; ! unsigned int chText; int i, next_i; CODE: --- 507,511 ---- PREINIT: TC_ITEM Item; ! STRLEN chText; int i, next_i; CODE: Index: MDI.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/MDI.xs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MDI.xs 26 Jun 2005 16:40:59 -0000 1.3 --- MDI.xs 8 Apr 2010 21:26:48 -0000 1.4 *************** *** 91,100 **** if (perlcs->hvParent != NULL) { LPPERLWIN32GUI_USERDATA parentud; ! parentud = (LPPERLWIN32GUI_USERDATA) GetWindowLong(perlcs->cs.hwndParent, GWL_USERDATA); if (parentud->dwPlStyle & PERLWIN32GUI_MDIFRAME && !(parentud->dwPlStyle & PERLWIN32GUI_HAVECHILDWINDOW)) { parentud->dwPlStyle |= PERLWIN32GUI_HAVECHILDWINDOW; ! parentud->dwData = (DWORD) myhandle; } } --- 91,100 ---- if (perlcs->hvParent != NULL) { LPPERLWIN32GUI_USERDATA parentud; ! parentud = (LPPERLWIN32GUI_USERDATA) GetWindowLongPtr(perlcs->cs.hwndParent, GWLP_USERDATA); if (parentud->dwPlStyle & PERLWIN32GUI_MDIFRAME && !(parentud->dwPlStyle & PERLWIN32GUI_HAVECHILDWINDOW)) { parentud->dwPlStyle |= PERLWIN32GUI_HAVECHILDWINDOW; ! parentud->dwData = (void*) myhandle; } } *************** *** 170,174 **** case WM_MDIACTIVATE : ! if( perlud->dwData == (DWORD) wParam ) { /* * (@)EVENT:Deactivate() --- 170,174 ---- case WM_MDIACTIVATE : ! if( perlud->dwData == (void*) wParam ) { /* * (@)EVENT:Deactivate() Index: RichEdit.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/RichEdit.xs,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** RichEdit.xs 15 Jul 2007 18:54:55 -0000 1.9 --- RichEdit.xs 8 Apr 2010 21:26:48 -0000 1.10 *************** *** 985,989 **** filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); ! estream.dwCookie = (DWORD) hfile; estream.dwError = 0; estream.pfnCallback = (EDITSTREAMCALLBACK) RichEditSave; --- 985,989 ---- filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); ! estream.dwCookie = (IV) hfile; estream.dwError = 0; estream.pfnCallback = (EDITSTREAMCALLBACK) RichEditSave; *************** *** 1010,1014 **** filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); ! estream.dwCookie = (DWORD) hfile; estream.dwError = 0; estream.pfnCallback = (EDITSTREAMCALLBACK) RichEditLoad; --- 1010,1014 ---- filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); ! estream.dwCookie = (IV) hfile; estream.dwError = 0; estream.pfnCallback = (EDITSTREAMCALLBACK) RichEditLoad; Index: DC.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/DC.xs,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** DC.xs 22 Feb 2010 16:24:32 -0000 1.19 --- DC.xs 8 Apr 2010 21:26:48 -0000 1.20 *************** *** 1596,1604 **** next_i = i + 1; lb.lbStyle = BS_PATTERN; ! lb.lbHatch = (LONG) handle_From(NOTXSCALL ST(next_i)); } else if(strcmp(option, "-hatch") == 0) { next_i = i + 1; lb.lbStyle = BS_HATCHED; ! lb.lbHatch = (LONG) SvIV(ST(next_i)); } else if(strcmp(option, "-color") == 0) { next_i = i + 1; --- 1596,1604 ---- next_i = i + 1; lb.lbStyle = BS_PATTERN; ! lb.lbHatch = (IV) handle_From(NOTXSCALL ST(next_i)); } else if(strcmp(option, "-hatch") == 0) { next_i = i + 1; lb.lbStyle = BS_HATCHED; ! lb.lbHatch = (IV) SvIV(ST(next_i)); } else if(strcmp(option, "-color") == 0) { next_i = i + 1; *************** *** 1606,1610 **** } else if(strcmp(option, "-system") == 0) { next_i = i + 1; ! XSRETURN_IV((long) GetSysColorBrush(SvIV(ST(next_i)))); } } else { --- 1606,1610 ---- } else if(strcmp(option, "-system") == 0) { next_i = i + 1; ! XSRETURN_IV((IV) GetSysColorBrush(SvIV(ST(next_i)))); } } else { *************** *** 1613,1617 **** } } ! XSRETURN_IV((long) CreateBrushIndirect(&lb)); ########################################################################### --- 1613,1617 ---- } } ! XSRETURN_IV((IV) CreateBrushIndirect(&lb)); ########################################################################### *************** *** 1710,1714 **** } } ! XSRETURN_IV((long) CreatePen(penstyle, penwidth, pencolor)); ########################################################################### --- 1710,1714 ---- } } ! XSRETURN_IV((IV) CreatePen(penstyle, penwidth, pencolor)); ########################################################################### Index: Header.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Header.xs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Header.xs 16 Mar 2006 21:11:11 -0000 1.5 --- Header.xs 8 Apr 2010 21:26:48 -0000 1.6 *************** *** 240,244 **** XST_mIV( 3, Item.iImage); XST_mPV( 4, "-bitmap"); ! XST_mIV( 5, (long)Item.hbm); XST_mPV( 6, "-bitmaponright"); XST_mIV( 7, (Item.fmt & HDF_BITMAP_ON_RIGHT)); --- 240,244 ---- XST_mIV( 3, Item.iImage); XST_mPV( 4, "-bitmap"); ! XST_mIV( 5, (IV)Item.hbm); XST_mPV( 6, "-bitmaponright"); XST_mIV( 7, (Item.fmt & HDF_BITMAP_ON_RIGHT)); Index: GUI_Events.cpp =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/GUI_Events.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** GUI_Events.cpp 15 Jul 2007 18:47:13 -0000 1.15 --- GUI_Events.cpp 8 Apr 2010 21:26:48 -0000 1.16 *************** *** 232,236 **** if( SvOK(event) ) { ! LPPERLWIN32GUI_USERDATA perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLong(hwnd, GWL_USERDATA); PerlResult = 0; --- 232,236 ---- if( SvOK(event) ) { ! LPPERLWIN32GUI_USERDATA perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLongPtr(hwnd, GWLP_USERDATA); PerlResult = 0; Index: GUI_MessageLoops.cpp =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/GUI_MessageLoops.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** GUI_MessageLoops.cpp 8 Feb 2008 14:24:38 -0000 1.24 --- GUI_MessageLoops.cpp 8 Apr 2010 21:26:48 -0000 1.25 *************** *** 29,33 **** // BitBlt new DC into window DC. ! perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLong((HWND) hwnd, GWL_USERDATA); if(perlud && (perlud->dwPlStyle & PERLWIN32GUI_FLICKERFREE)) { WINDOWINFO pwi; --- 29,33 ---- // BitBlt new DC into window DC. ! perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLongPtr((HWND) hwnd, GWLP_USERDATA); if(perlud && (perlud->dwPlStyle & PERLWIN32GUI_FLICKERFREE)) { WINDOWINFO pwi; *************** *** 55,59 **** HBITMAP holdbmp = (HBITMAP) SelectObject(hdc2, hbmp); ! HBRUSH bgBrush = (HBRUSH) GetClassLong (hwnd, GCL_HBRBACKGROUND); cr.right += offsetx; --- 55,59 ---- HBITMAP holdbmp = (HBITMAP) SelectObject(hdc2, hbmp); ! HBRUSH bgBrush = (HBRUSH) GetClassLongPtr (hwnd, GCLP_HBRBACKGROUND); cr.right += offsetx; *************** *** 74,78 **** break; case WM_ERASEBKGND: ! perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLong((HWND) hwnd, GWL_USERDATA); if(perlud && (perlud->dwPlStyle & PERLWIN32GUI_FLICKERFREE)) { return (LRESULT) 1; --- 74,78 ---- break; case WM_ERASEBKGND: ! perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLongPtr((HWND) hwnd, GWLP_USERDATA); if(perlud && (perlud->dwPlStyle & PERLWIN32GUI_FLICKERFREE)) { return (LRESULT) 1; *************** *** 95,99 **** case WM_CTLCOLORLISTBOX: { ! perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLong((HWND) lParam, GWL_USERDATA); if( ValidUserData(perlud) ) { if(uMsg == WM_CTLCOLORSTATIC) { --- 95,99 ---- case WM_CTLCOLORLISTBOX: { ! perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLongPtr((HWND) lParam, GWLP_USERDATA); if( ValidUserData(perlud) ) { if(uMsg == WM_CTLCOLORSTATIC) { *************** *** 112,116 **** DWORD hbrBackground; ! if(hbrBackground = GetClassLong((HWND)lParam, GCL_HBRBACKGROUND)) return ((LRESULT) hbrBackground); --- 112,116 ---- DWORD hbrBackground; ! if(hbrBackground = GetClassLongPtr((HWND)lParam, GCLP_HBRBACKGROUND)) return ((LRESULT) hbrBackground); *************** *** 131,135 **** LPMINMAXINFO minmax; LPPERLWIN32GUI_USERDATA perlud; ! perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLong(hwnd, GWL_USERDATA); if( ValidUserData(perlud) && !(perlud->dwPlStyle & PERLWIN32GUI_MDICHILD) ) { minmax = (LPMINMAXINFO) lParam; --- 131,135 ---- LPMINMAXINFO minmax; LPPERLWIN32GUI_USERDATA perlud; ! perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLongPtr(hwnd, GWLP_USERDATA); if( ValidUserData(perlud) && !(perlud->dwPlStyle & PERLWIN32GUI_MDICHILD) ) { minmax = (LPMINMAXINFO) lParam; *************** *** 148,152 **** if( nHitTest == HTCLIENT ) { // only diddle cursor in client areas LPPERLWIN32GUI_USERDATA perlud; ! perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLong((HWND) wParam, GWL_USERDATA); if( ValidUserData(perlud) && perlud->hCursor != NULL ) { SetCursor( perlud->hCursor ); --- 148,152 ---- if( nHitTest == HTCLIENT ) { // only diddle cursor in client areas LPPERLWIN32GUI_USERDATA perlud; ! perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLongPtr((HWND) wParam, GWLP_USERDATA); if( ValidUserData(perlud) && perlud->hCursor != NULL ) { SetCursor( perlud->hCursor ); *************** *** 159,163 **** case WM_NEXTDLGCTL: { ! perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLong(hwnd, GWL_USERDATA); if( ValidUserData(perlud) && (perlud->dwPlStyle & PERLWIN32GUI_DIALOGUI) ) { if(LOWORD(lParam)) --- 159,163 ---- case WM_NEXTDLGCTL: { ! perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLongPtr(hwnd, GWLP_USERDATA); if( ValidUserData(perlud) && (perlud->dwPlStyle & PERLWIN32GUI_DIALOGUI) ) { if(LOWORD(lParam)) *************** *** 205,210 **** if(perlud != NULL) { PERLUD_FETCH; ! SetWindowLong(hwnd, GWL_USERDATA, (long) perlud); ! hv_store_mg(NOTXSCALL (HV*)SvRV(perlud->svSelf), "-handle", 7, newSViv((long)hwnd), 0); SwitchBit(perlud->dwPlStyle, PERLWIN32GUI_CUSTOMCLASS, 1); // Set Custom class flag --- 205,210 ---- if(perlud != NULL) { PERLUD_FETCH; ! SetWindowLongPtr(hwnd, GWLP_USERDATA, (IV) perlud); ! hv_store_mg(NOTXSCALL (HV*)SvRV(perlud->svSelf), "-handle", 7, newSViv((IV)hwnd), 0); SwitchBit(perlud->dwPlStyle, PERLWIN32GUI_CUSTOMCLASS, 1); // Set Custom class flag *************** *** 219,223 **** } ! perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLong(hwnd, GWL_USERDATA); if(!ValidUserData(perlud)) { return DefWindowProc(hwnd, uMsg, wParam, lParam); --- 219,223 ---- } ! perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLongPtr(hwnd, GWLP_USERDATA); if(!ValidUserData(perlud)) { return DefWindowProc(hwnd, uMsg, wParam, lParam); *************** *** 257,261 **** */ else { ! childud = (LPPERLWIN32GUI_USERDATA) GetWindowLong((HWND) lParam, GWL_USERDATA); if( ValidUserData(childud) ) { childud->forceResult = 0; --- 257,261 ---- */ else { ! childud = (LPPERLWIN32GUI_USERDATA) GetWindowLongPtr((HWND) lParam, GWLP_USERDATA); if( ValidUserData(childud) ) { childud->forceResult = 0; *************** *** 276,280 **** case WM_NOTIFY: ! childud = (LPPERLWIN32GUI_USERDATA) GetWindowLong(((LPNMHDR) lParam)->hwndFrom, GWL_USERDATA); if( ValidUserData(childud) ) { childud->forceResult = 0; --- 276,280 ---- case WM_NOTIFY: ! childud = (LPPERLWIN32GUI_USERDATA) GetWindowLongPtr(((LPNMHDR) lParam)->hwndFrom, GWLP_USERDATA); if( ValidUserData(childud) ) { childud->forceResult = 0; *************** *** 532,536 **** case WM_HSCROLL: case WM_VSCROLL: ! childud = (LPPERLWIN32GUI_USERDATA) GetWindowLong((HWND) lParam, GWL_USERDATA); if (ValidUserData(childud)) PerlResult = OnEvent[childud->iClass](NOTXSCALL childud, uMsg, wParam, lParam); --- 532,536 ---- case WM_HSCROLL: case WM_VSCROLL: ! childud = (LPPERLWIN32GUI_USERDATA) GetWindowLongPtr((HWND) lParam, GWLP_USERDATA); if (ValidUserData(childud)) PerlResult = OnEvent[childud->iClass](NOTXSCALL childud, uMsg, wParam, lParam); *************** *** 689,693 **** #endif ! perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLong(hwnd, GWL_USERDATA); if( !ValidUserData(perlud)) { return DefWindowProc(hwnd, uMsg, wParam, lParam); --- 689,693 ---- #endif ! perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLongPtr(hwnd, GWLP_USERDATA); if( !ValidUserData(perlud)) { return DefWindowProc(hwnd, uMsg, wParam, lParam); *************** *** 717,722 **** if(perlud != NULL) { PERLUD_FETCH; ! SetWindowLong(hwnd, GWL_USERDATA, (long) perlud); ! hv_store_mg(NOTXSCALL (HV*)SvRV(perlud->svSelf), "-handle", 7, newSViv((long)hwnd), 0); SwitchBit(perlud->dwPlStyle, PERLWIN32GUI_CUSTOMCLASS, 1); // Set Custom class flag SwitchBit(perlud->dwPlStyle, PERLWIN32GUI_MDIFRAME , 1); // Set MDI Frame flag --- 717,722 ---- if(perlud != NULL) { PERLUD_FETCH; ! SetWindowLongPtr(hwnd, GWLP_USERDATA, (IV) perlud); ! hv_store_mg(NOTXSCALL (HV*)SvRV(perlud->svSelf), "-handle", 7, newSViv((IV)hwnd), 0); SwitchBit(perlud->dwPlStyle, PERLWIN32GUI_CUSTOMCLASS, 1); // Set Custom class flag SwitchBit(perlud->dwPlStyle, PERLWIN32GUI_MDIFRAME , 1); // Set MDI Frame flag *************** *** 751,755 **** /* Fetch perlud */ ! perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLong(hwnd, GWL_USERDATA); if( !ValidUserData(perlud)) { return DefWindowProc(hwnd, uMsg, wParam, lParam); --- 751,755 ---- /* Fetch perlud */ ! perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLongPtr(hwnd, GWLP_USERDATA); if( !ValidUserData(perlud)) { return DefWindowProc(hwnd, uMsg, wParam, lParam); *************** *** 799,808 **** if(perlud != NULL) { PERLUD_FETCH; ! SetWindowLong(hwnd, GWL_USERDATA, (long) perlud); ! hv_store_mg(NOTXSCALL (HV*)SvRV(perlud->svSelf), "-handle", 7, newSViv((long)hwnd), 0); SwitchBit(perlud->dwPlStyle, PERLWIN32GUI_CUSTOMCLASS, 1); // Set Custom class flag SwitchBit(perlud->dwPlStyle, PERLWIN32GUI_MDICHILD , 1); // Set MDI Frame flag perlud->WndProc = (LWNDPROC_CAST) DefMDIChildLoop; // Set DefMDIChildProc ! perlud->dwData = (DWORD) hwnd; // For fast hwnd acces (Activate/Deactivate) if (perlud->WndProc) { return CallWindowProc((WNDPROC_CAST) perlud->WndProc, hwnd, uMsg, wParam, lParam); --- 799,808 ---- if(perlud != NULL) { PERLUD_FETCH; ! SetWindowLongPtr(hwnd, GWLP_USERDATA, (IV) perlud); ! hv_store_mg(NOTXSCALL (HV*)SvRV(perlud->svSelf), "-handle", 7, newSViv((IV)hwnd), 0); SwitchBit(perlud->dwPlStyle, PERLWIN32GUI_CUSTOMCLASS, 1); // Set Custom class flag SwitchBit(perlud->dwPlStyle, PERLWIN32GUI_MDICHILD , 1); // Set MDI Frame flag perlud->WndProc = (LWNDPROC_CAST) DefMDIChildLoop; // Set DefMDIChildProc ! perlud->dwData = (void*) hwnd; // For fast hwnd acces (Activate/Deactivate) if (perlud->WndProc) { return CallWindowProc((WNDPROC_CAST) perlud->WndProc, hwnd, uMsg, wParam, lParam); *************** *** 836,841 **** if(perlud != NULL) { PERLUD_FETCH; ! SetWindowLong(hwnd, GWL_USERDATA, (long) perlud); ! hv_store_mg(NOTXSCALL (HV*)SvRV(perlud->svSelf), "-handle", 7, newSViv((long)hwnd), 0); SwitchBit(perlud->dwPlStyle, PERLWIN32GUI_CUSTOMCLASS, 1); // Set Custom class flag --- 836,841 ---- if(perlud != NULL) { PERLUD_FETCH; ! SetWindowLongPtr(hwnd, GWLP_USERDATA, (IV) perlud); ! hv_store_mg(NOTXSCALL (HV*)SvRV(perlud->svSelf), "-handle", 7, newSViv((IV)hwnd), 0); SwitchBit(perlud->dwPlStyle, PERLWIN32GUI_CUSTOMCLASS, 1); // Set Custom class flag *************** *** 850,854 **** } ! perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLong(hwnd, GWL_USERDATA); if( !ValidUserData(perlud)) { return DefWindowProc(hwnd, uMsg, wParam, lParam); --- 850,854 ---- } ! perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLongPtr(hwnd, GWLP_USERDATA); if( !ValidUserData(perlud)) { return DefWindowProc(hwnd, uMsg, wParam, lParam); *************** *** 961,965 **** case WM_NOTIFY : if (perlud->dwPlStyle & PERLWIN32GUI_CONTAINER) { ! HWND hwndParent = (HWND) GetWindowLong(hwnd, GWL_HWNDPARENT); SendMessage(hwndParent, uMsg, wParam, lParam); return 0; --- 961,965 ---- case WM_NOTIFY : if (perlud->dwPlStyle & PERLWIN32GUI_CONTAINER) { ! HWND hwndParent = (HWND) GetWindowLongPtr(hwnd, GWLP_HWNDPARENT); SendMessage(hwndParent, uMsg, wParam, lParam); return 0; *************** *** 1034,1039 **** if(perlud != NULL) { PERLUD_FETCH; ! SetWindowLong(hwnd, GWL_USERDATA, (long) perlud); ! hv_store_mg(NOTXSCALL (HV*)SvRV(perlud->svSelf), "-handle", 7, newSViv((long)hwnd), 0); SwitchBit(perlud->dwPlStyle, PERLWIN32GUI_CUSTOMCLASS, 1); // Set Custom class flag SwitchBit(perlud->dwPlStyle, PERLWIN32GUI_CONTAINER , 1); // Set Container flag --- 1034,1039 ---- if(perlud != NULL) { PERLUD_FETCH; ! SetWindowLongPtr(hwnd, GWLP_USERDATA, (IV) perlud); ! hv_store_mg(NOTXSCALL (HV*)SvRV(perlud->svSelf), "-handle", 7, newSViv((IV)hwnd), 0); SwitchBit(perlud->dwPlStyle, PERLWIN32GUI_CUSTOMCLASS, 1); // Set Custom class flag SwitchBit(perlud->dwPlStyle, PERLWIN32GUI_CONTAINER , 1); // Set Container flag *************** *** 1073,1078 **** if(perlud != NULL) { PERLUD_FETCH; ! SetWindowLong(hwnd, GWL_USERDATA, (long) perlud); ! hv_store_mg(NOTXSCALL (HV*)SvRV(perlud->svSelf), "-handle", 7, newSViv((long)hwnd), 0); SwitchBit(perlud->dwPlStyle, PERLWIN32GUI_CUSTOMCLASS, 1); // Set Custom class flag --- 1073,1078 ---- if(perlud != NULL) { PERLUD_FETCH; ! SetWindowLongPtr(hwnd, GWLP_USERDATA, (IV) perlud); ! hv_store_mg(NOTXSCALL (HV*)SvRV(perlud->svSelf), "-handle", 7, newSViv((IV)hwnd), 0); SwitchBit(perlud->dwPlStyle, PERLWIN32GUI_CUSTOMCLASS, 1); // Set Custom class flag *************** *** 1087,1091 **** } ! perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLong(hwnd, GWL_USERDATA); if( !ValidUserData(perlud)) { return DefWindowProc(hwnd, uMsg, wParam, lParam); --- 1087,1091 ---- } ! perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLongPtr(hwnd, GWLP_USERDATA); if( !ValidUserData(perlud)) { return DefWindowProc(hwnd, uMsg, wParam, lParam); Index: CHANGELOG =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/CHANGELOG,v retrieving revision 1.148 retrieving revision 1.149 diff -C2 -d -r1.148 -r1.149 *** CHANGELOG 22 Feb 2010 16:24:32 -0000 1.148 --- CHANGELOG 8 Apr 2010 21:26:48 -0000 1.149 *************** *** 6,9 **** --- 6,32 ---- Win32-GUI ChangeLog =================== + + [Jeremy White] : 08 April 2010 - Initial change to build with a 64bit compiler + - DC.xs + - Font.xs + - GUI.h + - GUI.xs + - GUI_Events.cpp + - GUI_Helpers.cpp + - GUI_MessageLoops.cpp + - GUI_Options.cpp + - Header.xs + - ListView.xs + - MDI.xs + - Rebar.xs + - RichEdit.xs + - Splitter.xs + - TabStrip.xs + - Textfield.xs + - Toolbar.xs + - Tooltip.xs + - TreeView.xs + - Window.xs + - Scintilla.xs + + [Jeremy White] : 22 February 2010 - Added methods to DC.xs - DC.xs - added GradientFillTriangle and GradientFillRectangle Index: Tooltip.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Tooltip.xs,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Tooltip.xs 20 Jan 2007 17:09:22 -0000 1.10 --- Tooltip.xs 8 Apr 2010 21:26:48 -0000 1.11 *************** *** 150,159 **** value = av_fetch(array, 1, 0); if(value) { ! ti->uId = (UINT)SvIV(*value); } else { CROAK("Problem with TOOL array reference, index 1"); } } else { ! ti->uId = (UINT)ti->hwnd; } } else { --- 150,159 ---- value = av_fetch(array, 1, 0); if(value) { ! ti->uId = (IV)SvIV(*value); } else { CROAK("Problem with TOOL array reference, index 1"); } } else { ! ti->uId = (IV)ti->hwnd; } } else { *************** *** 166,174 **** * (1) backwards compatability * (2) allowing the most common simple case of WINDOW */ ! ti->uId = (UINT)handle_From(NOTXSCALL tool); if(IsWindow((HWND)ti->uId)) { ti->hwnd = (HWND)ti->uId; } else { ! ti->hwnd = (HWND)GetWindowLong(handle, GWL_HWNDPARENT); } } --- 166,174 ---- * (1) backwards compatability * (2) allowing the most common simple case of WINDOW */ ! ti->uId = (IV)handle_From(NOTXSCALL tool); if(IsWindow((HWND)ti->uId)) { ti->hwnd = (HWND)ti->uId; } else { ! ti->hwnd = (HWND)GetWindowLongPtr(handle, GWLP_HWNDPARENT); } } *************** *** 262,266 **** ZeroMemory(&ti, sizeof(TOOLINFO)); ti.cbSize = sizeof(TOOLINFO); ! ti.hwnd = (HWND) GetWindowLong(handle, GWL_HWNDPARENT); ParseTooltipOptions(NOTXSCALL sp, mark, ax, items, 1, &ti); RETVAL = SendMessage(handle, TTM_ADDTOOL, 0, (LPARAM) &ti); --- 262,266 ---- ZeroMemory(&ti, sizeof(TOOLINFO)); ti.cbSize = sizeof(TOOLINFO); ! ti.hwnd = (HWND) GetWindowLongPtr(handle, GWLP_HWNDPARENT); ParseTooltipOptions(NOTXSCALL sp, mark, ax, items, 1, &ti); RETVAL = SendMessage(handle, TTM_ADDTOOL, 0, (LPARAM) &ti); *************** *** 1140,1144 **** ZeroMemory(&ti, sizeof(TOOLINFO)); ti.cbSize = sizeof(TOOLINFO); ! ti.hwnd = (HWND) GetWindowLong(handle, GWL_HWNDPARENT); ParseTooltipOptions(NOTXSCALL sp, mark, ax, items, 1, &ti); RETVAL = SendMessage(handle, TTM_SETTOOLINFO, 0, (LPARAM) &ti); --- 1140,1144 ---- ZeroMemory(&ti, sizeof(TOOLINFO)); ti.cbSize = sizeof(TOOLINFO); ! ti.hwnd = (HWND) GetWindowLongPtr(handle, GWLP_HWNDPARENT); ParseTooltipOptions(NOTXSCALL sp, mark, ax, items, 1, &ti); RETVAL = SendMessage(handle, TTM_SETTOOLINFO, 0, (LPARAM) &ti); Index: Splitter.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Splitter.xs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Splitter.xs 11 Jan 2006 21:26:16 -0000 1.5 --- Splitter.xs 8 Apr 2010 21:26:48 -0000 1.6 *************** *** 104,115 **** if(horizontal) { ! DrawSplitter(NOTXSCALL phwnd, rc.left, (int)(perlud->dwData), w, h); pt.y = AdjustSplitterCoord(NOTXSCALL perlud, pt.y, h, phwnd); ! perlud->dwData = (DWORD)pt.y; DrawSplitter(NOTXSCALL phwnd, rc.left, pt.y, w, h); } else { ! DrawSplitter(NOTXSCALL phwnd, (int)(perlud->dwData), rc.top, w, h); pt.x = AdjustSplitterCoord(NOTXSCALL perlud, pt.x, w, phwnd); ! perlud->dwData = (DWORD)pt.x; DrawSplitter(NOTXSCALL phwnd, pt.x, rc.top, w, h); } --- 104,115 ---- if(horizontal) { ! DrawSplitter(NOTXSCALL phwnd, rc.left, (IV)(perlud->dwData), w, h); pt.y = AdjustSplitterCoord(NOTXSCALL perlud, pt.y, h, phwnd); ! perlud->dwData = (void*)pt.y; DrawSplitter(NOTXSCALL phwnd, rc.left, pt.y, w, h); } else { ! DrawSplitter(NOTXSCALL phwnd, (IV)(perlud->dwData), rc.top, w, h); pt.x = AdjustSplitterCoord(NOTXSCALL perlud, pt.x, w, phwnd); ! perlud->dwData = (void*)pt.x; DrawSplitter(NOTXSCALL phwnd, pt.x, rc.top, w, h); } *************** *** 129,137 **** if(horizontal) { pt.y = AdjustSplitterCoord(NOTXSCALL perlud, pt.y, h, phwnd); ! perlud->dwData = (DWORD)rc.top; DrawSplitter(NOTXSCALL phwnd, rc.left, rc.top, w, h); } else { pt.x = AdjustSplitterCoord(NOTXSCALL perlud, pt.x, w, phwnd); ! perlud->dwData = (DWORD)rc.left; DrawSplitter(NOTXSCALL phwnd, rc.left, rc.top, w, h); } --- 129,137 ---- if(horizontal) { pt.y = AdjustSplitterCoord(NOTXSCALL perlud, pt.y, h, phwnd); ! perlud->dwData = (void*)rc.top; DrawSplitter(NOTXSCALL phwnd, rc.left, rc.top, w, h); } else { pt.x = AdjustSplitterCoord(NOTXSCALL perlud, pt.x, w, phwnd); ! perlud->dwData = (void*)rc.left; DrawSplitter(NOTXSCALL phwnd, rc.left, rc.top, w, h); } *************** *** 150,156 **** if(horizontal) { ! MoveWindow(hwnd, rc.left, (int)(perlud->dwData), w, h, 1); } else { ! MoveWindow(hwnd, (int)(perlud->dwData), rc.top, w, h, 1); } --- 150,156 ---- if(horizontal) { ! MoveWindow(hwnd, rc.left, (IV)(perlud->dwData), w, h, 1); } else { ! MoveWindow(hwnd, (IV)(perlud->dwData), rc.top, w, h, 1); } *************** *** 165,169 **** */ PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_CONTROL1, "Release", ! PERLWIN32GUI_ARGTYPE_LONG, (long) perlud->dwData, -1); --- 165,169 ---- */ PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_CONTROL1, "Release", ! PERLWIN32GUI_ARGTYPE_LONG, (IV) perlud->dwData, -1); *************** *** 181,187 **** if(horizontal) { ! DrawSplitter(NOTXSCALL phwnd, rc.left, (int)(perlud->dwData), w, h); } else { ! DrawSplitter(NOTXSCALL phwnd, (int)(perlud->dwData), rc.top, w, h); } } --- 181,187 ---- if(horizontal) { ! DrawSplitter(NOTXSCALL phwnd, rc.left, (IV)(perlud->dwData), w, h); } else { ! DrawSplitter(NOTXSCALL phwnd, (IV)(perlud->dwData), rc.top, w, h); } } *************** *** 216,220 **** CROAK("Usage: Min(handle, [value]);\n"); } ! perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLong(handle, GWL_USERDATA); if( ValidUserData(perlud) ) { if(items == 1) { --- 216,220 ---- CROAK("Usage: Min(handle, [value]);\n"); } ! perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLongPtr(handle, GWLP_USERDATA); if( ValidUserData(perlud) ) { if(items == 1) { *************** *** 243,247 **** CROAK("Usage: Max(handle, [value]);\n"); } ! perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLong(handle, GWL_USERDATA); if( ValidUserData(perlud) ) { if(items == 1) { --- 243,247 ---- CROAK("Usage: Max(handle, [value]);\n"); } ! perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLongPtr(handle, GWLP_USERDATA); if( ValidUserData(perlud) ) { if(items == 1) { *************** *** 270,274 **** CROAK("Usage: Horizontal(handle, [value]);\n"); } ! perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLong(handle, GWL_USERDATA); if( ValidUserData(perlud) ) { if(items == 1) { --- 270,274 ---- CROAK("Usage: Horizontal(handle, [value]);\n"); } ! perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLongPtr(handle, GWLP_USERDATA); if( ValidUserData(perlud) ) { if(items == 1) { *************** *** 276,280 **** } else { SwitchBit(perlud->dwPlStyle, PERLWIN32GUI_HORIZONTAL, SvIV(ST(1))); ! SetWindowLong(handle, GWL_USERDATA, (LONG) perlud); XSRETURN_YES; } --- 276,280 ---- } else { SwitchBit(perlud->dwPlStyle, PERLWIN32GUI_HORIZONTAL, SvIV(ST(1))); ! SetWindowLongPtr(handle, GWLP_USERDATA, (IV) perlud); XSRETURN_YES; } *************** *** 297,301 **** CROAK("Usage: Vertical(handle, [value]);\n"); } ! perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLong(handle, GWL_USERDATA); if( ValidUserData(perlud) ) { if(items == 1) { --- 297,301 ---- CROAK("Usage: Vertical(handle, [value]);\n"); } ! perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLongPtr(handle, GWLP_USERDATA); if( ValidUserData(perlud) ) { if(items == 1) { *************** *** 303,307 **** } else { SwitchBit(perlud->dwPlStyle, PERLWIN32GUI_HORIZONTAL, !SvIV(ST(1))); ! SetWindowLong(handle, GWL_USERDATA, (LONG) perlud); XSRETURN_YES; } --- 303,307 ---- } else { SwitchBit(perlud->dwPlStyle, PERLWIN32GUI_HORIZONTAL, !SvIV(ST(1))); ! SetWindowLongPtr(handle, GWLP_USERDATA, (IV) perlud); XSRETURN_YES; } Index: TreeView.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/TreeView.xs,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** TreeView.xs 31 Jan 2008 00:36:11 -0000 1.10 --- TreeView.xs 8 Apr 2010 21:26:48 -0000 1.11 *************** *** 107,111 **** pItem = &((TV_DISPINFO*)lParam)->item; PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_CONTROL6, "BeginLabelEdit", ! PERLWIN32GUI_ARGTYPE_LONG, (LONG) pItem->hItem, -1); --- 107,111 ---- pItem = &((TV_DISPINFO*)lParam)->item; PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_CONTROL6, "BeginLabelEdit", ! PERLWIN32GUI_ARGTYPE_LONG, (IV) pItem->hItem, -1); *************** *** 128,132 **** if ( pItem->pszText != NULL) { PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_CONTROL7, "EndLabelEdit", ! PERLWIN32GUI_ARGTYPE_LONG, (LONG) pItem->hItem,PERLWIN32GUI_ARGTYPE_STRING,pItem->pszText, -1); } --- 128,132 ---- if ( pItem->pszText != NULL) { PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_CONTROL7, "EndLabelEdit", ! PERLWIN32GUI_ARGTYPE_LONG, (IV) pItem->hItem,PERLWIN32GUI_ARGTYPE_STRING,pItem->pszText, -1); } *************** *** 134,138 **** //user has canceled the edit PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_CONTROL7, "EndLabelEdit", ! PERLWIN32GUI_ARGTYPE_LONG, (LONG) pItem->hItem, -1); } --- 134,138 ---- //user has canceled the edit PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_CONTROL7, "EndLabelEdit", ! PERLWIN32GUI_ARGTYPE_LONG, (IV) pItem->hItem, -1); } *************** *** 147,151 **** */ PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_CONTROL1, "NodeClick", ! PERLWIN32GUI_ARGTYPE_LONG, (LONG) tv_notify->itemNew.hItem, -1); break; --- 147,151 ---- */ PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_CONTROL1, "NodeClick", ! PERLWIN32GUI_ARGTYPE_LONG, (IV) tv_notify->itemNew.hItem, -1); break; *************** *** 159,163 **** */ PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_CONTROL2, "Collapse", ! PERLWIN32GUI_ARGTYPE_LONG, (LONG) tv_notify->itemNew.hItem, -1); } else { --- 159,163 ---- */ PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_CONTROL2, "Collapse", ! PERLWIN32GUI_ARGTYPE_LONG, (IV) tv_notify->itemNew.hItem, -1); } else { *************** *** 168,172 **** */ PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_CONTROL3, "Expand", ! PERLWIN32GUI_ARGTYPE_LONG, (LONG) tv_notify->itemNew.hItem, -1); } --- 168,172 ---- */ PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_CONTROL3, "Expand", ! PERLWIN32GUI_ARGTYPE_LONG, (IV) tv_notify->itemNew.hItem, -1); } *************** *** 185,189 **** */ PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_CONTROL4, "Collapsing", ! PERLWIN32GUI_ARGTYPE_LONG, (LONG) tv_notify->itemNew.hItem, -1); } else { --- 185,189 ---- */ PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_CONTROL4, "Collapsing", ! PERLWIN32GUI_ARGTYPE_LONG, (IV) tv_notify->itemNew.hItem, -1); } else { *************** *** 197,201 **** */ PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_CONTROL5, "Expanding", ! PERLWIN32GUI_ARGTYPE_LONG, (LONG) tv_notify->itemNew.hItem, -1); } --- 197,201 ---- */ PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_CONTROL5, "Expanding", ! PERLWIN32GUI_ARGTYPE_LONG, (IV) tv_notify->itemNew.hItem, -1); } *************** *** 479,483 **** XST_mIV(7, tv_item.cChildren); XST_mPV(8, "-parent"); ! XST_mIV(9, (long) TreeView_GetParent(handle, item)); XST_mPV(10, "-state"); XST_mIV(11, tv_item.state); --- 479,483 ---- XST_mIV(7, tv_item.cChildren); XST_mPV(8, "-parent"); ! XST_mIV(9, (IV) TreeView_GetParent(handle, item)); XST_mPV(10, "-state"); XST_mIV(11, tv_item.state); *************** *** 735,743 **** if(GIMME == G_ARRAY) { EXTEND(SP, 2); ! XST_mIV(0, (long) ht.hItem); XST_mIV(1, ht.flags); XSRETURN(2); } else { ! XSRETURN_IV((long) ht.hItem); } --- 735,743 ---- if(GIMME == G_ARRAY) { EXTEND(SP, 2); ! XST_mIV(0, (IV) ht.hItem); XST_mIV(1, ht.flags); XSRETURN(2); } else { ! XSRETURN_IV((IV) ht.hItem); } *************** *** 974,978 **** PREINIT: int i, next_i, imageSeen, selectedImageSeen; ! unsigned int tlen; TV_ITEM Item; char * option; --- 974,978 ---- PREINIT: int i, next_i, imageSeen, selectedImageSeen; ! STRLEN tlen; TV_ITEM Item; char * option; Index: Window.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Window.xs,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Window.xs 16 Mar 2006 21:11:12 -0000 1.12 --- Window.xs 8 Apr 2010 21:26:48 -0000 1.13 *************** *** 80,84 **** || strcmp(option, "-acceleratortable") == 0) { perlcs->hAcc = (HACCEL) handle_From(NOTXSCALL value); ! storing = newSViv((LONG) handle_From(NOTXSCALL value)); stored = hv_store_mg(NOTXSCALL perlcs->hvSelf, "-accel", 6, storing, 0); } else if(strcmp(option, "-hasmaximize") == 0 --- 80,84 ---- || strcmp(option, "-acceleratortable") == 0) { perlcs->hAcc = (HACCEL) handle_From(NOTXSCALL value); ! storing = newSViv((IV) handle_From(NOTXSCALL value)); stored = hv_store_mg(NOTXSCALL perlcs->hvSelf, "-accel", 6, storing, 0); } else if(strcmp(option, "-hasmaximize") == 0 Index: ListView.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/ListView.xs,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** ListView.xs 13 Jan 2008 11:42:57 -0000 1.15 --- ListView.xs 8 Apr 2010 21:26:48 -0000 1.16 *************** *** 10,14 **** #include "GUI.h" ! void ListView_onPreCreate(NOTXSPROC LPPERLWIN32GUI_CREATESTRUCT perlcs) { --- 10,14 ---- #include "GUI.h" ! void ListView_onPreCreate(NOTXSPROC LPPERLWIN32GUI_CREATESTRUCT perlcs) { *************** *** 35,42 **** } else if(strcmp(option, "-imagelist") == 0) { perlcs->hImageList = (HIMAGELIST) handle_From(NOTXSCALL value); ! } else if BitmaskOptionValue("-report", perlcs->cs.style, LVS_REPORT) } else if BitmaskOptionValue("-list", perlcs->cs.style, LVS_LIST) ! } else if BitmaskOptionValue("-singlesel", perlcs->cs.style, LVS_SINGLESEL) } else if BitmaskOptionValue("-showselalways", perlcs->cs.style, LVS_SHOWSELALWAYS) } else if BitmaskOptionValue("-sortascending", perlcs->cs.style, LVS_SORTASCENDING) --- 35,42 ---- } else if(strcmp(option, "-imagelist") == 0) { perlcs->hImageList = (HIMAGELIST) handle_From(NOTXSCALL value); ! } else if BitmaskOptionValue("-report", perlcs->cs.style, LVS_REPORT) } else if BitmaskOptionValue("-list", perlcs->cs.style, LVS_LIST) ! } else if BitmaskOptionValue("-singlesel", perlcs->cs.style, LVS_SINGLESEL) } else if BitmaskOptionValue("-showselalways", perlcs->cs.style, LVS_SHOWSELALWAYS) } else if BitmaskOptionValue("-sortascending", perlcs->cs.style, LVS_SORTASCENDING) *************** *** 82,86 **** if(perlcs->clrBackground != CLR_INVALID) { SendMessage((HWND)myhandle, LVM_SETBKCOLOR, (WPARAM) 0, (LPARAM) perlcs->clrBackground); ! perlcs->clrBackground = CLR_INVALID; // Don't store } } --- 82,86 ---- if(perlcs->clrBackground != CLR_INVALID) { SendMessage((HWND)myhandle, LVM_SETBKCOLOR, (WPARAM) 0, (LPARAM) perlcs->clrBackground); ! perlcs->clrBackground = CLR_INVALID; // Don't store } } *************** *** 122,129 **** /* * (@)EVENT:BeginDrag(ITEM) ! * Notifies a list-view control that a drag-and-drop operation involving the left mouse * button is being initiated. Passes the item being dragged. * (@)APPLIES_TO:ListView ! */ PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_CONTROL8, "BeginDrag", PERLWIN32GUI_ARGTYPE_LONG, (LONG) lv_notify->iItem,-1); --- 122,129 ---- /* * (@)EVENT:BeginDrag(ITEM) ! * Notifies a list-view control that a drag-and-drop operation involving the left mouse * button is being initiated. Passes the item being dragged. * (@)APPLIES_TO:ListView ! */ PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_CONTROL8, "BeginDrag", PERLWIN32GUI_ARGTYPE_LONG, (LONG) lv_notify->iItem,-1); *************** *** 138,142 **** * CHANGED specifies the item attributes that have changed (LVIF_). * (@)APPLIES_TO:ListView ! */ case LVN_ITEMCHANGING: --- 138,142 ---- * CHANGED specifies the item attributes that have changed (LVIF_). * (@)APPLIES_TO:ListView ! */ case LVN_ITEMCHANGING: *************** *** 156,160 **** break; ! /* * (@)EVENT:ItemChanged(ITEM, NEWSTATE, OLDSTATE, CHANGED) --- 156,160 ---- break; ! /* * (@)EVENT:ItemChanged(ITEM, NEWSTATE, OLDSTATE, CHANGED) *************** *** 205,209 **** // TODO : LVN_DELETEITEM : // TODO : LVN_ITEMACTIVATE ! case LVN_COLUMNCLICK: /* --- 205,209 ---- // TODO : LVN_DELETEITEM : // TODO : LVN_ITEMACTIVATE ! case LVN_COLUMNCLICK: /* *************** *** 227,231 **** * For a ListView to receive this event, -editlabels need to be set to true. * (@)APPLIES_TO:ListView ! */ case LVN_BEGINLABELEDIT: --- 227,231 ---- * For a ListView to receive this event, -editlabels need to be set to true. * (@)APPLIES_TO:ListView ! */ case LVN_BEGINLABELEDIT: *************** *** 242,255 **** break; ! /* * (@)EVENT:EndLabelEdit(ITEM,TEXT) * Sent when the user has finished editing a label in the ListView control. ! * You have explicitly set the text of the item to reflect the new changes. * If the user cancels the edit, the text is undef. * (@)APPLIES_TO:ListView */ ! case LVN_ENDLABELEDIT: pItem = &((LV_DISPINFO*)lParam)->item; --- 242,255 ---- break; ! /* * (@)EVENT:EndLabelEdit(ITEM,TEXT) * Sent when the user has finished editing a label in the ListView control. ! * You have explicitly set the text of the item to reflect the new changes. * If the user cancels the edit, the text is undef. * (@)APPLIES_TO:ListView */ ! case LVN_ENDLABELEDIT: pItem = &((LV_DISPINFO*)lParam)->item; *************** *** 264,270 **** PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_CONTROL7, "EndLabelEdit", PERLWIN32GUI_ARGTYPE_LONG, (LONG) pItem->iItem, ! -1); } ! break; --- 264,270 ---- PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_CONTROL7, "EndLabelEdit", PERLWIN32GUI_ARGTYPE_LONG, (LONG) pItem->iItem, ! -1); } ! break; *************** *** 316,323 **** # (@)METHOD:Arrange([FLAG]) # ! # LVA_ALIGNLEFT = Aligns items along the left edge of the window. ! # LVA_ALIGNTOP = Aligns items along the top edge of the window. ! # LVA_DEFAULT = Aligns items according to the ListView's current alignment styles (the default value). ! # LVA_SNAPTOGRID = Snaps all icons to the nearest grid position. int --- 316,323 ---- # (@)METHOD:Arrange([FLAG]) # ! # LVA_ALIGNLEFT = Aligns items along the left edge of the window. ! # LVA_ALIGNTOP = Aligns items along the top edge of the window. ! # LVA_DEFAULT = Aligns items according to the ListView's current alignment styles (the default value). ! # LVA_SNAPTOGRID = Snaps all icons to the nearest grid position. int *************** *** 332,336 **** ########################################################################### # (@)METHOD:CreateDragImage(index, xcor, ycor) ! # Creates a transparent version of an item image. The xcor and yxcor are the # initial location of the upper-left corner of the image. HIMAGELIST --- 332,336 ---- ########################################################################### # (@)METHOD:CreateDragImage(index, xcor, ycor) ! # Creates a transparent version of an item image. The xcor and yxcor are the # initial location of the upper-left corner of the image. HIMAGELIST *************** *** 348,352 **** OUTPUT: RETVAL ! ########################################################################### # (@)METHOD:DeleteAllItems() --- 348,352 ---- OUTPUT: RETVAL ! ########################################################################### # (@)METHOD:DeleteAllItems() *************** *** 411,415 **** OUTPUT: RETVAL ! ########################################################################### # (@)METHOD:FindItem(FROM, %OPTIONS) --- 411,415 ---- OUTPUT: RETVAL ! ########################################################################### # (@)METHOD:FindItem(FROM, %OPTIONS) *************** *** 511,515 **** ########################################################################### # (@)METHOD:GetCheckState(INDEX) ! # Determines if an item in a ListView is selected. BOOL GetCheckState(handle,index) --- 511,515 ---- ########################################################################### # (@)METHOD:GetCheckState(INDEX) ! # Determines if an item in a ListView is selected. BOOL GetCheckState(handle,index) *************** *** 604,608 **** # (@)METHOD:VisibleCount() # (@)METHOD:GetCountPerPage() ! # Calculates the number of items that can fit vertically in the visible area of a ListView when in list or report view. int GetCountPerPage(handle) --- 604,608 ---- # (@)METHOD:VisibleCount() # (@)METHOD:GetCountPerPage() ! # Calculates the number of items that can fit vertically in the visible area of a ListView when in list or report view. int GetCountPerPage(handle) *************** *** 617,621 **** ########################################################################### # (@)METHOD:GetEditControl() ! # Retrieves the handle to the edit control being used to edit a list view item's text. HWND GetEditControl(handle) --- 617,621 ---- ########################################################################### # (@)METHOD:GetEditControl() ! # Retrieves the handle to the edit control being used to edit a list view item's text. HWND GetEditControl(handle) *************** *** 661,665 **** ########################################################################### # (@)METHOD:GetHotItem() ! # Retrieves the index of the hot item. int GetHotItem(handle) --- 661,665 ---- ########################################################################### # (@)METHOD:GetHotItem() ! # Retrieves the index of the hot item. int GetHotItem(handle) *************** *** 684,691 **** # (@)METHOD:GetImageList([TYPE=LVSIL_NORMAL]) # Retrieves the handle to an image list used for drawing list view items. ! # Type : ! # LVSIL_NORMAL Image list with large icons. ! # LVSIL_SMALL Image list with small icons. ! # LVSIL_STATE Image list with state images. HIMAGELIST GetImageList(handle,type=LVSIL_NORMAL) --- 684,691 ---- # (@)METHOD:GetImageList([TYPE=LVSIL_NORMAL]) # Retrieves the handle to an image list used for drawing list view items. ! # Type : ! # LVSIL_NORMAL Image list with large icons. ! # LVSIL_SMALL Image list with small icons. ! # LVSIL_STATE Image list with state images. HIMAGELIST GetImageList(handle,type=LVSIL_NORMAL) *************** *** 699,704 **** ########################################################################### # (@)METHOD:GetISearchString(STRING) ! # Retrieves the incremental search string of a ListView. ! BOOL GetISearchString(handle,lpsz) HWND handle --- 699,704 ---- ########################################################################### # (@)METHOD:GetISearchString(STRING) ! # Retrieves the incremental search string of a ListView. ! BOOL GetISearchString(handle,lpsz) HWND handle *************** *** 881,885 **** ########################################################################### # (@)METHOD:GetNumberOfWorkAreas() ! # Retrieves the number of working areas in a ListView. UINT GetNumberOfWorkAreas(handle,index,mask=LVNI_ALL) --- 881,885 ---- ########################################################################### # (@)METHOD:GetNumberOfWorkAreas() ! # Retrieves the number of working areas in a ListView. UINT GetNumberOfWorkAreas(handle,index,mask=LVNI_ALL) *************** *** 941,945 **** # (@)METHOD:GetStringWidth(STRING) # Determines the width of a specified string using the specified ListView's ! # current font. int GetStringWidth(handle,string) --- 941,945 ---- # (@)METHOD:GetStringWidth(STRING) # Determines the width of a specified string using the specified ListView's ! # current font. int GetStringWidth(handle,string) *************** *** 999,1003 **** ########################################################################### # (@)METHOD:GetToolTips() ! # Retrieves the tooltip control that the ListView uses to display tooltips. HWND GetToolTips(handle) --- 999,1003 ---- ########################################################################### # (@)METHOD:GetToolTips() ! # Retrieves the tooltip control that the ListView uses to display tooltips. HWND GetToolTips(handle) *************** *** 1015,1019 **** HWND handle ALIAS: ! Win32::GUI::ListView::GetFirstVisible = 1 CODE: RETVAL = ListView_GetTopIndex(handle); --- 1015,1019 ---- HWND handle ALIAS: ! Win32::GUI::ListView::GetFirstVisible = 1 CODE: RETVAL = ListView_GetTopIndex(handle); *************** *** 1023,1027 **** ########################################################################### # (@)METHOD:GetUnicodeFormat() ! # Retrieves the UNICODE character format flag for the control. BOOL GetUnicodeFormat(handle) --- 1023,1027 ---- ########################################################################### # (@)METHOD:GetUnicodeFormat() ! # Retrieves the UNICODE character format flag for the control. BOOL GetUnicodeFormat(handle) *************** *** 1140,1144 **** PREINIT: LV_ITEM Item; ! unsigned int tlen; int i, next_i; char * option; --- 1140,1144 ---- PREINIT: LV_ITEM Item; ! STRLEN tlen; int i, next_i; char * option; *************** *** 1250,1254 **** # B<%OPTIONS> : # -url => STRING ! # URL of the background image. # -tiled => 0/1 # The background image will be tiled to fill the entire background. --- 1250,1254 ---- # B<%OPTIONS> : # -url => STRING ! # URL of the background image. # -tiled => 0/1 # The background image will be tiled to fill the entire background. *************** *** 1262,1266 **** PREINIT: LVBKIMAGE BkImage; ! unsigned int tlen; int i, next_i; char * option; --- 1262,1266 ---- PREINIT: LVBKIMAGE BkImage; ! STRLEN tlen; int i, next_i; char * option; *************** *** 1293,1297 **** OUTPUT: RETVAL ! ########################################################################### # (@)METHOD:SetCallbackMask(MASK) --- 1293,1297 ---- OUTPUT: RETVAL ! ########################################################################### # (@)METHOD:SetCallbackMask(MASK) *************** *** 1309,1313 **** # (@)METHOD:SetColumn(COLUMN, %OPTIONS) # Change column option in a ListView. ! # # B<%OPTIONS> : See InsertColumn() int --- 1309,1313 ---- # (@)METHOD:SetColumn(COLUMN, %OPTIONS) # Change column option in a ListView. ! # # B<%OPTIONS> : See InsertColumn() int *************** *** 1359,1363 **** ########################################################################### # (@)METHOD:SetExtendedListViewStyle(EXSTYLE) ! # Sets extended styles for ListViews. void SetExtendedListViewStyle(handle,exstyle) --- 1359,1363 ---- ########################################################################### # (@)METHOD:SetExtendedListViewStyle(EXSTYLE) ! # Sets extended styles for ListViews. void SetExtendedListViewStyle(handle,exstyle) *************** *** 1416,1420 **** ########################################################################### # (@)METHOD:SetIconSpacing(X,Y) ! # Sets the spacing between icons in ListView set to the LVS_ICON style. DWORD SetIconSpacing(handle,x,y) --- 1416,1420 ---- ########################################################################### # (@)METHOD:SetIconSpacing(X,Y) ! # Sets the spacing between icons in ListView set to the LVS_ICON style. DWORD SetIconSpacing(handle,x,y) *************** *** 1431,1435 **** # Assigns an image list to a ListView. # ! #Type of image list. This parameter can be one of the following values: # # LVSIL_NORMAL (0) Image list with large icons. --- 1431,1435 ---- # Assigns an image list to a ListView. # ! #Type of image list. This parameter can be one of the following values: # # LVSIL_NORMAL (0) Image list with large icons. *************** *** 1460,1464 **** PREINIT: LV_ITEM Item; ! unsigned int tlen; int i, next_i; char * option; --- 1460,1464 ---- PREINIT: LV_ITEM Item; ! STRLEN tlen; int i, next_i; char * option; *************** *** 1518,1522 **** # (@)METHOD:SetItemPosition(INDEX, X, Y) # (@)METHOD:MoveItem(INDEX, X, Y) ! # Moves an item to a specified position in a ListView (in icon or small icon view). # X,Y are in listview co-ordinates. void --- 1518,1522 ---- # (@)METHOD:SetItemPosition(INDEX, X, Y) # (@)METHOD:MoveItem(INDEX, X, Y) ! # Moves an item to a specified position in a ListView (in icon or small icon view). # X,Y are in listview co-ordinates. void *************** *** 1539,1543 **** UINT index UINT state ! UINT mask CODE: ListView_SetItemState(handle, index, state, mask); --- 1539,1543 ---- UINT index UINT state ! UINT mask CODE: ListView_SetItemState(handle, index, state, mask); *************** *** 1551,1555 **** UINT index LPTSTR texte ! UINT subitem CODE: ListView_SetItemText(handle, index, subitem, texte); --- 1551,1555 ---- UINT index LPTSTR texte ! UINT subitem CODE: ListView_SetItemText(handle, index, subitem, texte); *************** *** 1557,1561 **** ########################################################################### # (@)METHOD:SetSelectionMark(index) ! # Sets the selection mark in a ListView. int SetSelectionMark(handle,index) --- 1557,1561 ---- ########################################################################### # (@)METHOD:SetSelectionMark(index) ! # Sets the selection mark in a ListView. int SetSelectionMark(handle,index) *************** *** 1569,1573 **** ########################################################################### # (@)METHOD:SetTextBkColor(COLOR) ! # Sets the background color of text in a ListView. BOOL Set... [truncated message content] |
|
From: jw <jw...@us...> - 2010-04-08 21:26:56
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Scintilla In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv24291/Win32-GUI-Scintilla Modified Files: Scintilla.xs Log Message: Initial change to build with a 64bit compiler Index: Scintilla.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Scintilla/Scintilla.xs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Scintilla.xs 31 Jan 2008 00:34:19 -0000 1.4 --- Scintilla.xs 8 Apr 2010 21:26:48 -0000 1.5 *************** *** 197,201 **** if (memcmp (Name, "Scintilla", 9) == 0) { ! LPPERLWIN32GUI_USERDATA perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLong(lpnmhdr->hwndFrom, GWL_USERDATA); if (perlud != NULL) --- 197,201 ---- if (memcmp (Name, "Scintilla", 9) == 0) { ! LPPERLWIN32GUI_USERDATA perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLongPtr (lpnmhdr->hwndFrom, GWLP_USERDATA); if (perlud != NULL) *************** *** 223,227 **** { // Perl contexte ! LPPERLWIN32GUI_USERDATA perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLong((HWND) msg->lParam, GWL_USERDATA); if (perlud != NULL) { --- 223,227 ---- { // Perl contexte ! LPPERLWIN32GUI_USERDATA perlud = (LPPERLWIN32GUI_USERDATA) GetWindowLongPtr((HWND) msg->lParam, GWLP_USERDATA); if (perlud != NULL) { |
|
From: jw <jw...@us...> - 2010-04-08 21:25:39
|
Update of /cvsroot/perl-win32-gui/Win32-GUI In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv24112 Modified Files: Textfield.xs Log Message: Initial change to build with a 64bit compiler Index: Textfield.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Textfield.xs,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Textfield.xs 20 Jan 2007 17:09:22 -0000 1.9 --- Textfield.xs 8 Apr 2010 21:25:29 -0000 1.10 *************** *** 11,15 **** ! void Textfield_onPreCreate(NOTXSPROC LPPERLWIN32GUI_CREATESTRUCT perlcs) { --- 11,15 ---- ! void Textfield_onPreCreate(NOTXSPROC LPPERLWIN32GUI_CREATESTRUCT perlcs) { *************** *** 22,26 **** Textfield_onParseOption(NOTXSPROC char *option, SV* value, LPPERLWIN32GUI_CREATESTRUCT perlcs) { BOOL retval; ! if(strcmp(option, "-align") == 0) { if(strcmp(SvPV_nolen(value), "left") == 0) { --- 22,26 ---- Textfield_onParseOption(NOTXSPROC char *option, SV* value, LPPERLWIN32GUI_CREATESTRUCT perlcs) { BOOL retval; ! if(strcmp(option, "-align") == 0) { if(strcmp(SvPV_nolen(value), "left") == 0) { *************** *** 158,162 **** ########################################################################### # (@)PACKAGE:Win32::GUI::Textfield ! ########################################################################### */ --- 158,162 ---- ########################################################################### # (@)PACKAGE:Win32::GUI::Textfield ! ########################################################################### */ *************** *** 206,210 **** ########################################################################### # (@)METHOD:EmptyUndoBuffer() ! # Reset the undo flag of an Textfield. LRESULT EmptyUndoBuffer(handle) --- 206,210 ---- ########################################################################### # (@)METHOD:EmptyUndoBuffer() ! # Reset the undo flag of an Textfield. LRESULT EmptyUndoBuffer(handle) *************** *** 221,225 **** # Set the inclusion flag of soft line break characters on or off within a multiline TextField. # A soft line break consists of two carriage returns and a linefeed and is inserted at the end of a line that is broken because of word wrapping. ! LRESULT FmtLines(handle, value) --- 221,225 ---- # Set the inclusion flag of soft line break characters on or off within a multiline TextField. # A soft line break consists of two carriage returns and a linefeed and is inserted at the end of a line that is broken because of word wrapping. ! LRESULT FmtLines(handle, value) *************** *** 329,333 **** # (@)METHOD:GetLineCount() # Return the number of lines in a multiline Textfield. ! LRESULT GetLineCount(handle) --- 329,333 ---- # (@)METHOD:GetLineCount() # Return the number of lines in a multiline Textfield. ! LRESULT GetLineCount(handle) *************** *** 342,346 **** ########################################################################### # (@)METHOD:GetMargins() ! # Return an array with right and left margins. void GetMargins(handle) --- 342,346 ---- ########################################################################### # (@)METHOD:GetMargins() ! # Return an array with right and left margins. void GetMargins(handle) *************** *** 360,364 **** # (@)METHOD:GetModify() # Determine whether the content of a Textfield has been modified. ! LRESULT GetModify(handle) --- 360,364 ---- # (@)METHOD:GetModify() # Determine whether the content of a Textfield has been modified. ! LRESULT GetModify(handle) *************** *** 374,378 **** # (@)METHOD:GetPasswordChar() # Return the password character displayed . ! LRESULT GetPasswordChar(handle) --- 374,378 ---- # (@)METHOD:GetPasswordChar() # Return the password character displayed . ! LRESULT GetPasswordChar(handle) *************** *** 386,390 **** # (@)METHOD:GetRect() # Return formatting rectangle is the limiting rectangle of the text. ! void GetRect(handle) --- 386,390 ---- # (@)METHOD:GetRect() # Return formatting rectangle is the limiting rectangle of the text. ! void GetRect(handle) *************** *** 408,412 **** # Returns a 2 item list giving the index of the start and end of the current # selection ! void GetSel(handle) --- 408,412 ---- # Returns a 2 item list giving the index of the start and end of the current # selection ! void GetSel(handle) *************** *** 427,431 **** # (@)METHOD:GetThumb() # Return the position of the scroll box (thumb) in a multiline Textfield. ! LRESULT GetThumb(handle) --- 427,431 ---- # (@)METHOD:GetThumb() # Return the position of the scroll box (thumb) in a multiline Textfield. ! LRESULT GetThumb(handle) *************** *** 438,442 **** RETVAL ! # TODO : EM_GETWORDBREAKPROC # EM_LIMITTEXT = EM_SETLIMITTEXT --- 438,442 ---- RETVAL ! # TODO : EM_GETWORDBREAKPROC # EM_LIMITTEXT = EM_SETLIMITTEXT *************** *** 809,813 **** OUTPUT: RETVAL ! ########################################################################### --- 809,813 ---- OUTPUT: RETVAL ! ########################################################################### *************** *** 820,824 **** RETVAL = SendMessage(handle, EM_SETREADONLY, (WPARAM) (BOOL) SvIV(ST(1)), 0); else ! RETVAL = (GetWindowLong(handle, GWL_STYLE) & ES_READONLY); OUTPUT: RETVAL --- 820,824 ---- RETVAL = SendMessage(handle, EM_SETREADONLY, (WPARAM) (BOOL) SvIV(ST(1)), 0); else ! RETVAL = (GetWindowLongPtr(handle, GWL_STYLE) & ES_READONLY); OUTPUT: RETVAL |
|
From: jw <jw...@us...> - 2010-02-22 16:24:41
|
Update of /cvsroot/perl-win32-gui/Win32-GUI In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv25161 Modified Files: CHANGELOG DC.xs Makefile.PL Log Message: Added methods GradientFillTriangle and GradientFillRectangle to DC.xs Index: CHANGELOG =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/CHANGELOG,v retrieving revision 1.147 retrieving revision 1.148 diff -C2 -d -r1.147 -r1.148 *** CHANGELOG 20 Feb 2010 12:22:27 -0000 1.147 --- CHANGELOG 22 Feb 2010 16:24:32 -0000 1.148 *************** *** 6,9 **** --- 6,14 ---- Win32-GUI ChangeLog =================== + + [Jeremy White] : 22 February 2010 - Added methods to DC.xs + - DC.xs - added GradientFillTriangle and GradientFillRectangle + - Makefile.PL - added lib lmsimg32 + - GradientFill.pl - added sample showing how to use new methods + + [Jeremy White] : 20 February 2010 - Bug fix - GUI_Helpers.cpp fix of bug #1941264 causing crash with menus Index: Makefile.PL =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Makefile.PL,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** Makefile.PL 8 Feb 2008 18:02:05 -0000 1.31 --- Makefile.PL 22 Feb 2010 16:24:32 -0000 1.32 *************** *** 229,233 **** NAME => 'Win32::GUI', VERSION_FROM => 'GUI.pm', ! LIBS => [':nosearch -lcomctl32 -lcomdlg32 -lshell32 -lgdi32 -luser32 -lversion'], PREREQ_PM => { 'Test::More' => 0, --- 229,233 ---- NAME => 'Win32::GUI', VERSION_FROM => 'GUI.pm', ! LIBS => [':nosearch -lcomctl32 -lcomdlg32 -lshell32 -lgdi32 -luser32 -lversion -lmsimg32'], PREREQ_PM => { 'Test::More' => 0, *************** *** 270,274 **** if ($main::BUILDENV eq "cygwin") { ! $MakefileArgs{'LIBS'} = ['-L/usr/lib/w32api -lcomctl32 -lcomdlg32 -lshell32 -lgdi32 -luser32 -lversion']; $MakefileArgs{'DEFINE'} = '-UWIN32'; $MakefileArgs{'MYEXTLIB'} = './libcyg.a'; --- 270,274 ---- if ($main::BUILDENV eq "cygwin") { ! $MakefileArgs{'LIBS'} = ['-L/usr/lib/w32api -lcomctl32 -lcomdlg32 -lshell32 -lgdi32 -luser32 -lversion -lmsimg32']; $MakefileArgs{'DEFINE'} = '-UWIN32'; $MakefileArgs{'MYEXTLIB'} = './libcyg.a'; Index: DC.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/DC.xs,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** DC.xs 15 Jul 2007 18:39:51 -0000 1.18 --- DC.xs 22 Feb 2010 16:24:32 -0000 1.19 *************** *** 1260,1264 **** --- 1260,1358 ---- OUTPUT: RETVAL + + ########################################################################### + # (@)METHOD:GradientFillTriangle(X0, Y0, COLOR0, X1, Y1, COLOR1, X2, Y2, COLOR2) + # Fills the area of the triangle using smooth shading from color0 at point + # zero through to the other points. + # + + BOOL + GradientFillTriangle(handle, x0, y0, color0, x1, y1, color1, x2, y2, color2) + HDC handle + int x0 + int y0 + COLORREF color0 + int x1 + int y1 + COLORREF color1 + int x2 + int y2 + COLORREF color2 + CODE: + TRIVERTEX vertex[3]; + vertex[0].x = x0; + vertex[0].y = y0; + vertex[0].Red = (COLOR16) (GetRValue(color0) << 8);; + vertex[0].Green = (COLOR16) (GetGValue(color0) << 8);; + vertex[0].Blue = (COLOR16) (GetBValue(color0) << 8);; + vertex[0].Alpha = 0x0000; + + vertex[1].x = x1; + vertex[1].y = y1; + vertex[1].Red = (COLOR16) (GetRValue(color1) << 8);; + vertex[1].Green = (COLOR16) (GetGValue(color1) << 8);; + vertex[1].Blue = (COLOR16) (GetBValue(color1) << 8);; + vertex[1].Alpha = 0x0000; + + vertex[2].x = x2; + vertex[2].y = y2; + vertex[2].Red = (COLOR16) (GetRValue(color2) << 8);; + vertex[2].Green = (COLOR16) (GetGValue(color2) << 8);; + vertex[2].Blue = (COLOR16) (GetBValue(color2) << 8);; + vertex[2].Alpha = 0x0000; + + GRADIENT_TRIANGLE gTriangle; + gTriangle.Vertex1 = 0; + gTriangle.Vertex2 = 1; + gTriangle.Vertex3 = 2; + + RETVAL = GradientFill(handle, vertex, 3, &gTriangle, 1, GRADIENT_FILL_TRIANGLE); + OUTPUT: + RETVAL + + ########################################################################### + # (@)METHOD:GradientFillRectangle(X0, Y0, COLOR0, X1, Y1, COLOR1, X2, Y2, COLOR2,DIRECTION) + # Fills the area of the Rectangle using smooth shading from color0 to color1. + # As a default the smoothing will be horizontal, to specify vertical smoothing pass any + # value as the final parameter. + # + BOOL + GradientFillRectangle(handle, x0, y0, x1, y1, color0,color1,direction=GRADIENT_FILL_RECT_H) + HDC handle + int x0 + int y0 + int x1 + int y1 + COLORREF color0 + COLORREF color1 + int direction + CODE: + if (direction!=GRADIENT_FILL_RECT_H) { + direction = GRADIENT_FILL_RECT_V; + } + TRIVERTEX vertex[2] ; + vertex[0].x = x0; + vertex[0].y = y0; + vertex[0].Red = (COLOR16) (GetRValue(color0) << 8); + vertex[0].Green = (COLOR16) (GetGValue(color0) << 8); + vertex[0].Blue = (COLOR16) (GetBValue(color0) << 8); + vertex[0].Alpha = 0x0000; + + vertex[1].x = x1; + vertex[1].y = x1; + vertex[1].Red = (COLOR16) (GetRValue(color1) << 8); + vertex[1].Green = (COLOR16) (GetGValue(color1) << 8); + vertex[1].Blue = (COLOR16) (GetBValue(color1) << 8); + vertex[1].Alpha = 0x0000; + + GRADIENT_RECT gRect; + gRect.UpperLeft = 0; + gRect.LowerRight = 1; + + RETVAL = GradientFill(handle, vertex, 2, &gRect, 1, direction); + OUTPUT: + RETVAL + ########################################################################### # (@)METHOD:GetPixel(X, Y) |
|
From: jw <jw...@us...> - 2010-02-22 16:24:40
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/samples In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv25161/samples Added Files: GradientFill.pl Log Message: Added methods GradientFillTriangle and GradientFillRectangle to DC.xs --- NEW FILE: GradientFill.pl --- #!perl -w use strict; use warnings; use Win32::GUI qw(WS_CAPTION WS_SIZEBOX WS_CHILD WS_CLIPCHILDREN WS_EX_CLIENTEDGE ); #Create the window and child window. my $Win = new Win32::GUI::Window ( -pos => [100, 100], -size => [450, 450], -name => "Window", -text => "Win32::GUI Gradent Fill demo", #NEM Events for this window -onTerminate => sub {return -1;} ); #Create a child window my $ChildWin = new Win32::GUI::Window ( -parent => $Win, -name => "ChildWin", -pos => [0, 0], -size => [398, 398], -popstyle => WS_CAPTION | WS_SIZEBOX, -pushstyle => WS_CHILD | WS_CLIPCHILDREN, -pushexstyle => WS_EX_CLIENTEDGE, #NEM Events for this window -onPaint => \&Paint, ); #show both windows and enter the Dialog phase. $Win->Show(); $ChildWin->Show(); Win32::GUI::Dialog(); sub Paint { #We need to paint our window my $win = shift; #get the DC my $dc = $win->GetDC; #draw a filled triangle, with points at 0,0 (blue) 100,100 (red) and 0,100 (green). $dc->GradientFillTriangle(0,0,[0,0,255],100,100,[255,0,0],0,100,[0,255,0]); #draw a vertical filled rectangle red to blue $dc->GradientFillRectangle(100,100,300,300,[255,0,0],[0,0,255],1); #draw a horizontal filled rectable black to while $dc->GradientFillRectangle(300,300,400,400,[0,0,0],[255,255,255]); $dc->Validate; } |
|
From: jw <jw...@us...> - 2010-02-20 12:54:04
|
Update of /cvsroot/perl-win32-gui/Win32-GUI In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv27411 Modified Files: CHANGELOG GUI_Helpers.cpp Log Message: Bug fix tracker#1941264 Index: GUI_Helpers.cpp =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/GUI_Helpers.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** GUI_Helpers.cpp 8 Feb 2008 16:42:11 -0000 1.25 --- GUI_Helpers.cpp 20 Feb 2010 12:22:27 -0000 1.26 *************** *** 754,806 **** if(ValidUserData(perlud)) { PERLUD_FETCH; /* fetch context */ ! arrayref = av_fetch(perlud->avHooks, WM_TRACKPOPUP_MSGHOOK, 0); ! if(arrayref != NULL) { ! array = (AV*) SvRV(*arrayref); ! SvREFCNT_inc((SV*) array); ! for(i = 0; i <= (int) av_len(array); i++) { ! arrayval = av_fetch(array,(I32) i,0); ! if(arrayval != NULL) { ! perlsub = *arrayval; ! SvREFCNT_inc(perlsub); ! dSP; ! ENTER; ! SAVETMPS; ! PUSHMARK(SP); ! XPUSHs(perlud->svSelf); ! XPUSHs(sv_2mortal(newSViv(pmsg->message))); ! XPUSHs(sv_2mortal(newSViv(pmsg->wParam))); ! XPUSHs(sv_2mortal(newSViv(pmsg->lParam))); ! PUTBACK; ! count = call_sv(perlsub, G_ARRAY|G_EVAL); ! SPAGAIN; ! if(SvTRUE(ERRSV)) { ! ProcessEventError(NOTXSCALL "TrackPopupMenu(WindowsHookMsgProc)", &PerlResult); ! } else { ! if(count > 0) { PerlResult = POPi; } } - - PUTBACK; - FREETMPS; - LEAVE; - SvREFCNT_dec(perlsub); } ! } ! SvREFCNT_dec((SV*) array); ! // PerlResult = 0: do not pass event to rest of chain or target windows procedure ! // PerlResult = -1: as 0, and terminate application ! // PerlResult = anything else, pass event on ! if(PerlResult == 0) { ! return 1; // stops message being passed along hook chain and to target windows procedure ! } else if (PerlResult == -1) { ! //send a WM_CANCELMODE to get menu to close ! SendMessage(pmsg->hwnd, WM_CANCELMODE, 0, 0); ! //post a message to get the main loop to exit ! PostMessage(pmsg->hwnd, WM_EXITLOOP, (WPARAM) -1, 0); ! return 1; // stops message being passed along hook chain and to target windows procedure } } --- 754,811 ---- if(ValidUserData(perlud)) { PERLUD_FETCH; /* fetch context */ + + //Tracker 1941264: Check if perlud->avHooks contains NULL. This was causing + //a crash although it should not be possible that this is zero. It's likely + //a bug elsewhere...No harm in the null pointer check though. + if (perlud->avHooks != NULL) { + arrayref = av_fetch(perlud->avHooks, WM_TRACKPOPUP_MSGHOOK, 0); + if(arrayref != NULL) { + array = (AV*) SvRV(*arrayref); + SvREFCNT_inc((SV*) array); + for(i = 0; i <= (int) av_len(array); i++) { + arrayval = av_fetch(array,(I32) i,0); ! if(arrayval != NULL) { ! perlsub = *arrayval; ! SvREFCNT_inc(perlsub); ! dSP; ! ENTER; ! SAVETMPS; ! PUSHMARK(SP); ! XPUSHs(perlud->svSelf); ! XPUSHs(sv_2mortal(newSViv(pmsg->message))); ! XPUSHs(sv_2mortal(newSViv(pmsg->wParam))); ! XPUSHs(sv_2mortal(newSViv(pmsg->lParam))); ! PUTBACK; ! count = call_sv(perlsub, G_ARRAY|G_EVAL); ! SPAGAIN; ! if(SvTRUE(ERRSV)) { ! ProcessEventError(NOTXSCALL "TrackPopupMenu(WindowsHookMsgProc)", &PerlResult); ! } else { ! if(count > 0) { PerlResult = POPi; } ! } ! PUTBACK; ! FREETMPS; ! LEAVE; ! SvREFCNT_dec(perlsub); } } ! SvREFCNT_dec((SV*) array); ! // PerlResult = 0: do not pass event to rest of chain or target windows procedure ! // PerlResult = -1: as 0, and terminate application ! // PerlResult = anything else, pass event on ! if(PerlResult == 0) { ! return 1; // stops message being passed along hook chain and to target windows procedure ! } else if (PerlResult == -1) { ! //send a WM_CANCELMODE to get menu to close ! SendMessage(pmsg->hwnd, WM_CANCELMODE, 0, 0); ! //post a message to get the main loop to exit ! PostMessage(pmsg->hwnd, WM_EXITLOOP, (WPARAM) -1, 0); ! return 1; // stops message being passed along hook chain and to target windows procedure ! } } } Index: CHANGELOG =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/CHANGELOG,v retrieving revision 1.146 retrieving revision 1.147 diff -C2 -d -r1.146 -r1.147 *** CHANGELOG 13 Feb 2008 15:24:04 -0000 1.146 --- CHANGELOG 20 Feb 2010 12:22:27 -0000 1.147 *************** *** 6,9 **** --- 6,12 ---- Win32-GUI ChangeLog =================== + + [Jeremy White] : 20 February 2010 - Bug fix + - GUI_Helpers.cpp fix of bug #1941264 causing crash with menus + + [Robert May] : 13 February 2008 - 1.06 Release - Up version numbers to 1.06 |
|
From: Robert M. <rob...@us...> - 2008-02-13 15:24:01
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-ReleaseNotes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22813/Win32-GUI-ReleaseNotes Modified Files: RN_1_06.pod Log Message: Prepare for V1.06 release Index: RN_1_06.pod =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-ReleaseNotes/RN_1_06.pod,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** RN_1_06.pod 9 Feb 2008 12:53:44 -0000 1.9 --- RN_1_06.pod 13 Feb 2008 15:24:04 -0000 1.10 *************** *** 5,9 **** =head1 Release Date ! TBD =head1 Summary of Changes --- 5,9 ---- =head1 Release Date ! 13th February, 2008. =head1 Summary of Changes |
|
From: Robert M. <rob...@us...> - 2008-02-13 15:24:01
|
Update of /cvsroot/perl-win32-gui/Win32-GUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22813 Modified Files: CHANGELOG GUI.pm GUI.rc Readme Readme.html Log Message: Prepare for V1.06 release Index: Readme.html =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Readme.html,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Readme.html 1 Feb 2008 13:33:22 -0000 1.11 --- Readme.html 13 Feb 2008 15:24:04 -0000 1.12 *************** *** 5,19 **** <title>Win32::GUI::UserGuide::Readme - Perl-Win32 Graphical User Interface Extension README</title> <meta http-equiv="content-type" content="text/html; charset=utf-8" /> ! <link rev="made" href="mailto:ru...@x-..." /> </head> <body style="background-color: white"> ! <p><a name="__index__"></a></p> <!-- INDEX BEGIN --> <ul> <li><a href="#description">DESCRIPTION</a></li> <li><a href="#installing">INSTALLING</a></li> <ul> --- 5,23 ---- <title>Win32::GUI::UserGuide::Readme - Perl-Win32 Graphical User Interface Extension README</title> <meta http-equiv="content-type" content="text/html; charset=utf-8" /> ! <link rev="made" href="mailto:" /> </head> <body style="background-color: white"> ! <!-- INDEX BEGIN --> + <div name="index"> + <p><a name="__index__"></a></p> <ul> + <li><a href="#name">NAME</a></li> <li><a href="#description">DESCRIPTION</a></li> + <li><a href="#availability">AVAILABILITY</a></li> <li><a href="#installing">INSTALLING</a></li> <ul> *************** *** 43,51 **** <li><a href="#copyright_and_licence">COPYRIGHT and LICENCE</a></li> </ul> <!-- INDEX END --> - <hr /> <p> </p> <h1><a name="description">DESCRIPTION</a></h1> <p>Win32::GUI is a Win32-platform native graphical user interface toolkit for --- 47,62 ---- <li><a href="#copyright_and_licence">COPYRIGHT and LICENCE</a></li> </ul> + + <hr name="index" /> + </div> <!-- INDEX END --> <p> </p> + <h1><a name="name">NAME</a></h1> + <p>Win32::GUI::UserGuide::Readme - Perl-Win32 Graphical User Interface Extension README</p> + <p> + </p> + <hr /> <h1><a name="description">DESCRIPTION</a></h1> <p>Win32::GUI is a Win32-platform native graphical user interface toolkit for *************** *** 53,61 **** user32.dll and gdi32.dll, with an object oriented perl interface and an event-based dialog model that mimic the functionality of visual basic.</p> ! <pre> ! ! =head1 AVAILABILITY</pre> ! <p>This is the README file for Win32::GUI v1.05_90 ! built on 01 Feb 2008.</p> <p>Source and ActiveState Perl PPMs are available from <a href="http://sourceforge.net/project/showfiles.php?group_id=16572">http://sourceforge.net/project/showfiles.php</a>.</p> --- 64,73 ---- user32.dll and gdi32.dll, with an object oriented perl interface and an event-based dialog model that mimic the functionality of visual basic.</p> ! <p> ! </p> ! <hr /> ! <h1><a name="availability">AVAILABILITY</a></h1> ! <p>This is the README file for Win32::GUI v1.06 ! built on 13 Feb 2008.</p> <p>Source and ActiveState Perl PPMs are available from <a href="http://sourceforge.net/project/showfiles.php?group_id=16572">http://sourceforge.net/project/showfiles.php</a>.</p> *************** *** 123,127 **** nmake install</pre> <p>Built this way the GUI.dll extension can be very large (~3MB). There is a ! module in the <em>build_tools</em> directory that works with <strong>Config_m</strong> and <a href="/ExtUtils/FakeConfig.html">Extutils::FakeConfig</a> to set the MinGW compiler flags more optimally. If you want to try this, then replace the first --- 135,139 ---- nmake install</pre> <p>Built this way the GUI.dll extension can be very large (~3MB). There is a ! module in the <em class="file">build_tools</em> directory that works with <strong>Config_m</strong> and <a href="/ExtUtils/FakeConfig.html">Extutils::FakeConfig</a> to set the MinGW compiler flags more optimally. If you want to try this, then replace the first *************** *** 140,145 **** gzip</pre> <p>Build instructions:</p> ! <p>unpack <em>perl-Win32-GUI-X.XX-X-src.tar.bz2</em>. If you use setup to install ! this src package, it will be unpacked under <em>/usr/src</em> automatically.</p> <pre> cd /usr/src --- 152,157 ---- gzip</pre> <p>Build instructions:</p> ! <p>unpack <em class="file">perl-Win32-GUI-X.XX-X-src.tar.bz2</em>. If you use setup to install ! this src package, it will be unpacked under <em class="file">/usr/src</em> automatically.</p> <pre> cd /usr/src *************** *** 169,173 **** by the make process. It can also be generated by issuing:</p> <pre> ! nmake poddocs;</pre> <p> </p> --- 181,186 ---- by the make process. It can also be generated by issuing:</p> <pre> ! <span class="variable">nmake</span> <span class="variable">poddocs</span><span class="operator">;</span> ! </pre> <p> </p> *************** *** 177,181 **** <p>The HTML documentation can also be generated by issuing:</p> <pre> ! nmake htmldocs;</pre> <p> </p> --- 190,195 ---- <p>The HTML documentation can also be generated by issuing:</p> <pre> ! <span class="variable">nmake</span> <span class="variable">htmldocs</span><span class="operator">;</span> ! </pre> <p> </p> *************** *** 195,201 **** <hr /> <h1><a name="version">VERSION</a></h1> ! <p>Documentation for Win32::GUI v1.05_90 created 01 Feb 2008</p> <p>This document is autogenerated by the build process. Edits made here will be lost. ! Edit <em>docs/GUI/UserGuide/Readme.pod</em> instead.</p> <p> </p> --- 209,215 ---- <hr /> <h1><a name="version">VERSION</a></h1> ! <p>Documentation for Win32::GUI v1.06 created 13 Feb 2008</p> <p>This document is autogenerated by the build process. Edits made here will be lost. ! Edit <em class="file">docs/GUI/UserGuide/Readme.pod</em> instead.</p> <p> </p> *************** *** 212,216 **** <p>This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself.</p> - <p></p> </body> --- 226,229 ---- Index: Readme =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Readme,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Readme 1 Feb 2008 13:33:22 -0000 1.10 --- Readme 13 Feb 2008 15:24:04 -0000 1.11 *************** *** 14,18 **** AVAILABILITY ! This is the README file for Win32::GUI v1.05_90 built on 01 Feb 2008. Source and ActiveState Perl PPMs are available from --- 14,18 ---- AVAILABILITY ! This is the README file for Win32::GUI v1.06 built on 13 Feb 2008. Source and ActiveState Perl PPMs are available from *************** *** 162,166 **** VERSION ! Documentation for Win32::GUI v1.05_90 created 01 Feb 2008 This document is autogenerated by the build process. Edits made here --- 162,166 ---- VERSION ! Documentation for Win32::GUI v1.06 created 13 Feb 2008 This document is autogenerated by the build process. Edits made here Index: GUI.rc =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/GUI.rc,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** GUI.rc 5 Nov 2006 20:04:49 -0000 1.10 --- GUI.rc 13 Feb 2008 15:24:04 -0000 1.11 *************** *** 8,13 **** 1 VERSIONINFO ! FILEVERSION 1,05,00,00 ! PRODUCTVERSION 1,05,00,00 FILEOS VOS__WINDOWS32 FILETYPE VFT_DLL --- 8,13 ---- 1 VERSIONINFO ! FILEVERSION 1,06,00,00 ! PRODUCTVERSION 1,06,00,00 FILEOS VOS__WINDOWS32 FILETYPE VFT_DLL *************** *** 17,30 **** BLOCK "040904E4" { ! VALUE "Comments" , "Win32::GUI Perl module v1.05" VALUE "CompanyName" , "Open Source" VALUE "FileDescription" , "perl-win32-gui Perl extension" ! VALUE "FileVersion" , "1.05" VALUE "InternalName" , "GUI.dll" ! VALUE "LegalCopyright" , "Copyright © Aldo Caplini 1997..2006" VALUE "LegalTrademarks" , "GNU and Artistic licences" VALUE "OriginalFilename" , "GUI.dll" VALUE "ProductName" , "Win32::GUI" ! VALUE "ProductVersion" , "1.05" } } --- 17,30 ---- BLOCK "040904E4" { ! VALUE "Comments" , "Win32::GUI Perl module v1.06" VALUE "CompanyName" , "Open Source" VALUE "FileDescription" , "perl-win32-gui Perl extension" ! VALUE "FileVersion" , "1.06" VALUE "InternalName" , "GUI.dll" ! VALUE "LegalCopyright" , "Copyright © Aldo Caplini 1997..2008" VALUE "LegalTrademarks" , "GNU and Artistic licences" VALUE "OriginalFilename" , "GUI.dll" VALUE "ProductName" , "Win32::GUI" ! VALUE "ProductVersion" , "1.06" } } Index: GUI.pm =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/GUI.pm,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** GUI.pm 8 Feb 2008 14:34:18 -0000 1.68 --- GUI.pm 13 Feb 2008 15:24:04 -0000 1.69 *************** *** 20,24 **** # STATIC OBJECT PROPERTIES # ! $VERSION = "1.05_91"; # For MakeMaker and CPAN $XS_VERSION = $VERSION; # For dynaloader $VERSION = eval $VERSION; # For Perl (see perldoc perlmodstyle) --- 20,24 ---- # STATIC OBJECT PROPERTIES # ! $VERSION = "1.06"; # For MakeMaker and CPAN $XS_VERSION = $VERSION; # For dynaloader $VERSION = eval $VERSION; # For Perl (see perldoc perlmodstyle) Index: CHANGELOG =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/CHANGELOG,v retrieving revision 1.145 retrieving revision 1.146 diff -C2 -d -r1.145 -r1.146 *** CHANGELOG 9 Feb 2008 12:53:44 -0000 1.145 --- CHANGELOG 13 Feb 2008 15:24:04 -0000 1.146 *************** *** 6,9 **** --- 6,12 ---- Win32-GUI ChangeLog =================== + + [Robert May] : 13 February 2008 - 1.06 Release + - Up version numbers to 1.06 + + [Robert May] : 9 February 2008 - Tweaks --- Win32::GUI::Scintilla --- |
|
From: Robert M. <rob...@us...> - 2008-02-09 12:53:42
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-ReleaseNotes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31738/Win32-GUI-ReleaseNotes Modified Files: RN_1_06.pod Log Message: Fix typo (Scintilla.PL) SendMessageNN -> SendMessage Index: RN_1_06.pod =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-ReleaseNotes/RN_1_06.pod,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** RN_1_06.pod 1 Feb 2008 13:33:22 -0000 1.8 --- RN_1_06.pod 9 Feb 2008 12:53:44 -0000 1.9 *************** *** 306,309 **** --- 306,311 ---- =item Reini Urban + =item Jeremy White + =back |
|
From: Robert M. <rob...@us...> - 2008-02-09 12:53:41
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Scintilla In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31738/Win32-GUI-Scintilla Modified Files: Scintilla.PL Log Message: Fix typo (Scintilla.PL) SendMessageNN -> SendMessage Index: Scintilla.PL =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Scintilla/Scintilla.PL,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Scintilla.PL 1 Feb 2008 13:33:22 -0000 1.7 --- Scintilla.PL 9 Feb 2008 12:53:44 -0000 1.8 *************** *** 464,468 **** 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"; --- 464,468 ---- print 'sub GetText {', "\n"; print ' my $self = shift;', "\n"; ! print ' my $length = $self->SendMessage(2182, 0, 0); # includes trailing NUL', "\n"; print ' my $text = " " x $length;', "\n\n"; print ' $self->SendMessageNP (2182, $length, $text);', "\n"; |
|
From: Robert M. <rob...@us...> - 2008-02-09 12:53:41
|
Update of /cvsroot/perl-win32-gui/Win32-GUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31738 Modified Files: CHANGELOG Log Message: Fix typo (Scintilla.PL) SendMessageNN -> SendMessage Index: CHANGELOG =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/CHANGELOG,v retrieving revision 1.144 retrieving revision 1.145 diff -C2 -d -r1.144 -r1.145 *** CHANGELOG 9 Feb 2008 08:51:27 -0000 1.144 --- CHANGELOG 9 Feb 2008 12:53:44 -0000 1.145 *************** *** 7,10 **** --- 7,14 ---- =================== + [Robert May] : 9 February 2008 - Tweaks + --- Win32::GUI::Scintilla --- + - Scintilla.PL - fix SendMessageNN to SendMessage [Jeremy White] + + + [Robert May] : 9 February 2008 - Tweaks - build_tools/SrcParser.pm - minor change for perl 5.6.1 --- Win32::GUI::Constants --- |
|
From: Robert M. <rob...@us...> - 2008-02-09 08:51:23
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Constants In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8972/Win32-GUI-Constants Modified Files: Constants.pm Log Message: Minor tweaks Index: Constants.pm =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Constants/Constants.pm,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Constants.pm 1 Feb 2008 13:33:22 -0000 1.10 --- Constants.pm 9 Feb 2008 08:51:27 -0000 1.11 *************** *** 17,21 **** =cut ! our $VERSION = '0.03'; our $XS_VERSION = $VERSION; eval $VERSION; --- 17,21 ---- =cut ! our $VERSION = '0.04'; our $XS_VERSION = $VERSION; eval $VERSION; |
|
From: Robert M. <rob...@us...> - 2008-02-09 08:51:23
|
Update of /cvsroot/perl-win32-gui/Win32-GUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8972 Modified Files: CHANGELOG Log Message: Minor tweaks Index: CHANGELOG =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/CHANGELOG,v retrieving revision 1.143 retrieving revision 1.144 diff -C2 -d -r1.143 -r1.144 *** CHANGELOG 8 Feb 2008 18:47:17 -0000 1.143 --- CHANGELOG 9 Feb 2008 08:51:27 -0000 1.144 *************** *** 6,9 **** --- 6,14 ---- Win32-GUI ChangeLog =================== + + [Robert May] : 9 February 2008 - Tweaks + - build_tools/SrcParser.pm - minor change for perl 5.6.1 + --- Win32::GUI::Constants --- + - Constants.pm - update version + + [Robert May] : 8 February 2008 - Add progress bar styles and messages --- Win32::GUI::Constants --- |
|
From: Robert M. <rob...@us...> - 2008-02-09 08:51:23
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/build_tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8972/build_tools Modified Files: SrcParser.pm Log Message: Minor tweaks Index: SrcParser.pm =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/build_tools/SrcParser.pm,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SrcParser.pm 16 Mar 2006 23:14:31 -0000 1.5 --- SrcParser.pm 9 Feb 2008 08:51:27 -0000 1.6 *************** *** 207,211 **** sub get_package_list { ! return sort { uc $a cmp uc $b } keys %PACKAGES; } --- 207,214 ---- sub get_package_list { ! my @tmp = sort { uc $a cmp uc $b } keys %PACKAGES; ! # Extra @tmp copy needed on perl 5.6.1 to avoid error ! # 'sort routine did not return numeric value' ! return @tmp; } |
|
From: Robert M. <rob...@us...> - 2008-02-08 18:47:15
|
Update of /cvsroot/perl-win32-gui/Win32-GUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24941 Modified Files: CHANGELOG Log Message: Add progress bar styles and messages Index: CHANGELOG =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/CHANGELOG,v retrieving revision 1.142 retrieving revision 1.143 diff -C2 -d -r1.142 -r1.143 *** CHANGELOG 8 Feb 2008 18:02:05 -0000 1.142 --- CHANGELOG 8 Feb 2008 18:47:17 -0000 1.143 *************** *** 6,9 **** --- 6,13 ---- Win32-GUI ChangeLog =================== + + [Robert May] : 8 February 2008 - Add progress bar styles and messages + --- Win32::GUI::Constants --- + - Constants.PL, Tags.pm, 52_tags.t - add PBS_ and PBM_ constants + + [Robert May] : 8 February 2008 - Get GUI.rc updated correctly - Makefile.PL - make GUI.rc dependent on GUI.rc |
|
From: Robert M. <rob...@us...> - 2008-02-08 18:47:13
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Constants/t In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24941/Win32-GUI-Constants/t Modified Files: 52_tags.t Log Message: Add progress bar styles and messages Index: 52_tags.t =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Constants/t/52_tags.t,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** 52_tags.t 15 Jul 2007 19:06:09 -0000 1.5 --- 52_tags.t 8 Feb 2008 18:47:18 -0000 1.6 *************** *** 223,227 **** PS_JOIN_ROUND PS_ENDCAP_ROUND PS_DASH PS_JOIN_MASK PS_GEOMETRIC PS_DOT PS_USERSTYLE PS_NULL PS_ALTERNATE ) ], ! progressbar => [ qw( CLR_DEFAULT ) ], rebar => [ qw( CLR_DEFAULT RBBS_GRIPPERALWAYS RBBS_FIXEDBMP RBBS_VARIABLEHEIGHT RBBS_BREAK --- 223,231 ---- PS_JOIN_ROUND PS_ENDCAP_ROUND PS_DASH PS_JOIN_MASK PS_GEOMETRIC PS_DOT PS_USERSTYLE PS_NULL PS_ALTERNATE ) ], ! progressbar => [ ! qw( PBM_SETRANGE PBM_SETPOS PBM_DELTAPOS PBM_SETSTEP PBM_STEPIT PBM_SETRANGE32 ! PBM_GETRANGE PBM_GETPOS PBM_SETBARCOLOR PBM_SETBKCOLOR PBM_SETMARQUEE ! PBS_SMOOTH PBS_VERTICAL PBS_MARQUEE ! CLR_DEFAULT ) ], rebar => [ qw( CLR_DEFAULT RBBS_GRIPPERALWAYS RBBS_FIXEDBMP RBBS_VARIABLEHEIGHT RBBS_BREAK |
|
From: Robert M. <rob...@us...> - 2008-02-08 18:47:13
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Constants In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24941/Win32-GUI-Constants Modified Files: Constants.PL Tags.pm Log Message: Add progress bar styles and messages Index: Constants.PL =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Constants/Constants.PL,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Constants.PL 15 Jul 2007 19:06:09 -0000 1.9 --- Constants.PL 8 Feb 2008 18:47:17 -0000 1.10 *************** *** 1850,1853 **** --- 1850,1871 ---- HS_DIAGCROSS 5 + # ProgressBar messages + PBM_SETRANGE 1025 #(WM_USER+1) + PBM_SETPOS 1026 #(WM_USER+2) + PBM_DELTAPOS 1027 #(WM_USER+3) + PBM_SETSTEP 1028 #(WM_USER+4) + PBM_STEPIT 1029 #(WM_USER+5) + PBM_SETRANGE32 1030 #(WM_USER+6) + PBM_GETRANGE 1031 #(WM_USER+7) + PBM_GETPOS 1032 #(WM_USER+8) + PBM_SETBARCOLOR 1033 #(WM_USER+9) + PBM_SETBKCOLOR 0x2001 #CCM_SETBKCOLOR (CCM_FIRST+1) + PBM_SETMARQUEE 1035 #(WM_USER+10) + + # ProgressBar styles + PBS_SMOOTH 0x01 + PBS_VERTICAL 0x04 + PBS_MARQUEE 0x08 + # Pen Styles PS_SOLID 0 Index: Tags.pm =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Constants/Tags.pm,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Tags.pm 15 Jul 2007 19:06:09 -0000 1.6 --- Tags.pm 8 Feb 2008 18:47:17 -0000 1.7 *************** *** 102,106 **** notifyicon => [ qw() ], pen => [ qw( ^PS_ ) ], ! progressbar => [ qw( ^CLR_DEFAULT$ ) ], rebar => [ qw( ^CLR_DEFAULT$ ^RBBS_ ) ], region => [ qw( ^RGN_ ) ], --- 102,106 ---- notifyicon => [ qw() ], pen => [ qw( ^PS_ ) ], ! progressbar => [ qw( ^PBS_ ^PBM_ ^CLR_DEFAULT$ ) ], rebar => [ qw( ^CLR_DEFAULT$ ^RBBS_ ) ], region => [ qw( ^RGN_ ) ], |
|
From: Robert M. <rob...@us...> - 2008-02-08 18:02:01
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-DropFiles/t In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8495/Win32-GUI-DropFiles/t Added Files: 97_Version.t Log Message: Fix updating of GUI.rc and add tests for verions to all XS modules --- NEW FILE: 97_Version.t --- #!perl -wT # Win32::GUI::DropFiles test suite. # $Id: 97_Version.t,v 1.1 2008/02/08 18:02:04 robertemay Exp $ # Testing that DropFiles.dll has the same version as DropFiles.pm use strict; use warnings; BEGIN { $| = 1 } # Autoflush use Test::More tests => 4; use Win32::GUI(); use Win32::GUI::DropFiles(); my($maj_pm, $min_pm, $rc_pm); my $version = $Win32::GUI::DropFiles::VERSION . '00'; if($version =~ m/^(\d+)\.(\d\d)(\d\d)/) { ($maj_pm, $min_pm, $rc_pm) = ($1, $2, $3); } my ($maj_rc, $min_rc, $rc_rc, $extra) = Win32::GUI::GetDllVersion('DropFiles.dll'); ok($maj_pm == $maj_rc, "Major Version numbers the same"); ok($min_pm == $min_rc, "Minor Version numbers the same"); ok($rc_pm == $rc_rc, "RC numbers the same"); ok(!defined $extra, "No extra information"); |
|
From: Robert M. <rob...@us...> - 2008-02-08 18:02:01
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Constants/t In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8495/Win32-GUI-Constants/t Added Files: 97_Version.t Log Message: Fix updating of GUI.rc and add tests for verions to all XS modules --- NEW FILE: 97_Version.t --- #!perl -wT # Win32::GUI::Constants test suite. # $Id: 97_Version.t,v 1.1 2008/02/08 18:02:04 robertemay Exp $ # Testing that Constants.dll has the same version as Constants.pm use strict; use warnings; BEGIN { $| = 1 } # Autoflush use Test::More tests => 4; use Win32::GUI(); use Win32::GUI::Constants(); my($maj_pm, $min_pm, $rc_pm); my $version = $Win32::GUI::Constants::VERSION . '00'; if($version =~ m/^(\d+)\.(\d\d)(\d\d)/) { ($maj_pm, $min_pm, $rc_pm) = ($1, $2, $3); } my ($maj_rc, $min_rc, $rc_rc, $extra) = Win32::GUI::GetDllVersion('Constants.dll'); ok($maj_pm == $maj_rc, "Major Version numbers the same"); ok($min_pm == $min_rc, "Minor Version numbers the same"); ok($rc_pm == $rc_rc, "RC numbers the same"); ok(!defined $extra, "No extra information"); |
|
From: Robert M. <rob...@us...> - 2008-02-08 18:02:01
|
Update of /cvsroot/perl-win32-gui/Win32-GUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8495 Modified Files: CHANGELOG Makefile.PL MANIFEST Log Message: Fix updating of GUI.rc and add tests for verions to all XS modules Index: CHANGELOG =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/CHANGELOG,v retrieving revision 1.141 retrieving revision 1.142 diff -C2 -d -r1.141 -r1.142 *** CHANGELOG 8 Feb 2008 16:42:11 -0000 1.141 --- CHANGELOG 8 Feb 2008 18:02:05 -0000 1.142 *************** *** 6,9 **** --- 6,15 ---- Win32-GUI ChangeLog =================== + + [Robert May] : 8 February 2008 - Get GUI.rc updated correctly + - Makefile.PL - make GUI.rc dependent on GUI.rc + - Add tests to all XS modules that the RC version number matches the + module + - MANIFEST - add new test files + + [Robert May] : 8 February 2008 - Correct number of tests - t\GUI_Helpers.cpp - fix another spot where we could be calling Index: Makefile.PL =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Makefile.PL,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** Makefile.PL 2 Feb 2008 12:50:23 -0000 1.30 --- Makefile.PL 8 Feb 2008 18:02:05 -0000 1.31 *************** *** 385,390 **** $rc_frag .= <<'RC_FRAG3' ! GUI.rc: $(PERL) -I$(BUILD_TOOLS) $(BUILD_TOOLS)/updateRC.pl RC_FRAG3 --- 385,391 ---- $rc_frag .= <<'RC_FRAG3' ! GUI.rc: GUI.pm $(PERL) -I$(BUILD_TOOLS) $(BUILD_TOOLS)/updateRC.pl + $(NOECHO) $(TOUCH) GUI.rc RC_FRAG3 Index: MANIFEST =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/MANIFEST,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** MANIFEST 2 Feb 2008 13:25:57 -0000 1.24 --- MANIFEST 8 Feb 2008 18:02:05 -0000 1.25 *************** *** 133,136 **** --- 133,137 ---- t/50_Font_GetMetrics.t t/50_Richedit_GetCharFormat.t + t/97_Version.t t/98_Pod.t t/99_pod_coverage.t *************** *** 167,170 **** --- 168,172 ---- Win32-GUI-AxWindow/t/01_load.t Win32-GUI-AxWindow/t/02_new.t + Win32-GUI-AxWindow/t/97_Version.t Win32-GUI-AxWindow/t/98_pod.t Win32-GUI-AxWindow/t/99_pod_coverage.t *************** *** 217,220 **** --- 219,223 ---- Win32-GUI-Constants/t/70_values.t Win32-GUI-Constants/t/71_invalid_values.t + Win32-GUI-Constants/t/97_Version.t Win32-GUI-Constants/t/98_pod.t Win32-GUI-Constants/t/99_pod_coverage.t *************** *** 271,274 **** --- 274,278 ---- Win32-GUI-DIBitmap/t/01_load.t Win32-GUI-DIBitmap/t/02_new.t + Win32-GUI-DIBitmap/t/97_Version.t Win32-GUI-DIBitmap/t/98_pod.t Win32-GUI-DIBitmap/t/99_pod_coverage.t *************** *** 293,296 **** --- 297,301 ---- Win32-GUI-DropFiles/t/10_Unicode.t Win32-GUI-DropFiles/t/11_invalid_handles.t + Win32-GUI-DropFiles/t/97_Version.t Win32-GUI-DropFiles/t/98_pod.t Win32-GUI-DropFiles/t/99_pod_coverage.t *************** *** 340,343 **** --- 345,349 ---- Win32-GUI-Grid/t/01_load.t Win32-GUI-Grid/t/02_new.t + Win32-GUI-Grid/t/97_Version.t Win32-GUI-Grid/t/98_pod.t Win32-GUI-Grid/t/99_pod_coverage.t *************** *** 378,381 **** --- 384,388 ---- Win32-GUI-Scintilla/t/03_LoadFile.t Win32-GUI-Scintilla/t/55_crash.t + Win32-GUI-Scintilla/t/97_Version.t Win32-GUI-Scintilla/t/98_pod.t Win32-GUI-Scintilla/t/99_pod_coverage.t |
|
From: Robert M. <rob...@us...> - 2008-02-08 18:02:01
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Scintilla/t In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8495/Win32-GUI-Scintilla/t Added Files: 97_Version.t Log Message: Fix updating of GUI.rc and add tests for verions to all XS modules --- NEW FILE: 97_Version.t --- #!perl -wT # Win32::GUI::Scintilla test suite. # $Id: 97_Version.t,v 1.1 2008/02/08 18:02:04 robertemay Exp $ # Testing that Scintilla.dll has the same version as Scintilla.pm use strict; use warnings; BEGIN { $| = 1 } # Autoflush use Test::More tests => 4; use Win32::GUI(); use Win32::GUI::Scintilla(); my($maj_pm, $min_pm, $rc_pm); my $version = $Win32::GUI::Scintilla::VERSION . '00'; if($version =~ m/^(\d+)\.(\d\d)(\d\d)/) { ($maj_pm, $min_pm, $rc_pm) = ($1, $2, $3); } my ($maj_rc, $min_rc, $rc_rc, $extra) = Win32::GUI::GetDllVersion('Scintilla.dll'); ok($maj_pm == $maj_rc, "Major Version numbers the same"); ok($min_pm == $min_rc, "Minor Version numbers the same"); ok($rc_pm == $rc_rc, "RC numbers the same"); ok(!defined $extra, "No extra information"); |
|
From: Robert M. <rob...@us...> - 2008-02-08 18:02:01
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-Grid/t In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8495/Win32-GUI-Grid/t Added Files: 97_Version.t Log Message: Fix updating of GUI.rc and add tests for verions to all XS modules --- NEW FILE: 97_Version.t --- #!perl -wT # Win32::GUI::Grid test suite. # $Id: 97_Version.t,v 1.1 2008/02/08 18:02:04 robertemay Exp $ # Testing that Grid.dll has the same version as Grid.pm use strict; use warnings; BEGIN { $| = 1 } # Autoflush use Test::More tests => 4; use Win32::GUI(); use Win32::GUI::Grid(); my($maj_pm, $min_pm, $rc_pm); my $version = $Win32::GUI::Grid::VERSION . '00'; if($version =~ m/^(\d+)\.(\d\d)(\d\d)/) { ($maj_pm, $min_pm, $rc_pm) = ($1, $2, $3); } my ($maj_rc, $min_rc, $rc_rc, $extra) = Win32::GUI::GetDllVersion('Grid.dll'); ok($maj_pm == $maj_rc, "Major Version numbers the same"); ok($min_pm == $min_rc, "Minor Version numbers the same"); ok($rc_pm == $rc_rc, "RC numbers the same"); ok(!defined $extra, "No extra information"); |
|
From: Robert M. <rob...@us...> - 2008-02-08 18:02:00
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/t In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8495/t Added Files: 97_Version.t Log Message: Fix updating of GUI.rc and add tests for verions to all XS modules --- NEW FILE: 97_Version.t --- #!perl -wT # Win32::GUI test suite. # $Id: 97_Version.t,v 1.1 2008/02/08 18:02:04 robertemay Exp $ # Testing that GUI.dll has the same version as GUI.pm use strict; use warnings; BEGIN { $| = 1 } # Autoflush use Test::More tests => 4; use Win32::GUI(); my($maj_pm, $min_pm, $rc_pm); my $version = $Win32::GUI::VERSION . '00'; if($version =~ m/^(\d+)\.(\d\d)(\d\d)/) { ($maj_pm, $min_pm, $rc_pm) = ($1, $2, $3); } my ($maj_rc, $min_rc, $rc_rc, $extra) = Win32::GUI::GetDllVersion('GUI.dll'); ok($maj_pm == $maj_rc, "Major Version numbers the same"); ok($min_pm == $min_rc, "Minor Version numbers the same"); ok($rc_pm == $rc_rc, "RC numbers the same"); ok(!defined $extra, "No extra information"); |
|
From: Robert M. <rob...@us...> - 2008-02-08 18:02:00
|
Update of /cvsroot/perl-win32-gui/Win32-GUI/Win32-GUI-DIBitmap/t In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8495/Win32-GUI-DIBitmap/t Added Files: 97_Version.t Log Message: Fix updating of GUI.rc and add tests for verions to all XS modules --- NEW FILE: 97_Version.t --- #!perl -wT # Win32::GUI::DIBitmap test suite. # $Id: 97_Version.t,v 1.1 2008/02/08 18:02:04 robertemay Exp $ # Testing that DIBitmap.dll has the same version as DIBitmap.pm use strict; use warnings; BEGIN { $| = 1 } # Autoflush use Test::More tests => 4; use Win32::GUI(); use Win32::GUI::DIBitmap(); my($maj_pm, $min_pm, $rc_pm); my $version = $Win32::GUI::DIBitmap::VERSION . '00'; if($version =~ m/^(\d+)\.(\d\d)(\d\d)/) { ($maj_pm, $min_pm, $rc_pm) = ($1, $2, $3); } my ($maj_rc, $min_rc, $rc_rc, $extra) = Win32::GUI::GetDllVersion('DIBitmap.dll'); ok($maj_pm == $maj_rc, "Major Version numbers the same"); ok($min_pm == $min_rc, "Minor Version numbers the same"); ok($rc_pm == $rc_rc, "RC numbers the same"); ok(!defined $extra, "No extra information"); |
