Menu
▾
▴
[Perl-win32-gui-cvscommit] Win32-GUI CustomDraw.pm,NONE,1.1 Button.xs,1.6,1.7 CHANGELOG,1.70,1.71 GUI.h,1.25,1.26 GUI.pm,1.37,1.38 GUI.rc,1.6,1.7 GUI.xs,1.48,1.49 GUI_Events.cpp,1.10,1.11 GUI_Helpers.cpp,1.15,1.16 GUI_MessageLoops.cpp,1.17,1.18 GUI_Options.cpp,1.10,1.11 Header.xs,1.3,1.4 ImageList.xs,1.7,1.8 ListView.xs,1.10,1.11 MANIFEST,1.12,1.13 Makefile.PL,1.15,1.16 NotifyIcon.xs,1.4,1.5 Readme,1.4,1.5 Readme.html,1.5,1.6 Rebar.xs,1.7,1.8 TYPEMAP,1.5,1.6 Toolbar.xs,1.5,1.6 Tooltip.xs,1.5,1.6 Trackbar.xs,1.6,1.7 TreeView.xs,1.5,1.6 Window.xs,1.10,1.11
Update of /cvsroot/perl-win32-gui/Win32-GUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7815 Modified Files: Button.xs CHANGELOG GUI.h GUI.pm GUI.rc GUI.xs GUI_Events.cpp GUI_Helpers.cpp GUI_MessageLoops.cpp GUI_Options.cpp Header.xs ImageList.xs ListView.xs MANIFEST Makefile.PL NotifyIcon.xs Readme Readme.html Rebar.xs TYPEMAP Toolbar.xs Tooltip.xs Trackbar.xs TreeView.xs Window.xs Added Files: CustomDraw.pm Log Message: Reini Urban changes Index: GUI.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/GUI.xs,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** GUI.xs 11 Jan 2006 21:26:15 -0000 1.48 --- GUI.xs 16 Mar 2006 08:57:45 -0000 1.49 *************** *** 19,22 **** --- 19,24 ---- #include "GUI.h" + START_MY_CXT + /* ########################################################################### *************** *** 57,61 **** OUTPUT: [...1021 lines suppressed...] + # names to the window. + # + # Note: Called implicitly by DragQueryFiles. So don't use DragQueryFiles + # if you need further information from this object. + void + DESTROY(handle) + HDROP handle + CODE: + DragFinish(handle); + + + ########################################################################### BOOT: { + MY_CXT_INIT; + MY_CXT.count = 0; INITCOMMONCONTROLSEX icce; icce.dwSize = sizeof(INITCOMMONCONTROLSEX); Index: Tooltip.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Tooltip.xs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Tooltip.xs 25 Aug 2005 19:30:17 -0000 1.5 --- Tooltip.xs 16 Mar 2006 08:57:48 -0000 1.6 *************** *** 10,14 **** #include "GUI.h" ! void Tooltip_onPreCreate(NOTXSPROC LPPERLWIN32GUI_CREATESTRUCT perlcs) { --- 10,19 ---- #include "GUI.h" ! typedef struct tagPERLWIN32GUI_NMTTCUSTOMDRAW { ! NMCUSTOMDRAW nmcd; ! UINT uDrawFlags; ! } PERLWIN32GUI_NMTTCUSTOMDRAW, * LPPERLWIN32GUI_NMTTCUSTOMDRAW; ! ! void Tooltip_onPreCreate(NOTXSPROC LPPERLWIN32GUI_CREATESTRUCT perlcs) { *************** *** 51,54 **** --- 56,60 ---- else if Parse_Event("Pop", PERLWIN32GUI_NEM_CONTROL2) else if Parse_Event("Show", PERLWIN32GUI_NEM_CONTROL3) + else if Parse_Event("CustomDraw", PERLWIN32GUI_NEM_PAINT) else retval = FALSE; *************** *** 99,102 **** --- 105,125 ---- -1); break; + case NM_CUSTOMDRAW: + { + char class_name[] = "Win32::GUI::Tooltip::CustomDraw"; + LPPERLWIN32GUI_NMTTCUSTOMDRAW lpCD = (LPPERLWIN32GUI_NMTTCUSTOMDRAW) lParam; + SV *obj = CreateNMCustomDraw(NOTXSCALL class_name, lpCD); + HV *hv = (HV *)SvRV(obj); + hv_store_mg(NOTXSCALL hv, "-drawflags",11,newSViv(lpCD->uDrawFlags), 0); + PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_PAINT, "CustomDraw", + PERLWIN32GUI_ARGTYPE_SV, obj, + -1); + #ifdef PERLWIN32GUI_STRONGDEBUG + printf("XS(CreateNMCustomDraw %s) => %d\n", class_name, PerlResult); + #endif + perlud->forceResult = PerlResult; + PerlResult = 0; /* MsgLoop return ForceResult */ + } + break; } } *************** *** 104,108 **** return PerlResult; } ! MODULE = Win32::GUI::Tooltip PACKAGE = Win32::GUI::Tooltip --- 127,131 ---- return PerlResult; } ! MODULE = Win32::GUI::Tooltip PACKAGE = Win32::GUI::Tooltip Index: Window.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Window.xs,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Window.xs 13 Nov 2005 18:57:52 -0000 1.10 --- Window.xs 16 Mar 2006 08:57:48 -0000 1.11 *************** *** 82,85 **** --- 82,89 ---- storing = newSViv((LONG) handle_From(NOTXSCALL value)); stored = hv_store_mg(NOTXSCALL perlcs->hvSelf, "-accel", 6, storing, 0); + } else if(strcmp(option, "-dropfiles") == 0) { + perlcs->iDropFiles = (int) SvIV(value); + storing = newSViv((LONG) SvIV(value)); + stored = hv_store_mg(NOTXSCALL perlcs->hvSelf, "-dropfiles", 10, storing, 0); } else if(strcmp(option, "-hasmaximize") == 0 || strcmp(option, "-maximizebox") == 0) { *************** *** 113,116 **** --- 117,128 ---- void Window_onPostCreate(NOTXSPROC HWND myhandle, LPPERLWIN32GUI_CREATESTRUCT perlcs) { + + if (perlcs->iDropFiles) { + #ifdef PERLWIN32GUI_STRONGDEBUG + printf("XS(Window_onPostCreate DragAcceptFiles) (iDropFiles=%d, myhandle=%ud)\n", + perlcs->iDropFiles, myhandle); + #endif + DragAcceptFiles(myhandle, 1); + } } *************** *** 128,131 **** --- 140,144 ---- else if Parse_Event("Scroll", PERLWIN32GUI_NEM_CONTROL7) else if Parse_Event("InitMenu", PERLWIN32GUI_NEM_CONTROL8) + else if Parse_Event("DropFiles", PERLWIN32GUI_NEM_DROPFILE) else if Parse_Event("Paint", PERLWIN32GUI_NEM_PAINT) else retval = FALSE; *************** *** 260,264 **** * Sent when a menu is about to become active. It occurs when the user clicks * an item on the menu bar or presses a menu key. This allows the application ! * to modify the menu before it is displayed. * (@)APPLIES_TO:Window, DialogBox, MDIFrame */ --- 273,277 ---- * Sent when a menu is about to become active. It occurs when the user clicks * an item on the menu bar or presses a menu key. This allows the application ! * to modify the menu before it is displayed. * (@)APPLIES_TO:Window, DialogBox, MDIFrame */ *************** *** 295,301 **** } ! void DialogBox_onPostCreate(NOTXSPROC HWND myhandle, LPPERLWIN32GUI_CREATESTRUCT perlcs) { ! } --- 308,314 ---- } ! void DialogBox_onPostCreate(NOTXSPROC HWND myhandle, LPPERLWIN32GUI_CREATESTRUCT perlcs) { ! } *************** *** 306,310 **** } ! int DialogBox_onEvent (NOTXSPROC LPPERLWIN32GUI_USERDATA perlud, UINT uMsg, WPARAM wParam, LPARAM lParam) { --- 319,323 ---- } ! int DialogBox_onEvent (NOTXSPROC LPPERLWIN32GUI_USERDATA perlud, UINT uMsg, WPARAM wParam, LPARAM lParam) { *************** *** 338,344 **** } ! void Graphic_onPostCreate(NOTXSPROC HWND myhandle, LPPERLWIN32GUI_CREATESTRUCT perlcs) { ! } --- 351,357 ---- } ! void Graphic_onPostCreate(NOTXSPROC HWND myhandle, LPPERLWIN32GUI_CREATESTRUCT perlcs) { ! } *************** *** 352,356 **** else if Parse_Event("LButtonUp", PERLWIN32GUI_NEM_CONTROL2) else if Parse_Event("RButtonDown", PERLWIN32GUI_NEM_CONTROL3) ! else if Parse_Event("RButtonUp", PERLWIN32GUI_NEM_CONTROL4) else retval = FALSE; --- 365,369 ---- else if Parse_Event("LButtonUp", PERLWIN32GUI_NEM_CONTROL2) else if Parse_Event("RButtonDown", PERLWIN32GUI_NEM_CONTROL3) ! else if Parse_Event("RButtonUp", PERLWIN32GUI_NEM_CONTROL4) else retval = FALSE; *************** *** 358,362 **** } ! int Graphic_onEvent (NOTXSPROC LPPERLWIN32GUI_USERDATA perlud, UINT uMsg, WPARAM wParam, LPARAM lParam) { --- 371,375 ---- } ! int Graphic_onEvent (NOTXSPROC LPPERLWIN32GUI_USERDATA perlud, UINT uMsg, WPARAM wParam, LPARAM lParam) { *************** *** 453,456 **** --- 466,496 ---- #pragma message( "*** PACKAGE Win32::GUI::Window..." ) + ########################################################################### + # (@)METHOD:DragAcceptFiles(HANDLE, [ fAccept ] ) + # Set or get the status whether a window or dialogbox accepts dropped files. + # Returns 0 or 1 + # + int + DragAcceptFiles(handle,...) + HWND handle; + CODE: + int fAccept; + HV* self; + SV** tmp; + + RETVAL = 0; + self = (HV*) SvRV(ST(0)); + if (self) { + if ( items > 1 ) { + fAccept = SvIV(ST(1)) ? 1 : 0; + DragAcceptFiles(handle, (BOOL)fAccept); + RETVAL = fAccept; + } else { + if (tmp = hv_fetch_mg(NOTXSCALL self, "-dropfiles", 10, 0)) + RETVAL = SvIV(*tmp);; + } + } + OUTPUT: + RETVAL ########################################################################### Index: Readme =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Readme,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Readme 21 Nov 2005 22:33:33 -0000 1.4 --- Readme 16 Mar 2006 08:57:48 -0000 1.5 *************** *** 14,21 **** AVAILABILITY ! This is the README file for Win32::GUI v1.03 built on 21 Nov 2005. Source and ActiveState Perl PPMs are available from ! http://sourceforge.net/project/showfiles.php?group_id=16572. A cygwin distribution (available through cygwin's setup.exe) is --- 14,21 ---- AVAILABILITY ! This is the README file for Win32::GUI v1.03_03 built on 15 Mar 2006. Source and ActiveState Perl PPMs are available from ! <http://sourceforge.net/project/showfiles.php?group_id=16572>. A cygwin distribution (available through cygwin's setup.exe) is *************** *** 157,166 **** nmake ppm ! This procedure will generate a PPM for you current perl environment, including the HTML documentation, ready for installation as above. VERSION ! Documentation for Win32::GUI v1.03 created 21 Nov 2005 This document is autogenerated by the build process. Edits made here --- 157,166 ---- nmake ppm ! This procedure will generate a PPM for your current perl environment, including the HTML documentation, ready for installation as above. VERSION ! Documentation for Win32::GUI v1.03_03 created 15 Mar 2006 This document is autogenerated by the build process. Edits made here *************** *** 169,183 **** SUPPORT ! Homepage: http://perl-win32-gui.sourceforge.net/. For further support join the users mailing list("per...@li...") from the website at ! http://lists.sourceforge.net/lists/listinfo/perl-win32-gui-users. There ! is a searchable list archive at ! http://sourceforge.net/mail/?group_id=16572. COPYRIGHT and LICENCE ! Copyright (c) 1997..2005 Aldo Calpini. All rights reserved. This program is free software; you can redistribute it and/or modify it --- 169,183 ---- SUPPORT ! Homepage: <http://perl-win32-gui.sourceforge.net/>. For further support join the users mailing list("per...@li...") from the website at ! <http://lists.sourceforge.net/lists/listinfo/perl-win32-gui-users>. ! There is a searchable list archive at ! <http://sourceforge.net/mail/?group_id=16572>. COPYRIGHT and LICENCE ! Copyright (c) 1997..2006 Aldo Calpini. All rights reserved. This program is free software; you can redistribute it and/or modify it Index: Rebar.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Rebar.xs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Rebar.xs 26 Jun 2005 16:40:59 -0000 1.7 --- Rebar.xs 16 Mar 2006 08:57:48 -0000 1.8 *************** *** 78,81 **** --- 78,82 ---- if Parse_Event("HeightChange", PERLWIN32GUI_NEM_CONTROL1) else if Parse_Event("ChevronPushed", PERLWIN32GUI_NEM_CONTROL2) + else if Parse_Event("CustomDraw", PERLWIN32GUI_NEM_PAINT) else retval = FALSE; *************** *** 118,121 **** --- 119,139 ---- } break; + + case NM_CUSTOMDRAW: + { + char class_name[] = "Win32::GUI::Rebar::CustomDraw"; + LPPERLWIN32GUI_NMCUSTOMDRAW lpCD = (LPPERLWIN32GUI_NMCUSTOMDRAW) lParam; + SV *obj = CreateNMCustomDraw(NOTXSCALL class_name, lpCD); + PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_PAINT, "CustomDraw", + PERLWIN32GUI_ARGTYPE_SV, obj, + -1); + #ifdef PERLWIN32GUI_STRONGDEBUG + printf("XS(CreateNMCustomDraw %s) => %d\n", class_name, PerlResult); + #endif + perlud->forceResult = PerlResult; + PerlResult = 0; /* MsgLoop return ForceResult */ + } + break; + } Index: GUI_Events.cpp =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/GUI_Events.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** GUI_Events.cpp 30 Jun 2005 22:36:21 -0000 1.10 --- GUI_Events.cpp 16 Mar 2006 08:57:48 -0000 1.11 *************** *** 19,23 **** BOOL ProcessEventError(NOTXSPROC char *Name, int* PerlResult) { if(SvTRUE(ERRSV)) { ! if(strncmp(Name, "main::", 6) == 0) Name += 6; MessageBeep(MB_ICONASTERISK); *PerlResult = MessageBox(NULL, SvPV_nolen(ERRSV), Name, MB_ICONERROR | MB_OKCANCEL); --- 19,23 ---- BOOL ProcessEventError(NOTXSPROC char *Name, int* PerlResult) { if(SvTRUE(ERRSV)) { ! if(strncmp(Name, "main::", 6) == 0) Name += 6; MessageBeep(MB_ICONASTERISK); *PerlResult = MessageBox(NULL, SvPV_nolen(ERRSV), Name, MB_ICONERROR | MB_OKCANCEL); *************** *** 72,76 **** break; case PERLWIN32GUI_ARGTYPE_LONG: ! XPUSHs(sv_2mortal(newSViv(va_arg( args, long )))); break; case PERLWIN32GUI_ARGTYPE_WORD: --- 72,76 ---- break; case PERLWIN32GUI_ARGTYPE_LONG: ! XPUSHs(sv_2mortal(newSVuv(va_arg( args, long )))); break; case PERLWIN32GUI_ARGTYPE_WORD: *************** *** 81,84 **** --- 81,87 ---- break; case PERLWIN32GUI_ARGTYPE_SV: + #ifdef PERLWIN32GUI_STRONGDEBUG + printf("XS(DoEvent NEM PERLWIN32GUI_ARGTYPE_SV)\n"); + #endif XPUSHs(va_arg( args, SV *)); break; *************** *** 142,145 **** --- 145,154 ---- XPUSHs(sv_2mortal(newSVpv(va_arg( args, char * ), 0))); break; + case PERLWIN32GUI_ARGTYPE_SV: + #ifdef PERLWIN32GUI_STRONGDEBUG + printf("XS(DoEvent OEM PERLWIN32GUI_ARGTYPE_SV)\n"); + #endif + XPUSHs(va_arg( args, SV *)); + break; default: warn("Win32::GUI: WARNING! unknown argument type (%d) to event '%s'", argtype, Name); *************** *** 1039,1047 **** //but this is slightly quicker:) if(SvTRUE(ERRSV)) { ! ProcessEventError(NOTXSCALL "Hook", PerlResult); ! } ! else { ! if(count > 0) { *PerlResult = POPi; } ! } PUTBACK; FREETMPS; --- 1048,1056 ---- //but this is slightly quicker:) if(SvTRUE(ERRSV)) { ! ProcessEventError(NOTXSCALL "Hook", PerlResult); ! } ! else { ! if(count > 0) { *PerlResult = POPi; } ! } PUTBACK; FREETMPS; Index: TYPEMAP =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/TYPEMAP,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TYPEMAP 3 Dec 2005 10:37:03 -0000 1.5 --- TYPEMAP 16 Mar 2006 08:57:48 -0000 1.6 *************** *** 13,16 **** --- 13,17 ---- HPEN T_HANDLE HRGN T_HANDLE + HDROP T_HANDLE HTREEITEM T_IV LONG T_IV *************** *** 56,58 **** T_COLOR sv_setiv($arg, (IV) $var); - --- 57,58 ---- Index: Trackbar.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Trackbar.xs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Trackbar.xs 30 Jun 2005 22:36:21 -0000 1.6 --- Trackbar.xs 16 Mar 2006 08:57:48 -0000 1.7 *************** *** 10,14 **** #include "GUI.h" ! void Trackbar_onPreCreate(NOTXSPROC LPPERLWIN32GUI_CREATESTRUCT perlcs) { --- 10,14 ---- #include "GUI.h" ! void Trackbar_onPreCreate(NOTXSPROC LPPERLWIN32GUI_CREATESTRUCT perlcs) { *************** *** 24,28 **** if(strcmp(option, "-tooltip") == 0) { perlcs->hTooltip = (HWND) handle_From(NOTXSCALL value); ! SwitchBit(perlcs->cs.style, TBS_TOOLTIPS , 1); } else if BitmaskOptionValue("-vertical", perlcs->cs.style, TBS_VERT) } else if BitmaskOptionValue("-aligntop", perlcs->cs.style, TBS_TOP) --- 24,28 ---- if(strcmp(option, "-tooltip") == 0) { perlcs->hTooltip = (HWND) handle_From(NOTXSCALL value); ! SwitchBit(perlcs->cs.style, TBS_TOOLTIPS , 1); } else if BitmaskOptionValue("-vertical", perlcs->cs.style, TBS_VERT) } else if BitmaskOptionValue("-aligntop", perlcs->cs.style, TBS_TOP) *************** *** 39,46 **** } ! void Trackbar_onPostCreate(NOTXSPROC HWND myhandle, LPPERLWIN32GUI_CREATESTRUCT perlcs) { ! if (perlcs->hTooltip != NULL) SendMessage(myhandle, TBM_SETTOOLTIPS, (WPARAM) perlcs->hTooltip, 0); } --- 39,46 ---- } ! void Trackbar_onPostCreate(NOTXSPROC HWND myhandle, LPPERLWIN32GUI_CREATESTRUCT perlcs) { ! if (perlcs->hTooltip != NULL) SendMessage(myhandle, TBM_SETTOOLTIPS, (WPARAM) perlcs->hTooltip, 0); } *************** *** 83,86 **** --- 83,102 ---- PERLWIN32GUI_ARGTYPE_INT, (int) HIWORD(wParam), -1 ); break; + + case NM_CUSTOMDRAW: + { + char class_name[] = "Win32::GUI::Trackbar::CustomDraw"; + LPPERLWIN32GUI_NMCUSTOMDRAW lpCD = (LPPERLWIN32GUI_NMCUSTOMDRAW) lParam; + SV *obj = CreateNMCustomDraw(NOTXSCALL class_name, lpCD); + PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_PAINT, "CustomDraw", + PERLWIN32GUI_ARGTYPE_SV, obj, + -1); + #ifdef PERLWIN32GUI_STRONGDEBUG + printf("XS(CreateNMCustomDraw %s) => %d\n", class_name, PerlResult); + #endif + perlud->forceResult = PerlResult; + PerlResult = 0; + } + break; } *************** *** 124,128 **** # Retrieves the handle to a trackbar control buddy window at a given location. # ! # The specified location is relative to the control's orientation (horizontal or vertical). # B<LOCATION> = FALSE : Retrieves buddy to the right of the trackbar (or below for vertical trackbar) # B<LOCATION> = TRUE : Retrieves buddy to the left of the trackbar (or above for vertical trackbar) --- 140,144 ---- # Retrieves the handle to a trackbar control buddy window at a given location. # ! # The specified location is relative to the control's orientation (horizontal or vertical). # B<LOCATION> = FALSE : Retrieves buddy to the right of the trackbar (or below for vertical trackbar) # B<LOCATION> = TRUE : Retrieves buddy to the left of the trackbar (or above for vertical trackbar) *************** *** 139,143 **** # (@)METHOD:GetChannelRect() # Retrieves the bounding rectangle for a trackbar's channel. ! # The channel is the area over which the slider moves. It contains the highlight when a range is selected. void --- 155,159 ---- # (@)METHOD:GetChannelRect() # Retrieves the bounding rectangle for a trackbar's channel. ! # The channel is the area over which the slider moves. It contains the highlight when a range is selected. void *************** *** 205,209 **** ########################################################################### # (@)METHOD:GetPics() ! # Retrieves an array of logical positions of the trackbar's tick marks, not including the first and last tick. void --- 221,225 ---- ########################################################################### # (@)METHOD:GetPics() ! # Retrieves an array of logical positions of the trackbar's tick marks, not including the first and last tick. void *************** *** 220,224 **** if (pTics) { EXTEND(SP, nTics); ! for (UINT i = 0; i < nTics; i++) XST_mIV(i, pTics[i]); XSRETURN(nTics); --- 236,240 ---- if (pTics) { EXTEND(SP, nTics); ! for (UINT i = 0; i < nTics; i++) XST_mIV(i, pTics[i]); XSRETURN(nTics); *************** *** 292,296 **** ########################################################################### # (@)METHOD:GetThumbRect() ! # Retrieves the bounding rectangle for the slider in a trackbar. void --- 308,312 ---- ########################################################################### # (@)METHOD:GetThumbRect() ! # Retrieves the bounding rectangle for the slider in a trackbar. void *************** *** 336,340 **** ########################################################################### # (@)METHOD:GetToolTips() ! # Retrieves the handle to the tooltip control assigned to the trackbar, if any. LRESULT --- 352,356 ---- ########################################################################### # (@)METHOD:GetToolTips() ! # Retrieves the handle to the tooltip control assigned to the trackbar, if any. LRESULT *************** *** 348,352 **** ########################################################################### # (@)METHOD:GetUnicodeFormat() ! # Retrieves the UNICODE character format flag for the control. LRESULT --- 364,368 ---- ########################################################################### # (@)METHOD:GetUnicodeFormat() ! # Retrieves the UNICODE character format flag for the control. LRESULT *************** *** 362,366 **** # Assigns a window as the buddy window for a trackbar control # Returns the handle to the window that was previously assigned to the control at that location ! # The specified location is relative to the control's orientation (horizontal or vertical). # LOCATION = FALSE : Retrieves buddy to the right of the trackbar (or below for vertical trackbar) # LOCATION = TRUE : Retrieves buddy to the left of the trackbar (or above for vertical trackbar) --- 378,382 ---- # Assigns a window as the buddy window for a trackbar control # Returns the handle to the window that was previously assigned to the control at that location ! # The specified location is relative to the control's orientation (horizontal or vertical). # LOCATION = FALSE : Retrieves buddy to the right of the trackbar (or below for vertical trackbar) # LOCATION = TRUE : Retrieves buddy to the left of the trackbar (or above for vertical trackbar) *************** *** 390,394 **** ########################################################################### # (@)METHOD:SetPageSize([SIZE=10]) ! # Sets the number of logical positions the trackbar's slider moves in response to keyboard input, such as the PAGE UP or PAGE DOWN keys, or mouse input, such as clicks in the trackbar's channel. LRESULT --- 406,410 ---- ########################################################################### # (@)METHOD:SetPageSize([SIZE=10]) ! # Sets the number of logical positions the trackbar's slider moves in response to keyboard input, such as the PAGE UP or PAGE DOWN keys, or mouse input, such as clicks in the trackbar's channel. LRESULT *************** *** 417,421 **** ########################################################################### # (@)METHOD:SetRange([MIN=0], MAX, [REDRAW=TRUE]) ! # Sets the range of minimum and maximum logical positions for the slider in a trackbar. LRESULT --- 433,437 ---- ########################################################################### # (@)METHOD:SetRange([MIN=0], MAX, [REDRAW=TRUE]) ! # Sets the range of minimum and maximum logical positions for the slider in a trackbar. LRESULT *************** *** 460,464 **** ########################################################################### # (@)METHOD:SetSel([MIN=0], MAX, [REDRAW=TRUE]) ! # Sets the starting and ending logical positions for the current selection range in a trackbar. LRESULT --- 476,480 ---- ########################################################################### # (@)METHOD:SetSel([MIN=0], MAX, [REDRAW=TRUE]) ! # Sets the starting and ending logical positions for the current selection range in a trackbar. LRESULT *************** *** 516,520 **** ########################################################################### # (@)METHOD:SetTic(POSITION) ! # Sets a tick mark in a trackbar at the specified logical position. LRESULT --- 532,536 ---- ########################################################################### # (@)METHOD:SetTic(POSITION) ! # Sets a tick mark in a trackbar at the specified logical position. LRESULT *************** *** 546,552 **** # Positions a tooltip control used by a trackbar control. # TBTS_TOP : The tooltip control will be positioned above the trackbar. This flag is for use with horizontal trackbars. ! # TBTS_LEFT The tooltip control will be positioned to the left of the trackbar. This flag is for use with vertical trackbars. ! # TBTS_BOTTOM The tooltip control will be positioned below the trackbar. This flag is for use with horizontal trackbars. ! # TBTS_RIGHT The tooltip control will be positioned to the right of the trackbar. This flag is for use with vertical trackbars. LRESULT --- 562,568 ---- # Positions a tooltip control used by a trackbar control. # TBTS_TOP : The tooltip control will be positioned above the trackbar. This flag is for use with horizontal trackbars. ! # TBTS_LEFT The tooltip control will be positioned to the left of the trackbar. This flag is for use with vertical trackbars. ! # TBTS_BOTTOM The tooltip control will be positioned below the trackbar. This flag is for use with horizontal trackbars. ! # TBTS_RIGHT The tooltip control will be positioned to the right of the trackbar. This flag is for use with vertical trackbars. LRESULT *************** *** 574,578 **** ########################################################################### # (@)METHOD:SetUnicodeFormat(FLAG) ! # Sets the UNICODE character format flag for the control. LRESULT --- 590,594 ---- ########################################################################### # (@)METHOD:SetUnicodeFormat(FLAG) ! # Sets the UNICODE character format flag for the control. LRESULT *************** *** 597,603 **** HWND handle CODE: ! if(items > 1) { if(items > 2) ! RETVAL = SendMessage(handle, TBM_SETRANGEMIN, (WPARAM) SvIV(ST(2)), (LPARAM) SvIV(ST(1))); else RETVAL = SendMessage(handle, TBM_SETRANGEMIN, 1, (LPARAM) SvIV(ST(1))); --- 613,619 ---- HWND handle CODE: ! if(items > 1) { if(items > 2) ! RETVAL = SendMessage(handle, TBM_SETRANGEMIN, (WPARAM) SvIV(ST(2)), (LPARAM) SvIV(ST(1))); else RETVAL = SendMessage(handle, TBM_SETRANGEMIN, 1, (LPARAM) SvIV(ST(1))); *************** *** 617,623 **** HWND handle CODE: ! if(items > 1) { if(items > 2) ! RETVAL = SendMessage(handle, TBM_SETRANGEMAX, (WPARAM) SvIV(ST(2)), (LPARAM) SvIV(ST(1))); else RETVAL = SendMessage(handle, TBM_SETRANGEMAX, 1, (LPARAM) SvIV(ST(1))); --- 633,639 ---- HWND handle CODE: ! if(items > 1) { if(items > 2) ! RETVAL = SendMessage(handle, TBM_SETRANGEMAX, (WPARAM) SvIV(ST(2)), (LPARAM) SvIV(ST(1))); else RETVAL = SendMessage(handle, TBM_SETRANGEMAX, 1, (LPARAM) SvIV(ST(1))); *************** *** 636,642 **** HWND handle CODE: ! if(items > 1) { if(items > 2) ! RETVAL = SendMessage(handle, TBM_SETPOS, (WPARAM) SvIV(ST(2)), (LPARAM) SvIV(ST(1))); else RETVAL = SendMessage(handle, TBM_SETPOS, 1, (LPARAM) SvIV(ST(1))); --- 652,658 ---- HWND handle CODE: ! if(items > 1) { if(items > 2) ! RETVAL = SendMessage(handle, TBM_SETPOS, (WPARAM) SvIV(ST(2)), (LPARAM) SvIV(ST(1))); else RETVAL = SendMessage(handle, TBM_SETPOS, 1, (LPARAM) SvIV(ST(1))); *************** *** 655,661 **** HWND handle CODE: ! if(items > 1) { if(items > 2) ! RETVAL = SendMessage(handle, TBM_SETSELSTART, (WPARAM) SvIV(ST(2)), (LPARAM) SvIV(ST(1))); else RETVAL = SendMessage(handle, TBM_SETSELSTART, 1, (LPARAM) SvIV(ST(1))); --- 671,677 ---- HWND handle CODE: ! if(items > 1) { if(items > 2) ! RETVAL = SendMessage(handle, TBM_SETSELSTART, (WPARAM) SvIV(ST(2)), (LPARAM) SvIV(ST(1))); else RETVAL = SendMessage(handle, TBM_SETSELSTART, 1, (LPARAM) SvIV(ST(1))); *************** *** 674,680 **** HWND handle CODE: ! if(items > 1) { if(items > 2) ! RETVAL = SendMessage(handle, TBM_SETSELEND, (WPARAM) SvIV(ST(2)), (LPARAM) SvIV(ST(1))); else RETVAL = SendMessage(handle, TBM_SETSELEND, 1, (LPARAM) SvIV(ST(1))); --- 690,696 ---- HWND handle CODE: ! if(items > 1) { if(items > 2) ! RETVAL = SendMessage(handle, TBM_SETSELEND, (WPARAM) SvIV(ST(2)), (LPARAM) SvIV(ST(1))); else RETVAL = SendMessage(handle, TBM_SETSELEND, 1, (LPARAM) SvIV(ST(1))); Index: Toolbar.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Toolbar.xs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Toolbar.xs 26 Jun 2005 16:41:00 -0000 1.5 --- Toolbar.xs 16 Mar 2006 08:57:48 -0000 1.6 *************** *** 10,14 **** #include "GUI.h" ! void Toolbar_onPreCreate(NOTXSPROC LPPERLWIN32GUI_CREATESTRUCT perlcs) { --- 10,35 ---- #include "GUI.h" ! typedef struct tagPERLWIN32GUI_NMTBCUSTOMDRAW { ! NMCUSTOMDRAW nmcd; [...1062 lines suppressed...] + if ((tempsv = av_fetch(array, 3)) && SvIOK(*tempsv)) + lpCD->rcText.bottom = SvIV(*tempsv); + if (SvROK(ST(0))) + hv_store_mg(NOTXSCALL hv, "-textrect", 9, newRV_inc(SvRV(ST(1))), 0); + } else { + AV* rect = newAV(); + av_push(rect, newSViv(lpCD->rcText.left)); + av_push(rect, newSViv(lpCD->rcText.top)); + av_push(rect, newSViv(lpCD->rcText.right)); + av_push(rect, newSViv(lpCD->rcText.bottom)); + RETVAL = newRV((SV *)rect), 0); + } + #else + MessageBox(NULL, "Unsupported member -textrect. Requires Comctl32.dll version 6.\r\nComctl32.dll version 6 is not redistributable but it is included in Microsoft Windows XP or later", + "Win32::GUI::Toolbar::CustomDraw", + MB_ICONERROR | MB_OKCANCEL); + RETVAL = &PL_sv_undef; + #endif + OUTPUT: + RETVAL Index: TreeView.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/TreeView.xs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TreeView.xs 8 May 2004 17:32:41 -0000 1.5 --- TreeView.xs 16 Mar 2006 08:57:48 -0000 1.6 *************** *** 10,14 **** #include "GUI.h" ! void TreeView_onPreCreate(NOTXSPROC LPPERLWIN32GUI_CREATESTRUCT perlcs) { --- 10,23 ---- #include "GUI.h" ! typedef struct tagPERLWIN32GUI_NMTVCUSTOMDRAWINFO { ! PERLWIN32GUI_NMCUSTOMDRAW nmcd; ! COLORREF clrText; ! COLORREF clrTextBk; ! #if (_WIN32_IE >= 0x0400) ! int iLevel; ! #endif ! } PERLWIN32GUI_NMTVCUSTOMDRAW, *LPPERLWIN32GUI_NMTVCUSTOMDRAW; ! ! void TreeView_onPreCreate(NOTXSPROC LPPERLWIN32GUI_CREATESTRUCT perlcs) { *************** *** 22,31 **** BOOL retval = TRUE; ! if(strcmp(option, "-imagelist") == 0) { perlcs->hImageList = (HIMAGELIST) handle_From(NOTXSCALL value); } else if(strcmp(option, "-tooltip") == 0) { perlcs->hTooltip = (HWND) handle_From(NOTXSCALL value); ! SwitchBit(perlcs->cs.style, TVS_NOTOOLTIPS, 0); } else if BitmaskOptionValue("-lines", perlcs->cs.style, TVS_HASLINES) } else if BitmaskOptionValue("-rootlines", perlcs->cs.style, TVS_LINESATROOT) --- 31,40 ---- BOOL retval = TRUE; ! if(strcmp(option, "-imagelist") == 0) { perlcs->hImageList = (HIMAGELIST) handle_From(NOTXSCALL value); } else if(strcmp(option, "-tooltip") == 0) { perlcs->hTooltip = (HWND) handle_From(NOTXSCALL value); ! SwitchBit(perlcs->cs.style, TVS_NOTOOLTIPS, 0); } else if BitmaskOptionValue("-lines", perlcs->cs.style, TVS_HASLINES) } else if BitmaskOptionValue("-rootlines", perlcs->cs.style, TVS_LINESATROOT) *************** *** 52,57 **** if(perlcs->hImageList != NULL) TreeView_SetImageList(myhandle, perlcs->hImageList, TVSIL_NORMAL); ! ! if (perlcs->hTooltip != NULL) TreeView_SetToolTips (myhandle, perlcs->hTooltip); --- 61,66 ---- if(perlcs->hImageList != NULL) TreeView_SetImageList(myhandle, perlcs->hImageList, TVSIL_NORMAL); ! ! if (perlcs->hTooltip != NULL) TreeView_SetToolTips (myhandle, perlcs->hTooltip); *************** *** 80,83 **** --- 89,93 ---- else if Parse_Event("EndLabelEdit", PERLWIN32GUI_NEM_CONTROL7) else if Parse_Event("KeyDown", PERLWIN32GUI_NEM_KEYDOWN) + else if Parse_Event("CustomDraw", PERLWIN32GUI_NEM_PAINT) else retval = FALSE; *************** *** 90,99 **** int PerlResult = 1; TV_ITEM *pItem; ! if ( uMsg == WM_NOTIFY ) { LPNM_TREEVIEW tv_notify = (LPNM_TREEVIEW) lParam; switch(tv_notify->hdr.code) { ! case TVN_BEGINLABELEDIT: /* --- 100,109 ---- int PerlResult = 1; TV_ITEM *pItem; ! if ( uMsg == WM_NOTIFY ) { LPNM_TREEVIEW tv_notify = (LPNM_TREEVIEW) lParam; switch(tv_notify->hdr.code) { ! case TVN_BEGINLABELEDIT: /* *************** *** 104,113 **** * For a treeview to receive this event, -editlabels need to be set to true. * (@)APPLIES_TO:TreeView ! */ pItem = &((TV_DISPINFO*)lParam)->item; PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_CONTROL6, "BeginLabelEdit", PERLWIN32GUI_ARGTYPE_LONG, (LONG) pItem->hItem, -1); ! // Force result if event is handle if (perlud->dwPlStyle & PERLWIN32GUI_EVENTHANDLING) { --- 114,123 ---- * For a treeview to receive this event, -editlabels need to be set to true. * (@)APPLIES_TO:TreeView ! */ pItem = &((TV_DISPINFO*)lParam)->item; PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_CONTROL6, "BeginLabelEdit", PERLWIN32GUI_ARGTYPE_LONG, (LONG) pItem->hItem, -1); ! // Force result if event is handle if (perlud->dwPlStyle & PERLWIN32GUI_EVENTHANDLING) { *************** *** 117,125 **** break; ! case TVN_ENDLABELEDIT: /* * (@)EVENT:EndLabelEdit(NODE,TEXT) * Sent when the user has finished editing a label in the TreeView control. ! * You have explicitly set the text of the node to reflect the new changes. * If the user cancels the edit, the text is undef. * (@)APPLIES_TO:TreeView --- 127,135 ---- break; ! case TVN_ENDLABELEDIT: /* * (@)EVENT:EndLabelEdit(NODE,TEXT) * Sent when the user has finished editing a label in the TreeView control. ! * You have explicitly set the text of the node to reflect the new changes. * If the user cancels the edit, the text is undef. * (@)APPLIES_TO:TreeView *************** *** 135,143 **** PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_CONTROL7, "EndLabelEdit", PERLWIN32GUI_ARGTYPE_LONG, (LONG) pItem->hItem, ! -1); } ! break; ! case TVN_SELCHANGED: /* --- 145,153 ---- PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_CONTROL7, "EndLabelEdit", PERLWIN32GUI_ARGTYPE_LONG, (LONG) pItem->hItem, ! -1); } ! break; ! case TVN_SELCHANGED: /* *************** *** 204,213 **** if (perlud->dwPlStyle & PERLWIN32GUI_EVENTHANDLING) { perlud->forceResult = (PerlResult == 0 ? TRUE : FALSE); ! PerlResult = 0; // MsgLoop return ForceResult } break; case TVN_KEYDOWN: ! /* * (@)EVENT:KeyDown(KEY) --- 214,223 ---- if (perlud->dwPlStyle & PERLWIN32GUI_EVENTHANDLING) { perlud->forceResult = (PerlResult == 0 ? TRUE : FALSE); ! PerlResult = 0; // MsgLoop return ForceResult } break; case TVN_KEYDOWN: ! { /* * (@)EVENT:KeyDown(KEY) *************** *** 221,227 **** PERLWIN32GUI_ARGTYPE_LONG, (LONG) tv_keydown->wVKey, -1); ! break; ! } } --- 231,258 ---- PERLWIN32GUI_ARGTYPE_LONG, (LONG) tv_keydown->wVKey, -1); + } + break; ! case NM_CUSTOMDRAW: ! { ! LPPERLWIN32GUI_NMTVCUSTOMDRAW lpCD = (LPPERLWIN32GUI_NMTVCUSTOMDRAW) lParam; ! SV *obj = CreateNMCustomDraw(NOTXSCALL "Win32::GUI::TreeView::CustomDraw", lpCD); ! HV *hv = (HV *)SvRV(obj); ! hv_store_mg(NOTXSCALL hv, "-clrtext", 8, newSVuv((DWORD) lpCD->clrText), 0); ! hv_store_mg(NOTXSCALL hv, "-clrtextbk", 10, newSVuv((DWORD) lpCD->clrTextBk), 0); ! #if (_WIN32_IE >= 0x0400) ! hv_store_mg(NOTXSCALL hv, "-level", 6, newSViv(lpCD->iLevel), 0); ! #endif ! PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_PAINT, "CustomDraw", ! PERLWIN32GUI_ARGTYPE_SV, obj, ! -1); ! #ifdef PERLWIN32GUI_STRONGDEBUG ! printf("XS(CreateNMCustomDraw %s) => %d\n", class_name, PerlResult); ! #endif ! perlud->forceResult = PerlResult; ! PerlResult = 0; /* MsgLoop return ForceResult */ ! } ! break; ! } } *************** *** 236,240 **** - ########################################################################### # (@)METHOD:CreateDragImage(NODE) --- 267,270 ---- *************** *** 289,294 **** ########################################################################### # (@)METHOD:EndEditLabelNow([FLAG_CANCEL=TRUE]) ! # Ends the editing of a tree view item's label. ! BOOL EndEditLabelNow(handle,flag=TRUE) HWND handle --- 319,324 ---- ########################################################################### # (@)METHOD:EndEditLabelNow([FLAG_CANCEL=TRUE]) ! # Ends the editing of a tree view item's label. ! BOOL EndEditLabelNow(handle,flag=TRUE) HWND handle *************** *** 385,389 **** ########################################################################### # (@)METHOD:GetFirstVisible() ! # Retrieves the first visible item in a TreeView. HTREEITEM GetFirstVisible(handle) --- 415,419 ---- ########################################################################### # (@)METHOD:GetFirstVisible() ! # Retrieves the first visible item in a TreeView. HTREEITEM GetFirstVisible(handle) *************** *** 397,401 **** # (@)METHOD:GetImageList([TYPE=TVSIL_NORMAL]) # Retrieves the handle to the normal or state image list associated with a TreeView. ! # B<TYPE> = TVSIL_NORMAL | TVSIL_STATE HIMAGELIST GetImageList(handle,type=TVSIL_NORMAL ) --- 427,431 ---- # (@)METHOD:GetImageList([TYPE=TVSIL_NORMAL]) # Retrieves the handle to the normal or state image list associated with a TreeView. ! # B<TYPE> = TVSIL_NORMAL | TVSIL_STATE HIMAGELIST GetImageList(handle,type=TVSIL_NORMAL ) *************** *** 409,413 **** ########################################################################### # (@)METHOD:GetIndent() ! # Retrieves the amount, in pixels, that child items are indented relative to their parent items. UINT GetIndent(handle) --- 439,443 ---- ########################################################################### # (@)METHOD:GetIndent() ! # Retrieves the amount, in pixels, that child items are indented relative to their parent items. UINT GetIndent(handle) *************** *** 501,505 **** # (@)METHOD:GetItemRect(NODE,[FLAG=FALSE]) # Retrieves the bounding rectangle for a tree view item and indicates whether the item is visible. ! # If B<FLAG> is TRUE, the bounding rectangle includes only the text of the item. Otherwise, it includes the entire line that the item occupies in the tree view control. void GetItemRect(handle,item,flag=FALSE) --- 531,535 ---- # (@)METHOD:GetItemRect(NODE,[FLAG=FALSE]) # Retrieves the bounding rectangle for a tree view item and indicates whether the item is visible. ! # If B<FLAG> is TRUE, the bounding rectangle includes only the text of the item. Otherwise, it includes the entire line that the item occupies in the tree view control. void GetItemRect(handle,item,flag=FALSE) *************** *** 523,527 **** ########################################################################### # (@)METHOD:GetLastVisible() ! # Retrieves the last expanded item in a tree view control. HTREEITEM GetLastVisible(handle) --- 553,557 ---- ########################################################################### # (@)METHOD:GetLastVisible() ! # Retrieves the last expanded item in a tree view control. HTREEITEM GetLastVisible(handle) *************** *** 536,548 **** # Retrieves the tree view item that bears the specified relationship to a specified item. # ! # B<FLAG> specifying the item to retrieve : # TVGN_CARET = Retrieves the currently selected item. ! # TVGN_CHILD = Retrieves the first child item of the item specified by the hitem parameter. # TVGN_DROPHILITE = Retrieves the item that is the target of a drag-and-drop operation. ! # TVGN_FIRSTVISIBLE = Retrieves the first visible item. # TVGN_NEXT = Retrieves the next sibling item. # TVGN_NEXTVISIBLE = Retrieves the next visible item that follows the specified item. The specified item must be visible. ! # TVGN_PARENT = Retrieves the parent of the specified item. ! # TVGN_PREVIOUS = Retrieves the previous sibling item. # TVGN_PREVIOUSVISIBLE = Retrieves the first visible item that precedes the specified item. The specified item must be visible. # TVGN_ROOT = Retrieves the topmost or very first item of the tree view control. --- 566,578 ---- # Retrieves the tree view item that bears the specified relationship to a specified item. # ! # B<FLAG> specifying the item to retrieve : # TVGN_CARET = Retrieves the currently selected item. ! # TVGN_CHILD = Retrieves the first child item of the item specified by the hitem parameter. # TVGN_DROPHILITE = Retrieves the item that is the target of a drag-and-drop operation. ! # TVGN_FIRSTVISIBLE = Retrieves the first visible item. # TVGN_NEXT = Retrieves the next sibling item. # TVGN_NEXTVISIBLE = Retrieves the next visible item that follows the specified item. The specified item must be visible. ! # TVGN_PARENT = Retrieves the parent of the specified item. ! # TVGN_PREVIOUS = Retrieves the previous sibling item. # TVGN_PREVIOUSVISIBLE = Retrieves the first visible item that precedes the specified item. The specified item must be visible. # TVGN_ROOT = Retrieves the topmost or very first item of the tree view control. *************** *** 823,832 **** ########################################################################### # (@)METHOD:Select(NODE, [FLAG=TVGN_CARET]) ! # Selects the given B<NODE >in the TreeView. # If B<NODE> is 0 (zero), the selected item, if any, is deselected. # # Optional B<FLAG> parameter ! # TVGN_CARET = Sets the selection to the given item. ! # TVGN_DROPHILITE = Redraws the given item in the style used to indicate the target of a drag-and-drop operation. # TVGN_FIRSTVISIBLE = Ensures that the specified item is visible, and, if possible, displays it at the top of the control's window. BOOL --- 853,862 ---- ########################################################################### # (@)METHOD:Select(NODE, [FLAG=TVGN_CARET]) ! # Selects the given B<NODE >in the TreeView. # If B<NODE> is 0 (zero), the selected item, if any, is deselected. # # Optional B<FLAG> parameter ! # TVGN_CARET = Sets the selection to the given item. ! # TVGN_DROPHILITE = Redraws the given item in the style used to indicate the target of a drag-and-drop operation. # TVGN_FIRSTVISIBLE = Ensures that the specified item is visible, and, if possible, displays it at the top of the control's window. BOOL *************** *** 1020,1024 **** ########################################################################### # (@)METHOD:SetScrollTime(TIME) ! # Sets the maximum scroll time for the tree view control. int SetScrollTime(handle,time) --- 1050,1054 ---- ########################################################################### # (@)METHOD:SetScrollTime(TIME) ! # Sets the maximum scroll time for the tree view control. int SetScrollTime(handle,time) *************** *** 1056,1060 **** ########################################################################### # (@)METHOD:SetUnicodeFormat(FLAG) ! # Sets the UNICODE character format flag for the control. BOOL SetUnicodeFormat(handle,flag) --- 1086,1090 ---- ########################################################################### # (@)METHOD:SetUnicodeFormat(FLAG) ! # Sets the UNICODE character format flag for the control. BOOL SetUnicodeFormat(handle,flag) *************** *** 1210,1211 **** --- 1240,1302 ---- RETVAL + + MODULE = Win32::GUI::TreeView PACKAGE = Win32::GUI::TreeView::CustomDraw + + PROTOTYPES: DISABLE + + ########################################################################### + # (@)PACKAGE:Win32::GUI::TreeView::CustomDraw + + #pragma message( "*** PACKAGE Win32::GUI::TreeView::CustomDraw..." ) + + ########################################################################### + # (@)METHOD:TextColor([COLOR]) + # Set or Get the CustomDraw -clrtext property. + # + # COLOR may be either a numerical value, + # or a color expressed as [RR, GG, BB], + # or a color expressed in HTML notation (#RRGGBB) + SV * + TextColor(handle,color=FALSE) + HWND handle + COLORREF color + PREINIT: + HV* hv = (HV*)SvRV(ST(0)); + CODE: + LPPERLWIN32GUI_NMTVCUSTOMDRAW lpCD = (LPPERLWIN32GUI_NMTVCUSTOMDRAW) handle; + if (items == 2) { + RETVAL = newSViv(color); + if(SvROK(ST(0))) + hv_store_mg(NOTXSCALL hv, "-clrtext", 8, RETVAL, 0); + lpCD->clrText = color; + } else { + RETVAL = newSViv(lpCD->clrText); + } + OUTPUT: + RETVAL + + ########################################################################### + # (@)METHOD:BackColor([COLOR]) + # Set or Get the CustomDraw -clrtextbk property. + # + # COLOR may be either a numerical value, + # or a color expressed as [RR, GG, BB], + # or a color expressed in HTML notation (#RRGGBB) + SV * + BackColor(handle,color=FALSE) + HWND handle + COLORREF color + PREINIT: + HV* hv = (HV*)SvRV(ST(0)); + CODE: + LPPERLWIN32GUI_NMTVCUSTOMDRAW lpCD = (LPPERLWIN32GUI_NMTVCUSTOMDRAW) handle; + if (items == 2) { + RETVAL = newSViv(color); + if(SvROK(ST(0))) + hv_store_mg(NOTXSCALL hv, "-clrtextbk", 10, RETVAL, 0); + lpCD->clrTextBk = color; + } else { + RETVAL = newSViv(lpCD->clrTextBk); + } + OUTPUT: + RETVAL Index: GUI_Options.cpp =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/GUI_Options.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** GUI_Options.cpp 11 Jan 2006 21:26:16 -0000 1.10 --- GUI_Options.cpp 16 Mar 2006 08:57:48 -0000 1.11 *************** *** 856,860 **** I32 items, int from_i, ! NOTIFYICONDATA *nid) { int i, next_i; --- 856,861 ---- I32 items, int from_i, ! NOTIFYICONDATA *nid) ! { int i, next_i; *************** *** 928,931 **** --- 929,935 ---- ParseNEMNotifyIconEvent( NOTXSCALL hvEvents, option+3, ST(next_i) ); + } else if(version < 5) { + ; + #if (_WIN32_IE > 0x0501) } else if(strcmp(option, "-behaviour") == 0) { next_i = i + 1; *************** *** 960,963 **** --- 964,968 ---- W32G_WARN("Win32::GUI: Invalid value for -balloon_icon!"); } + #endif } } else { Index: MANIFEST =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/MANIFEST,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** MANIFEST 11 Jan 2006 21:26:16 -0000 1.12 --- MANIFEST 16 Mar 2006 08:57:48 -0000 1.13 *************** *** 12,15 **** --- 12,16 ---- Button.xs CHANGELOG + CustomDraw.pm Combobox.xs cygwin.c *************** *** 79,82 **** --- 80,84 ---- samples/Animation.pl samples/BitmapScroll.pl + samples/CustomDraw.pl samples/DateTime.pl samples/Draw.pl *************** *** 85,88 **** --- 87,91 ---- samples/guiperl.ico samples/harrow.cur + samples/Listbox.pl samples/listview_drag_drop.pl samples/MDI.pl *************** *** 90,93 **** --- 93,99 ---- samples/Notepad.pl samples/NotifyIcon.pl + samples/pmx.pl + samples/pride.pl + samples/ProgressBar.pl samples/Region.pl samples/SplashScreen.pl *************** *** 108,111 **** --- 114,118 ---- samples/Tutorial_Part5_twoWindows.pl samples/Tutorial_Part9_noDosWindow.pl + samples/winppm.pl Splitter.xs StatusBar.xs *************** *** 128,131 **** --- 135,139 ---- t/06_Cursor.t t/06_Icon.t + t/07_CustomDraw.t t/50_Font_GetMetrics.t t/50_Richedit_GetCharFormat.t Index: GUI_MessageLoops.cpp =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/GUI_MessageLoops.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** GUI_MessageLoops.cpp 11 Jan 2006 21:26:16 -0000 1.17 --- GUI_MessageLoops.cpp 16 Mar 2006 08:57:48 -0000 1.18 *************** *** 170,180 **** } } - #ifdef PERLWIN32GUI_STRONGDEBUG - printf("!XS(CommonMsgLoop) returning DefWindowProc\n"); - #endif if (wndprocOriginal != NULL) { return CallWindowProc((WNDPROC_CAST) wndprocOriginal, hwnd, uMsg, wParam, lParam); } else { return DefWindowProc(hwnd, uMsg, wParam, lParam); } --- 170,183 ---- } } if (wndprocOriginal != NULL) { + #ifdef PERLWIN32GUI_STRONGDEBUG + printf("!XS(CommonMsgLoop) returning CallWindowProc 0x%x\n", wndprocOriginal); + #endif return CallWindowProc((WNDPROC_CAST) wndprocOriginal, hwnd, uMsg, wParam, lParam); } else { + #ifdef PERLWIN32GUI_STRONGDEBUG + printf("!XS(CommonMsgLoop) returning DefWindowProc\n"); + #endif return DefWindowProc(hwnd, uMsg, wParam, lParam); } *************** *** 323,328 **** --- 326,340 ---- PerlResult = DoEvent(NOTXSCALL childud, PERLWIN32GUI_NEM_LOSTFOCUS, "LostFocus", -1 ); break; + + /*case NM_CUSTOMDRAW: + PerlResult = DoEvent(NOTXSCALL childud, PERLWIN32GUI_NEM_PAINT, "CustomDraw", -1 ); + childud->forceResult = PerlResult; + break;*/ + default : PerlResult = OnEvent[childud->iClass](NOTXSCALL childud, uMsg, wParam, lParam); + #ifdef PERLWIN32GUI_STRONGDEBUG + printf("XS(WindowMsgLoop WM_NOTIFY default) (class=%d) => %d\n", childud->iClass, PerlResult); + #endif break; } *************** *** 627,637 **** case WM_DROPFILES: /* ! * (@)EVENT:DropFiles(DROP_HANDLE) * Sent when the window receives dropped files. ! * (@)APPLIES_TO:* */ ! PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_DROPFILE, "DropFiles", ! PERLWIN32GUI_ARGTYPE_LONG, (LONG) wParam, ! -1); break; } --- 639,658 ---- case WM_DROPFILES: /* ! * (@)EVENT:DropFiles(DRAGDROP) ! * (@)APPLIES_TO:Window, DialogBox ! * * Sent when the window receives dropped files. ! * ! * DRAGDROP - L<DragDrop|Win32::GUI::DragDrop> object. ! * */ ! ! #ifdef PERLWIN32GUI_STRONGDEBUG ! printf("XS(WindowMsgLoop DropFiles) (HDROP=0x%x)\n", wParam); ! #endif ! PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_DROPFILE, "DropFiles", ! PERLWIN32GUI_ARGTYPE_SV, ! CreateObjectWithHandle(NOTXSCALL "Win32::GUI::DragDrop", (HWND) wParam), ! -1 ); break; } *************** *** 966,972 **** break; case WM_DROPFILES: ! PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_DROPFILE, "DropFiles", ! PERLWIN32GUI_ARGTYPE_LONG, (LONG) wParam, ! -1); } --- 987,994 ---- break; case WM_DROPFILES: ! PerlResult = DoEvent(NOTXSCALL perlud, PERLWIN32GUI_NEM_DROPFILE, "DropFiles", ! PERLWIN32GUI_ARGTYPE_SV, ! CreateObjectWithHandle(NOTXSCALL "Win32::GUI::DragDrop", (HWND) wParam), ! -1 ); } Index: CHANGELOG =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/CHANGELOG,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** CHANGELOG 11 Jan 2006 21:26:14 -0000 1.70 --- CHANGELOG 16 Mar 2006 08:57:42 -0000 1.71 *************** *** 6,9 **** --- 6,32 ---- Win32-GUI ChangeLog =================== + + [Reini Urban] : 15 Mar 2006 + - GUI.pm : Change version to 1.04, add -dropfiles to Window + - GUI.h : add CustomDraw and DropFiles support, + start with thread safe static data definitions. + - Button.xs, Header.xs, ListView.xs, Rebar.xs, Toolbar.xs, Tooltip.xs, TreeView.xs: + add CustomDraw EVENT with Win32::GUI::Button::CustomDraw object as param. + abuse the PAINT constant for NEM, which should not conflict. + - CustomDraw.pm : CustomDraw package definition and helpers + - GUI.xs : DoEvents(hwnd=NULL,wMsgFilterMin=0,wMsgFilterMax=0,wRemoveMsg=PM_REMOVE), + Try additional OEM ressource in LoadImage, + Add Win32::GUI::DragDrop object which is passed to the DropFiles event as argument. + - GUI_Helpers.cpp: add SV* CreateNMCustomDraw() + - GUI_MessageLoops.cpp : Change DropFiles EVENT to pass the Win32::GUI::DragDrop object + - ImageList.xs: Add to documention. + - TYPEMAP: Add HDROP as first-class citizen (Win32::GUI::DragDrop) + - Window.xs: support -dropfiles property, store it onPostCreate in perlcs + - SrcParser.pm, Documentation.txt: fix some typos + - t/07_CustomDraw.t: added + - samples/CustomDraw.pl: added + - guard against Win32::GetFileVersion for older perls + - guard against undefined NOTIFYICONDATA for older compilers also (<= MSVC98) + - Upped version to 1.03_03 + + [Robert May] : 11 Jan 2006 - bug fixes and add balloon tips for Notify Icon - Label.xs correct -truncate option processing, as SS_.*ELLIPSIS.* Index: ImageList.xs =================================================================== RCS file: /cvsroot/perl-win32-gui/Win32-GUI/ImageList.xs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ImageList.xs 5 Oct 2005 22:20:49 -0000 1.7 --- ImageList.xs 16 Mar 2006 08:57:48 -0000 1.8 *************** *** 48,52 **** ########################################################################### # (@)METHOD:BeginDrag(INDEX, X, Y) ! # Creates a temporary image list that is used for dragging. BOOL BeginDrag(handle, index, x, y) --- 48,52 ---- ########################################################################### # (@)METHOD:BeginDrag(INDEX, X, Y) ! # Creates a temporary image list that is used for dragging. BOOL BeginDrag(handle, index, x, y) *************** *** 212,216 **** ########################################################################### # (@)METHOD:GetBkColor() ! # Retrieves the current background color for an image list. COLORREF GetBkColor(handle) --- 212,216 ---- ########################################################################### # (@)METHOD:GetBkColor() ! # Retrieves the current background color for an image list. COLORREF GetBkColor(handle) *************** *** 231,235 **** PREINIT: HICON hicon; ! PPCODE: hicon = ImageList_GetIcon(handle, index, flags); if (hicon == NULL) XSRETURN_UNDEF; --- 231,235 ---- PREINIT: HICON hicon; ! PPCODE: hicon = ImageList_GetIcon(handle, index, flags); if (hicon == NULL) XSRETURN_UNDEF; *************** *** 280,284 **** int cx UINT uFlags ! UINT uType COLORREF crMask HINSTANCE hi --- 280,284 ---- int cx UINT uFlags ! UINT uType COLORREF crMask HINSTANCE hi *************** *** 298,305 **** XPUSHs(CreateObjectWithHandle(NOTXSCALL "Win32::GUI::ImageList", (HWND) handle)); XSRETURN(1); ! ########################################################################### # (@)METHOD:Merge(INDEX1,INDEX2, DX,DY,[IMAGELIST=SELF]) ! # Creates a new image by combining two existing images. The function also creates a new image list in which to store the image. # Return a new Win32::GUI::ImageList object. void --- 298,305 ---- XPUSHs(CreateObjectWithHandle(NOTXSCALL "Win32::GUI::ImageList", (HWND) handle)); XSRETURN(1); ! ########################################################################### # (@)METHOD:Merge(INDEX1,INDEX2, DX,DY,[IMAGELIST=SELF]) ! # Creates a new image by combining two existing images. The function also creates a new image list in which to store the image. # Return a new Win32::GUI::ImageList object. void *************** *** 317,321 **** if (hnew == NULL) XSRETURN_UNDEF; XPUSHs(CreateObjectWithHandle(NOTXSCALL "Win32::GUI::ImageList", (HWND) hnew)); ! XSRETURN(1); # TODO : ImageList_Read --- 317,321 ---- if (hnew == NULL) XSRETURN_UNDEF; XPUSHs(CreateObjectWithHandle(NOTXSCALL "Win32::GUI::ImageList", (HWND) hnew)); ! XSRETURN(1); # TODO : ImageList_Read *************** *** 364,368 **** ##############################... [truncated message content] |
