#include "wx/msw/private.h"
-#ifdef LoadAccelerators
-#undef LoadAccelerators
-#endif
-
-#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
-#endif
class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData
{
friend class WXDLLEXPORT wxAcceleratorTable;
public:
- wxAcceleratorRefData(void);
- ~wxAcceleratorRefData(void);
+ wxAcceleratorRefData();
+ ~wxAcceleratorRefData();
inline HACCEL GetHACCEL() const { return m_hAccel; }
protected:
HACCEL hAccel =
#if defined(__WIN32__) && !defined(__TWIN32__)
#ifdef UNICODE
- ::LoadAcceleratorsW(wxGetInstance(), (const char *)resource);
+ ::LoadAcceleratorsW(wxGetInstance(), (const wxChar *)resource);
#else
::LoadAcceleratorsA(wxGetInstance(), (const char *)resource);
#endif
#else
- ::LoadAccelerators(wxGetInstance(), (const char *)resource);
+ ::LoadAccelerators(wxGetInstance(), (const wxChar *)resource);
#endif
M_ACCELDATA->m_hAccel = hAccel;
M_ACCELDATA->m_ok = (hAccel != 0);
extern int 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
-#if !defined(__WIN16__) && !defined(__TWIN32__)
m_refData = new wxAcceleratorRefData;
ACCEL* arr = new ACCEL[n];
{
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;
+ }
bool isVirtual;
WORD key = wxCharCodeWXToMSW(entries[i].m_keyCode, & isVirtual);
- fVirt |= FVIRTKEY;
+ if (isVirtual)
+ fVirt |= FVIRTKEY;
WORD cmd = entries[i].m_command;
delete[] arr;
M_ACCELDATA->m_ok = (M_ACCELDATA->m_hAccel != 0);
-#endif
}
+#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(void) const
+bool wxAcceleratorTable::Ok() const
{
return (M_ACCELDATA && (M_ACCELDATA->m_ok));
}
return (WXHACCEL) M_ACCELDATA->m_hAccel;
}
+bool wxAcceleratorTable::Translate(wxWindow *window, WXMSG *wxmsg) const
+{
+ MSG *msg = (MSG *)wxmsg;
+ return Ok() && ::TranslateAccelerator(GetHwndOf(window), GetHaccel(), msg);
+}
+