[Oorexx-svn] SF.net SVN: oorexx: [1018] interpreter-3.x/branches/3.2.0/trunk/platform/ windows/oodialog/oovmsg.c

[<mie...@us...>]

Revision: 1018
          http://oorexx.svn.sourceforge.net/oorexx/?rev=1018&view=rev
Author:   miesfeld
Date:     2007-10-18 22:06:06 -0700 (Thu, 18 Oct 2007)

Log Message:
-----------
[ 1816242 ] The new connectListViewNotify(CLICK) implemented wrong.
Code for the test should not have been if / else, should have been if / or if.

Modified Paths:
--------------
    interpreter-3.x/branches/3.2.0/trunk/platform/windows/oodialog/oovmsg.c

Modified: interpreter-3.x/branches/3.2.0/trunk/platform/windows/oodialog/oovmsg.c
===================================================================
--- interpreter-3.x/branches/3.2.0/trunk/platform/windows/oodialog/oovmsg.c	2007-10-19 04:55:52 UTC (rev 1017)
+++ interpreter-3.x/branches/3.2.0/trunk/platform/windows/oodialog/oovmsg.c	2007-10-19 05:06:06 UTC (rev 1018)
@@ -150,10 +150,21 @@
                     {
                         LPNMITEMACTIVATE pIA = (LPNMITEMACTIVATE)lparam;
 
-                        if ( pIA->uKeyFlags == LVKF_ALT ) strcpy(tmp, "ALT");
-                        else if ( pIA->uKeyFlags == LVKF_CONTROL ) strcpy(tmp, "CONTROL");
-                        else if ( pIA->uKeyFlags == LVKF_SHIFT ) strcpy(tmp, "SHIFT");
-                        else strcpy(tmp, "NONE");
+                        if ( pIA->uKeyFlags == 0 )
+                        {
+                            strcpy(tmp, "NONE");
+                        }
+                        else
+                        {
+                            tmp[0] = '\0';
+
+                            if ( pIA->uKeyFlags & LVKF_SHIFT )
+                                strcpy(tmp, "SHIFT");
+                            if ( pIA->uKeyFlags & LVKF_CONTROL )
+                                tmp[0] == '\0' ? strcpy(tmp, "CONTROL") : strcat(tmp, " CONTROL");
+                            if ( pIA->uKeyFlags & LVKF_ALT )
+                                tmp[0] == '\0' ? strcpy(tmp, "ALT") : strcat(tmp, " ALT");
+                        }
                         np = tmp;
 
                         /* Don't drop through, use AddDialogMessage here and


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.