#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"
-#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
-#endif
class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData
{
protected:
HACCEL m_hAccel;
bool m_ok;
+
+ DECLARE_NO_COPY_CLASS(wxAcceleratorRefData)
};
#define M_ACCELDATA ((wxAcceleratorRefData *)m_refData)
extern int wxCharCodeWXToMSW(int id, bool *isVirtual);
// Create from an array
-#if !defined(__WIN16__) && !defined(__TWIN32__) && !defined(__WXWINE__)
+#if !defined(__WIN16__) && !defined(__TWIN32__)
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);
- 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].cmd = cmd;
+ arr[i].cmd = entries[i].GetCommand();
}
M_ACCELDATA->m_hAccel = ::CreateAcceleratorTable(arr, n);
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); }