As small as possible reorganization within wxDateTime to please PCH in DLL build...

[wxWidgets.git] / src / msw / tbar95.cpp

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index c5d3aaa39e9bb9a4dd0cc1ef445dcf62000e27e8..28f96b3f93bb5fb7860bb127cfb6d47ab2ef2ff1 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -350,6 +350,7 @@ wxSize wxToolBar::DoGetBestSize() const
         // maybe an old (< 0x400) Windows version? try to approximate the
         // toolbar size ourselves
         sizeBest = GetToolSize();
         // maybe an old (< 0x400) Windows version? try to approximate the
         // toolbar size ourselves
         sizeBest = GetToolSize();

+        sizeBest.y += 2 * ::GetSystemMetrics(SM_CYBORDER); // Add borders

         sizeBest.x *= GetToolsCount();
 
         // reverse horz and vertical components if necessary
         sizeBest.x *= GetToolsCount();
 
         // reverse horz and vertical components if necessary


@@ -1210,11 +1211,14 @@ void wxToolBar::OnMouseEvent(wxMouseEvent& event)
         return;
     }
 
         return;
     }
 

-    if (event.RightDown())
+    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());
+        // find the tool under the mouse
+        wxCoord x,y;
+        event.GetPosition(&x, &y);
+
+        wxToolBarToolBase *tool = FindToolForPosition(x, y);
+        OnRightClick(tool ? tool->GetId() : -1, x, y);

     }
     else
     {
     }
     else
     {