X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7cacb43db1e69b87b257a67912b4d52995b070a..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/msw/accel.cpp?ds=inline diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp index b1451eedfe..2504eeafac 100644 --- a/src/msw/accel.cpp +++ b/src/msw/accel.cpp @@ -44,7 +44,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject) class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData { - friend class WXDLLEXPORT wxAcceleratorTable; + friend class WXDLLIMPEXP_FWD_CORE wxAcceleratorTable; public: wxAcceleratorRefData(); virtual ~wxAcceleratorRefData(); @@ -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));