X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/252eb8fd71f9c118efdcea5e77a6395654757411..342751763793b5cdad252d731aac0618d0674e5b:/src/msw/accel.cpp?ds=sidebyside diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp index 86a28418e4..e433443dd3 100644 --- a/src/msw/accel.cpp +++ b/src/msw/accel.cpp @@ -23,25 +23,21 @@ #ifndef WX_PRECOMP #include #include "wx/setup.h" +#include "wx/window.h" #endif -#include "wx/msw/private.h" #include "wx/msw/accel.h" -#ifdef LoadAccelerators -#undef LoadAccelerators -#endif +#include "wx/msw/private.h" -#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: @@ -61,7 +57,10 @@ wxAcceleratorRefData::~wxAcceleratorRefData() { if (m_hAccel) { + // This function not available in WIN16 +#if !defined(__WIN16__) && !defined(__TWIN32__) DestroyAcceleratorTable((HACCEL) m_hAccel); +#endif } m_hAccel = 0 ; } @@ -81,14 +80,14 @@ wxAcceleratorTable::wxAcceleratorTable(const wxString& resource) m_refData = new wxAcceleratorRefData; HACCEL hAccel = -#ifdef __WIN32__ +#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); @@ -97,8 +96,10 @@ wxAcceleratorTable::wxAcceleratorTable(const wxString& resource) 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 m_refData = new wxAcceleratorRefData; ACCEL* arr = new ACCEL[n]; @@ -129,8 +130,16 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[] 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(void) const +bool wxAcceleratorTable::Ok() const { return (M_ACCELDATA && (M_ACCELDATA->m_ok)); } @@ -150,3 +159,10 @@ WXHACCEL wxAcceleratorTable::GetHACCEL() const 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); +} +