// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "accel.h"
#endif
#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"
+
+#if wxUSE_ACCEL
#include "wx/msw/private.h"
protected:
HACCEL m_hAccel;
bool m_ok;
+
+ DECLARE_NO_COPY_CLASS(wxAcceleratorRefData)
};
#define M_ACCELDATA ((wxAcceleratorRefData *)m_refData)
wxAcceleratorRefData::wxAcceleratorRefData()
{
- m_ok = FALSE;
+ m_ok = false;
m_hAccel = 0;
}
{
if (m_hAccel)
{
- // This function not available in WIN16
-#if !defined(__WIN16__) && !defined(__TWIN32__)
DestroyAcceleratorTable((HACCEL) m_hAccel);
-#endif
}
m_hAccel = 0 ;
}
m_refData = new wxAcceleratorRefData;
HACCEL hAccel =
-#if defined(__WIN32__) && !defined(__TWIN32__)
+#if defined(__WIN32__)
#ifdef UNICODE
::LoadAcceleratorsW(wxGetInstance(), (const wxChar *)resource);
#else
M_ACCELDATA->m_ok = (hAccel != 0);
}
-extern int wxCharCodeWXToMSW(int id, bool *isVirtual);
+extern WXWORD wxCharCodeWXToMSW(int id, bool *isVirtual);
// Create from an array
-#if !defined(__WIN16__) && !defined(__TWIN32__) && !defined(__WXWINE__)
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;
- fVirt |= FVIRTKEY;
- }
- if (entries[i].m_flags & wxACCEL_SHIFT)
- {
- fVirt |= FSHIFT;
- fVirt |= FVIRTKEY;
- }
- if (entries[i].m_flags & wxACCEL_CTRL)
- {
- fVirt |= FCONTROL;
- fVirt |= FVIRTKEY;
- }
+ 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 = (WORD)entries[i].GetCommand();
}
M_ACCELDATA->m_hAccel = ::CreateAcceleratorTable(arr, n);
M_ACCELDATA->m_ok = (M_ACCELDATA->m_hAccel != 0);
}
-#else // Win16
-wxAcceleratorTable::wxAcceleratorTable(int WXUNUSED(n), const wxAcceleratorEntry WXUNUSED(entries)[])
-{
- // No, we simply gracefully degrade; we don't expect the
- // developer to pepper their code with #ifdefs just for this.
- // wxFAIL_MSG("not implemented");
-}
-#endif // Win32/16
bool wxAcceleratorTable::Ok() const
{
return Ok() && ::TranslateAccelerator(GetHwndOf(window), GetHaccel(), msg);
}
+#endif