Menu
▾
▴
[Perl-win32-gui-cvscommit] Win32-GUI CHANGELOG, 1.148, 1.149 DC.xs, 1.19, 1.20 Font.xs, 1.3, 1.4 GUI.h, 1.31, 1.32 GUI.xs, 1.67, 1.68 GUI_Events.cpp, 1.15, 1.16 GUI_Helpers.cpp, 1.26, 1.27 GUI_MessageLoops.cpp, 1.24, 1.25 GUI_Options.cpp, 1.16, 1.17 Header.xs, 1.5, 1.6 ListView.xs, 1.15, 1.16 MDI.xs, 1.3, 1.4 Rebar.xs, 1.9, 1.10 RichEdit.xs, 1.9, 1.10 Splitter.xs, 1.5, 1.6 TabStrip.xs, 1.3, 1.4 Toolbar.xs, 1.9, 1.10 Tooltip.xs, 1.10, 1.11 TreeView.xs, 1.10, 1.11 Window.xs, 1.12, 1.13
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] |
