use symbolic name for the shell menu bar too; include resources.h in wince.rc directl...

[wxWidgets.git] / src / msw / accel.cpp

diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp
index b1451eedfe71bd53247412bc7890e63a5a0fb555..5a13ad0fa40071e1992c185fdf5b9c5d6a96c691 100644 (file)
--- a/src/msw/accel.cpp
+++ b/src/msw/accel.cpp
@@ -90,7 +90,7 @@ wxAcceleratorTable::wxAcceleratorTable(const wxString& resource)
 {
     m_refData = new wxAcceleratorRefData;
 
-    HACCEL hAccel = ::LoadAccelerators(wxGetInstance(), resource);
+    HACCEL hAccel = ::LoadAccelerators(wxGetInstance(), resource.wx_str());
     M_ACCELDATA->m_hAccel = hAccel;
     M_ACCELDATA->m_ok = hAccel != 0;
 }
@@ -130,16 +130,6 @@ 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::IsOk() const
 {
     return (M_ACCELDATA && (M_ACCELDATA->m_ok));