X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/907173e51df6d2a91d65463ddf6ce810d3fd921a..da865fdd325f7833246eecd665849b14f43e19d7:/src/msw/accel.cpp

diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp
index cad9c19c30..02bdacf289 100644
--- a/src/msw/accel.cpp
+++ b/src/msw/accel.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        accel.cpp
+// Name:        msw/accel.cpp
 // Purpose:     wxAcceleratorTable
 // Author:      Julian Smart
 // Modified by:
@@ -9,29 +9,43 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// ============================================================================
+// declarations
+// ============================================================================
+
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "accel.h"
+    #pragma implementation "accel.h"
 #endif
 
+// ----------------------------------------------------------------------------
+// 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
 
 #include "wx/accel.h"
 
-#if wxUSE_ACCEL
-
 #include "wx/msw/private.h"
 
+extern WXWORD wxCharCodeWXToMSW(int id, bool *isVirtual);
+
 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
 
+// ----------------------------------------------------------------------------
+// data defining wxAcceleratorTable
+// ----------------------------------------------------------------------------
+
 class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData
 {
     friend class WXDLLEXPORT wxAcceleratorTable;
@@ -47,53 +61,44 @@ protected:
     DECLARE_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)
-  {
-    DestroyAcceleratorTable((HACCEL) m_hAccel);
-  }
-  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);
     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
 wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])
 {
@@ -114,13 +119,13 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]
 
         bool isVirtual;
 
-        WORD key = (WORD)wxCharCodeWXToMSW(entries[i].GetKeyCode(), &isVirtual);
+        WORD key = wxCharCodeWXToMSW(entries[i].GetKeyCode(), &isVirtual);
         if (isVirtual)
             fVirt |= FVIRTKEY;
 
         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);
@@ -129,6 +134,16 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]
     M_ACCELDATA->m_ok = (M_ACCELDATA->m_hAccel != 0);
 }
 
+bool wxAcceleratorTable::operator==(const wxAcceleratorTable& accel) const
+{
+    const wxAcceleratorRefData *
+        accelData = (wxAcceleratorRefData *)accel.m_refData;
+
+    return m_refData ? (accelData &&
+                           M_ACCELDATA->m_hAccel == accelData->m_hAccel)
+                     : !accelData;
+}
+
 bool wxAcceleratorTable::Ok() const
 {
     return (M_ACCELDATA && (M_ACCELDATA->m_ok));
@@ -155,4 +170,5 @@ bool wxAcceleratorTable::Translate(wxWindow *window, WXMSG *wxmsg) const
     return Ok() && ::TranslateAccelerator(GetHwndOf(window), GetHaccel(), msg);
 }
 
-#endif
+#endif // wxUSE_ACCEL
+