Added GUI part of AppTraits for OS/2.

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

diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp
index 1c4c6fe2cf0b34a936866a36943e2443b591aa5f..563ce9929ce8b148886ac22311929672dc8deba2 100644 (file)
--- a/src/msw/accel.cpp
+++ b/src/msw/accel.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "accel.h"
 #endif
 
@@ -21,12 +21,10 @@
 #endif
 
 #ifndef WX_PRECOMP
-#include <stdio.h>
-#include "wx/setup.h"
-#include "wx/window.h"
+    #include "wx/window.h"
 #endif
 
-#include "wx/msw/accel.h"
+#include "wx/accel.h"
 
 #include "wx/msw/private.h"
 
@@ -43,6 +41,8 @@ public:
 protected:
     HACCEL      m_hAccel;
     bool        m_ok;
+
+    DECLARE_NO_COPY_CLASS(wxAcceleratorRefData)
 };
 
 #define M_ACCELDATA ((wxAcceleratorRefData *)m_refData)
@@ -58,7 +58,7 @@ wxAcceleratorRefData::~wxAcceleratorRefData()
   if (m_hAccel)
   {
     // This function not available in WIN16
-#if !defined(__WIN16__) && !defined(__TWIN32__)
+#if !defined(__WIN16__)
     DestroyAcceleratorTable((HACCEL) m_hAccel);
 #endif
   }
@@ -80,7 +80,7 @@ wxAcceleratorTable::wxAcceleratorTable(const wxString& resource)
     m_refData = new wxAcceleratorRefData;
 
     HACCEL hAccel =
-#if defined(__WIN32__) && !defined(__TWIN32__)
+#if defined(__WIN32__)
 #ifdef UNICODE
         ::LoadAcceleratorsW(wxGetInstance(), (const wxChar *)resource);
 #else
@@ -96,34 +96,34 @@ wxAcceleratorTable::wxAcceleratorTable(const wxString& resource)
 extern int wxCharCodeWXToMSW(int id, bool *isVirtual);
 
 // Create from an array
-#if !defined(__WIN16__) && !defined(__TWIN32__) && !defined(__WXWINE__)
+#if !defined(__WIN16__)
 wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])
 {
     // Not available in WIN16
     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;
-        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;
-        WORD key = wxCharCodeWXToMSW(entries[i].m_keyCode, & isVirtual);
+
+        WORD key = wxCharCodeWXToMSW(entries[i].GetKeyCode(), &isVirtual);
         if (isVirtual)
             fVirt |= FVIRTKEY;
 
-        WORD cmd = entries[i].m_command;
-
         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);