Further fixes to references

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

diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp
index c31731046f5f199746040d46088a69fc6d90c2f1..559f3eaae76dad28bdcaf4794dc6ae9f908a1b70 100644 (file)
--- a/src/msw/accel.cpp
+++ b/src/msw/accel.cpp
@@ -21,18 +21,14 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include <stdio.h>
-#include "wx/setup.h"
-#include "wx/window.h"
+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/msw/accel.h"
+#include "wx/accel.h"

 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 

-#if !USE_SHARED_LIBRARIES

 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)

-#endif

 
 class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData
 {
 
 class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData
 {


@@ -105,26 +101,27 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]
     m_refData = new wxAcceleratorRefData;
 
     ACCEL* arr = new ACCEL[n];
     m_refData = new wxAcceleratorRefData;
 
     ACCEL* arr = new ACCEL[n];

-    int i;
-    for (i = 0; i < n; i++)
+    for ( int i = 0; i < n; i++ )

     {
     {

+        int flags = entries[i].GetFlags();
+

         BYTE fVirt = 0;
         BYTE fVirt = 0;

-        if (entries[i].m_flags & wxACCEL_ALT)
-            fVirt |= FALT;
-        if (entries[i].m_flags & wxACCEL_SHIFT)
-            fVirt |= FSHIFT;
-        if (entries[i].m_flags & wxACCEL_CTRL)
-            fVirt |= FCONTROL;
+        if ( flags & wxACCEL_ALT )
+            fVirt |= FALT | FVIRTKEY;
+        if ( flags & wxACCEL_SHIFT )
+            fVirt |= FSHIFT | FVIRTKEY;
+        if ( flags & wxACCEL_CTRL )
+            fVirt |= FCONTROL | FVIRTKEY;

 
         bool isVirtual;
 
         bool isVirtual;

-        WORD key = wxCharCodeWXToMSW(entries[i].m_keyCode, & isVirtual);
-        fVirt |= FVIRTKEY;

 
 

-        WORD cmd = entries[i].m_command;
+        WORD key = wxCharCodeWXToMSW(entries[i].GetKeyCode(), &isVirtual);
+        if (isVirtual)
+            fVirt |= FVIRTKEY;

 
         arr[i].fVirt = fVirt;
         arr[i].key = key;
 
         arr[i].fVirt = fVirt;
         arr[i].key = key;

-        arr[i].cmd = cmd;
+        arr[i].cmd = entries[i].GetCommand();

     }
 
     M_ACCELDATA->m_hAccel = ::CreateAcceleratorTable(arr, n);
     }
 
     M_ACCELDATA->m_hAccel = ::CreateAcceleratorTable(arr, n);


@@ -164,5 +161,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); }