applied patch for compilation with gcc 3.0

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

diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp
index e433443dd3c681badc091cf21d1284ca316aae3e..0e86f39c36e2a29e6f6e05d526145be79fe15b35 100644 (file)
--- a/src/msw/accel.cpp
+++ b/src/msw/accel.cpp
@@ -108,15 +108,25 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]
     {
         BYTE fVirt = 0;
         if (entries[i].m_flags & wxACCEL_ALT)
     {
         BYTE fVirt = 0;
         if (entries[i].m_flags & wxACCEL_ALT)

+        {

             fVirt |= FALT;
             fVirt |= FALT;

+            fVirt |= FVIRTKEY;
+        }

         if (entries[i].m_flags & wxACCEL_SHIFT)
         if (entries[i].m_flags & wxACCEL_SHIFT)

+        {

             fVirt |= FSHIFT;
             fVirt |= FSHIFT;

+            fVirt |= FVIRTKEY;
+        }

         if (entries[i].m_flags & wxACCEL_CTRL)
         if (entries[i].m_flags & wxACCEL_CTRL)

+        {

             fVirt |= FCONTROL;
             fVirt |= FCONTROL;

+            fVirt |= FVIRTKEY;
+        }

 
         bool isVirtual;
         WORD key = wxCharCodeWXToMSW(entries[i].m_keyCode, & isVirtual);
 
         bool isVirtual;
         WORD key = wxCharCodeWXToMSW(entries[i].m_keyCode, & isVirtual);

-        fVirt |= FVIRTKEY;
+        if (isVirtual)
+            fVirt |= FVIRTKEY;

 
         WORD cmd = entries[i].m_command;
 
 
         WORD cmd = entries[i].m_command;
 


@@ -162,7 +172,6 @@ WXHACCEL wxAcceleratorTable::GetHACCEL() const
 bool wxAcceleratorTable::Translate(wxWindow *window, WXMSG *wxmsg) const
 {
     MSG *msg = (MSG *)wxmsg;
 bool wxAcceleratorTable::Translate(wxWindow *window, WXMSG *wxmsg) const
 {
     MSG *msg = (MSG *)wxmsg;

-

     return Ok() && ::TranslateAccelerator(GetHwndOf(window), GetHaccel(), msg);
 }
 
     return Ok() && ::TranslateAccelerator(GetHwndOf(window), GetHaccel(), msg);
 }