Enable variadic macros for VC9 and later.

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

diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp
index dfcb758f2b5663e046224a3bfe48007b8f6a341d..434df30367cd47b2a4da226438ce73791419467a 100644 (file)
--- a/src/msw/accel.cpp
+++ b/src/msw/accel.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msw/accel.cpp
+// Name:        src/msw/accel.cpp

 // Purpose:     wxAcceleratorTable
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxAcceleratorTable
 // Author:      Julian Smart
 // Modified by:


@@ -33,8 +33,7 @@
 #include "wx/accel.h"
 
 #include "wx/msw/private.h"
 #include "wx/accel.h"
 
 #include "wx/msw/private.h"

-
-extern WXWORD wxCharCodeWXToMSW(int id, bool *isVirtual);
+#include "wx/msw/private/keyboard.h"

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


@@ -105,19 +104,15 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]
     {
         int flags = entries[i].GetFlags();
 
     {
         int flags = entries[i].GetFlags();
 

-        BYTE fVirt = 0;
+        BYTE fVirt = FVIRTKEY;

         if ( flags & wxACCEL_ALT )
         if ( flags & wxACCEL_ALT )

-            fVirt |= FALT | FVIRTKEY;
+            fVirt |= FALT;

         if ( flags & wxACCEL_SHIFT )
         if ( flags & wxACCEL_SHIFT )

-            fVirt |= FSHIFT | FVIRTKEY;
+            fVirt |= FSHIFT;

         if ( flags & wxACCEL_CTRL )
         if ( flags & wxACCEL_CTRL )

-            fVirt |= FCONTROL | FVIRTKEY;
-
-        bool isVirtual;
+            fVirt |= FCONTROL;

 
 

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

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


@@ -153,7 +148,7 @@ 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 IsOk() && ::TranslateAccelerator(GetHwndOf(window), GetHaccel(), msg);

 }
 
 #endif // wxUSE_ACCEL
 }
 
 #endif // wxUSE_ACCEL