X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b39dbf34b887a73c525da903d8599f4f6b7eb8f9..4bd1fc29b235ef580d084b8ca95d4ee2372bb157:/src/msw/accel.cpp

diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp
index 66414b01a4..1dc9e4efc8 100644
--- a/src/msw/accel.cpp
+++ b/src/msw/accel.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        accel.cpp
+// Name:        src/msw/accel.cpp
 // Purpose:     wxAcceleratorTable
 // Author:      Julian Smart
 // Modified by:
@@ -9,17 +9,23 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "accel.h"
-#endif
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
+#if wxUSE_ACCEL
+
 #ifndef WX_PRECOMP
     #include "wx/window.h"
 #endif
@@ -27,79 +33,70 @@
 #include "wx/accel.h"
 
 #include "wx/msw/private.h"
+#include "wx/msw/private/keyboard.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
 
+// ----------------------------------------------------------------------------
+// data defining wxAcceleratorTable
+// ----------------------------------------------------------------------------
+
 class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData
 {
-    friend class WXDLLEXPORT wxAcceleratorTable;
+    friend class WXDLLIMPEXP_FWD_CORE wxAcceleratorTable;
 public:
     wxAcceleratorRefData();
-    ~wxAcceleratorRefData();
+    virtual ~wxAcceleratorRefData();
 
     inline HACCEL GetHACCEL() const { return m_hAccel; }
 protected:
     HACCEL      m_hAccel;
     bool        m_ok;
 
-    DECLARE_NO_COPY_CLASS(wxAcceleratorRefData)
+    wxDECLARE_NO_COPY_CLASS(wxAcceleratorRefData);
 };
 
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxAcceleratorRefData
+// ----------------------------------------------------------------------------
+
 #define M_ACCELDATA ((wxAcceleratorRefData *)m_refData)
 
 wxAcceleratorRefData::wxAcceleratorRefData()
 {
-  m_ok = FALSE;
-  m_hAccel = 0;
+    m_ok = false;
+    m_hAccel = 0;
 }
 
 wxAcceleratorRefData::~wxAcceleratorRefData()
 {
-  if (m_hAccel)
-  {
-    // This function not available in WIN16
-#if !defined(__WIN16__)
-    DestroyAcceleratorTable((HACCEL) m_hAccel);
-#endif
-  }
-  m_hAccel = 0 ;
-}
-
-wxAcceleratorTable::wxAcceleratorTable()
-{
-  m_refData = NULL;
+    if (m_hAccel)
+    {
+        DestroyAcceleratorTable((HACCEL) m_hAccel);
+    }
 }
 
-wxAcceleratorTable::~wxAcceleratorTable()
-{
-}
+// ----------------------------------------------------------------------------
+// wxAcceleratorTable
+// ----------------------------------------------------------------------------
 
 // Load from .rc resource
 wxAcceleratorTable::wxAcceleratorTable(const wxString& resource)
 {
     m_refData = new wxAcceleratorRefData;
 
-    HACCEL hAccel =
-#if defined(__WIN32__)
-#ifdef UNICODE
-        ::LoadAcceleratorsW(wxGetInstance(), (const wxChar *)resource);
-#else
-        ::LoadAcceleratorsA(wxGetInstance(), (const char *)resource);
-#endif
-#else
-        ::LoadAccelerators(wxGetInstance(), (const wxChar *)resource);
-#endif
+    HACCEL hAccel = ::LoadAccelerators(wxGetInstance(), resource.t_str());
     M_ACCELDATA->m_hAccel = hAccel;
-    M_ACCELDATA->m_ok = (hAccel != 0);
+    M_ACCELDATA->m_ok = hAccel != 0;
 }
 
-extern int wxCharCodeWXToMSW(int id, bool *isVirtual);
-
 // Create from an array
-#if !defined(__WIN16__)
 wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])
 {
-    // Not available in WIN16
     m_refData = new wxAcceleratorRefData;
 
     ACCEL* arr = new ACCEL[n];
@@ -107,23 +104,19 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]
     {
         int flags = entries[i].GetFlags();
 
-        BYTE fVirt = 0;
+        BYTE fVirt = FVIRTKEY;
         if ( flags & wxACCEL_ALT )
-            fVirt |= FALT | FVIRTKEY;
+            fVirt |= FALT;
         if ( flags & wxACCEL_SHIFT )
-            fVirt |= FSHIFT | FVIRTKEY;
+            fVirt |= FSHIFT;
         if ( flags & wxACCEL_CTRL )
-            fVirt |= FCONTROL | FVIRTKEY;
-
-        bool isVirtual;
+            fVirt |= FCONTROL;
 
-        WORD key = wxCharCodeWXToMSW(entries[i].GetKeyCode(), &isVirtual);
-        if (isVirtual)
-            fVirt |= FVIRTKEY;
+        WORD key = wxMSWKeyboard::WXToVK(entries[i].GetKeyCode());
 
         arr[i].fVirt = fVirt;
         arr[i].key = key;
-        arr[i].cmd = entries[i].GetCommand();
+        arr[i].cmd = (WORD)entries[i].GetCommand();
     }
 
     M_ACCELDATA->m_hAccel = ::CreateAcceleratorTable(arr, n);
@@ -131,16 +124,8 @@ 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() const
+bool wxAcceleratorTable::IsOk() const
 {
     return (M_ACCELDATA && (M_ACCELDATA->m_ok));
 }
@@ -163,6 +148,8 @@ WXHACCEL wxAcceleratorTable::GetHACCEL() const
 bool wxAcceleratorTable::Translate(wxWindow *window, WXMSG *wxmsg) const
 {
     MSG *msg = (MSG *)wxmsg;
-    return Ok() && ::TranslateAccelerator(GetHwndOf(window), GetHaccel(), msg);
+    return IsOk() && ::TranslateAccelerator(GetHwndOf(window), GetHaccel(), msg);
 }
 
+#endif // wxUSE_ACCEL
+