Honour wxSB_WRAP in wxMotif spin button

[wxWidgets.git] / src / os2 / toolbar.cpp

diff --git a/src/os2/toolbar.cpp b/src/os2/toolbar.cpp
index a64272e0ab4129386d393612881ed35c95dcadc6..e432c1b1c615e0ae60b40d17c391795dd22659a7 100644 (file)
--- a/src/os2/toolbar.cpp
+++ b/src/os2/toolbar.cpp
@@ -17,6 +17,8 @@
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/window.h"
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/window.h"

+    #include "wx/frame.h"
+    #include "wx/app.h"

     #include "wx/dcclient.h"
     #include "wx/dcmemory.h"
 #endif
     #include "wx/dcclient.h"
     #include "wx/dcmemory.h"
 #endif


@@ -976,7 +978,7 @@ void wxToolBar::OnMouseEvent(
                 m_pToolTip = new wxToolTip(pTool->GetShortHelp());
                 m_vXMouse = (wxCoord)vPoint.x;
                 m_vYMouse = (wxCoord)vPoint.y;
                 m_pToolTip = new wxToolTip(pTool->GetShortHelp());
                 m_vXMouse = (wxCoord)vPoint.x;
                 m_vYMouse = (wxCoord)vPoint.y;

-                m_vToolTimer.Start(3000L, TRUE);
+                m_vToolTimer.Start(1000L, TRUE);

             }
             if (!pTool->IsToggled())
                 RaiseTool(pTool);
             }
             if (!pTool->IsToggled())
                 RaiseTool(pTool);


@@ -1439,7 +1441,7 @@ void wxToolBar::OnTimer (
   wxTimerEvent&                     rEvent
 )
 {
   wxTimerEvent&                     rEvent
 )
 {

-    if (rEvent.GetId() == (int)m_vToolTimer.GetTimerId())
+    if (rEvent.GetId() == m_vToolTimer.GetTimerId())

     {
         wxPoint                     vPos( m_vXMouse
                                          ,m_vYMouse
     {
         wxPoint                     vPos( m_vXMouse
                                          ,m_vYMouse


@@ -1447,9 +1449,9 @@ void wxToolBar::OnTimer (
 
         m_pToolTip->DisplayToolTipWindow(vPos);
         m_vToolTimer.Stop();
 
         m_pToolTip->DisplayToolTipWindow(vPos);
         m_vToolTimer.Stop();

-        m_vToolExpTimer.Start(3000L, TRUE);
+        m_vToolExpTimer.Start(4000L, TRUE);

     }
     }

-    else if (rEvent.GetId() == (int)m_vToolExpTimer.GetTimerId())
+    else if (rEvent.GetId() == m_vToolExpTimer.GetTimerId())

     {
         m_pToolTip->HideToolTipWindow();
         GetParent()->Refresh();
     {
         m_pToolTip->HideToolTipWindow();
         GetParent()->Refresh();