X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2a47d3c193a8358f9be6a9249af28b6cb10eacff..7b9da2077d0975db6c965a85c91d5aca671ab5e3:/src/msw/tbarmsw.cpp

diff --git a/src/msw/tbarmsw.cpp b/src/msw/tbarmsw.cpp
index 2e5fdab316..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)
@@ -347,7 +347,7 @@ wxToolBarTool *wxToolBarMSW::AddTool(int index, const wxBitmap& bitmap, const wx
   wxBitmap bitmap2;
   if (toggle)
   {
-    bitmap2.SetHBITMAP( (WXHBITMAP) CreateMappedBitmap(wxGetInstance(), (HBITMAP) ((wxBitmap& )bitmap).GetHBITMAP()));
+    bitmap2.SetHBITMAP( (WXHBITMAP) CreateMappedBitmap((WXHINSTANCE)wxGetInstance(), (WXHBITMAP) ((wxBitmap& )bitmap).GetHBITMAP()));
   }
 
   wxToolBarTool *tool = new wxToolBarTool(index, bitmap, bitmap2, toggle, xPos, yPos, helpString1, helpString2);
@@ -381,7 +381,7 @@ wxToolBarTool *wxToolBarMSW::AddTool(int index, const wxBitmap& bitmap, const wx
   return tool;
 }
 
-void wxToolBarMSW::Layout(void)
+void wxToolBarMSW::LayoutTools()
 {
   m_currentRowsOrColumns = 0;
   m_lastX = m_xMargin;
@@ -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__