include "wx/toolbar.h" instead of tbar(base|smpl).h

[wxWidgets.git] / src / msw / ole / access.cpp

diff --git a/src/msw/ole/access.cpp b/src/msw/ole/access.cpp
index 23e633be8e15d7b64e62fc52d9e939c9af921579..05d2d1c7ad27c345cf8be1cd0f8780ec937a9261 100644 (file)
--- a/src/msw/ole/access.cpp
+++ b/src/msw/ole/access.cpp
@@ -49,6 +49,7 @@
 #include <oleacc.h>
 #include <winable.h>
 
+#include "wx/msw/winundef.h"
 #include "wx/msw/ole/oleutils.h"
 
 #ifndef CHILDID_SELF
@@ -79,7 +80,7 @@ class wxIEnumVARIANT : public IEnumVARIANT
 {
 public:
     wxIEnumVARIANT(const wxVariant& variant);
-    ~wxIEnumVARIANT() { }
+    virtual ~wxIEnumVARIANT() { }
 
     DECLARE_IUNKNOWN_METHODS;
 
@@ -1081,7 +1082,7 @@ STDMETHODIMP wxIAccessible::get_accKeyboardShortcut ( VARIANT varID, BSTR* pszKe
     }
     
     wxString keyboardShortcut;
-    wxAccStatus status = m_pAccessible->GetHelpText(varID.lVal, & keyboardShortcut);
+    wxAccStatus status = m_pAccessible->GetKeyboardShortcut(varID.lVal, & keyboardShortcut);
     if (status == wxACC_FAIL)
         return E_FAIL;