X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/27a9bd487b5ee30238e35ff4962bf70237cfc2c0..065de61268db77ee2424fdba219a25baaece0265:/src/msw/tbarmsw.cpp?ds=sidebyside

diff --git a/src/msw/tbarmsw.cpp b/src/msw/tbarmsw.cpp
index 3ca04af78b..7f23bf7f63 100644
--- a/src/msw/tbarmsw.cpp
+++ b/src/msw/tbarmsw.cpp
@@ -56,7 +56,7 @@
 #endif
 
 #if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxToolBarMSW, wxToolBarBase)
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
 
 BEGIN_EVENT_TABLE(wxToolBarMSW, wxToolBarBase)
 	EVT_SIZE(wxToolBarMSW::OnSize)
@@ -193,7 +193,7 @@ void wxToolBarMSW::OnMouseEvent(wxMouseEvent& event)
   }
 
   long x, y;
-  event.Position(&x, &y);
+  event.GetPosition(&x, &y);
   wxToolBarTool *tool = FindToolForPosition(x, y);
 
   if (!tool)
@@ -944,7 +944,7 @@ WXHBITMAP wxToolBarMSW::CreateMappedBitmap(WXHINSTANCE WXUNUSED(hInstance), void
 
 WXHBITMAP wxToolBarMSW::CreateMappedBitmap(WXHINSTANCE hInstance, WXHBITMAP hBitmap)
 {
-  HANDLE hDIB = BitmapToDIB((HBITMAP) hBitmap, 0);
+  HANDLE hDIB = wxBitmapToDIB((HBITMAP) hBitmap, 0);
   if (hDIB)
   {
 #ifdef __WINDOWS_386__