adapted to new APIs for threads and floodfilling

[wxWidgets.git] / src / os2 / accel.cpp

diff --git a/src/os2/accel.cpp b/src/os2/accel.cpp
index 611f53c95985557305158c9a98b50e1738a28121..8e1c6f43b6e2b8863c1e7aab5f2b9a1219b891e5 100644 (file)
--- a/src/os2/accel.cpp
+++ b/src/os2/accel.cpp
@@ -120,11 +120,20 @@ wxAcceleratorTable::wxAcceleratorTable(
         USHORT                      uVirt = AF_CHAR;
 
         if (vaEntries[i].GetFlags() & wxACCEL_ALT)
         USHORT                      uVirt = AF_CHAR;
 
         if (vaEntries[i].GetFlags() & wxACCEL_ALT)

+        {

             uVirt |= AF_ALT;
             uVirt |= AF_ALT;

+            uVirt |= AF_VIRTUALKEY;
+        }

         if (vaEntries[i].GetFlags() & wxACCEL_SHIFT)
         if (vaEntries[i].GetFlags() & wxACCEL_SHIFT)

+        {

             uVirt |= AF_SHIFT;
             uVirt |= AF_SHIFT;

+            uVirt |= AF_VIRTUALKEY;
+        }

         if (vaEntries[i].GetFlags() & wxACCEL_CTRL)
         if (vaEntries[i].GetFlags() & wxACCEL_CTRL)

+        {

             uVirt |= AF_CONTROL;
             uVirt |= AF_CONTROL;

+            uVirt |= AF_VIRTUALKEY;
+        }

 
         bool                        bIsVirtual;
         USHORT                      uKey = wxCharCodeWXToOS2( vaEntries[i].GetKeyCode()
 
         bool                        bIsVirtual;
         USHORT                      uKey = wxCharCodeWXToOS2( vaEntries[i].GetKeyCode()


@@ -199,10 +208,5 @@ bool wxAcceleratorTable::Translate(
         int x = 1;
     }
     return (Ok() && rc);
         int x = 1;
     }
     return (Ok() && rc);

-//    ::WinTranslateAccel( vHabmain
-//                        ,(HWND)hWnd
-//                        ,GetHaccel()
-//                        ,pMsg
-//                       );

 } // end of wxAcceleratorTable::Translate
 
 } // end of wxAcceleratorTable::Translate