X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/89b892a2982c7f3bb67837835c2701bd70cdd2bc..4a33eba645f96bf7a89397d7dbadd7d62ee2fde1:/src/msw/tbar95.cpp

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 5466c564ef..dd58502449 100644
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -75,12 +75,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolBar95, wxToolBarBase)
 #endif
 
 BEGIN_EVENT_TABLE(wxToolBar95, wxToolBarBase)
-#if 0 // it seems like none of these functions does anything anyhow
     EVT_SIZE(wxToolBar95::OnSize)
     EVT_PAINT(wxToolBar95::OnPaint)
-    EVT_KILL_FOCUS(wxToolBar95::OnKillFocus)
     EVT_MOUSE_EVENTS(wxToolBar95::OnMouseEvent)
-#endif // 0
+    EVT_KILL_FOCUS(wxToolBar95::OnKillFocus)
     EVT_SYS_COLOUR_CHANGED(wxToolBar95::OnSysColourChanged)
 END_EVENT_TABLE()
 
@@ -490,7 +488,7 @@ wxToolBarTool *wxToolBar95::AddTool(int index, const wxBitmap& bitmap, const wxB
   else
     tool->m_y = m_yMargin;
 
-  tool->SetSize(GetDefaultButtonWidth(), GetDefaultButtonHeight());
+  tool->SetSize(GetToolSize().x, GetToolSize().y);
 
   m_tools.Append((long)index, tool);
   return tool;
@@ -513,6 +511,20 @@ void wxToolBar95::OnSysColourChanged(wxSysColourChangedEvent& event)
     wxWindow::OnSysColourChanged(event);
 }
 
+void wxToolBar95::OnMouseEvent(wxMouseEvent& event)
+{
+    if (event.RightDown())
+    {
+        // For now, we don't have an id. Later we could
+        // try finding the tool.
+        OnRightClick((int)-1, event.GetX(), event.GetY());
+    }
+    else
+    {
+        Default();
+    }
+}
+
 // These are the default colors used to map the bitmap colors
 // to the current system colors