]> git.saurik.com Git - wxWidgets.git/blobdiff - src/os2/toolbar.cpp
cleanup - more reformatting; fixed bug introduced in prior commit
[wxWidgets.git] / src / os2 / toolbar.cpp
index 16261a8feb5ed453cf7ca8e66b90f7ab20858320..ea8d5f8480b4421105eab0ffdb2daac8db377319 100644 (file)
 #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
 
+#include "wx/tooltip.h"
 #include "wx/toolbar.h"
 
 bool                                wxToolBar::m_bInitialized = FALSE;
 
 #include "wx/toolbar.h"
 
 bool                                wxToolBar::m_bInitialized = FALSE;
 
-// ---------------------------------------------------------------------------
-// Helper for taking a regular bitmap and giving it a disabled look
-// ---------------------------------------------------------------------------
-wxBitmap wxDisableBitmap(
-  const wxBitmap&                   rBmp
-, long                              lColor
-)
-{
-    wxMask*                         pMask = rBmp.GetMask();
-
-    if (!pMask)
-        return(wxNullBitmap);
-
-    DEVOPENSTRUC                    vDop  = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L};
-    SIZEL                           vSize = {0, 0};
-    HDC                             hDC   = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
-    HPS                             hPS   = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIA_ASSOC);
-    BITMAPINFOHEADER2               vHeader;
-    BITMAPINFO2                     vInfo;
-    ERRORID                         vError;
-    wxString                        sError;
-    HBITMAP                         hBitmap =  (HBITMAP)rBmp.GetHBITMAP();
-    HBITMAP                         hOldBitmap = NULLHANDLE;
-    HBITMAP                         hOldMask   = NULLHANDLE;
-    HBITMAP                         hMask = (HBITMAP)rBmp.GetMask()->GetMaskBitmap();
-    unsigned char*                  pucBits;     // buffer that will contain the bitmap data
-    unsigned char*                  pucData;     // pointer to use to traverse bitmap data
-    unsigned char*                  pucBitsMask; // buffer that will contain the mask data
-    unsigned char*                  pucDataMask; // pointer to use to traverse mask data
-    LONG                            lScans = 0L;
-    LONG                            lScansSet = 0L;
-    bool                            bpp16 = (wxDisplayDepth() == 16);
-
-    memset(&vHeader, '\0', 16);
-    vHeader.cbFix           = 16;
-
-    memset(&vInfo, '\0', 16);
-    vInfo.cbFix           = 16;
-    vInfo.cx              = (ULONG)rBmp.GetWidth();
-    vInfo.cy              = (ULONG)rBmp.GetHeight();
-    vInfo.cPlanes         = 1;
-    vInfo.cBitCount       = 24; // Set to desired count going in
-
-    //
-    // Create the buffers for data....all wxBitmaps are 24 bit internally
-    //
-    int                             nBytesPerLine = rBmp.GetWidth() * 3;
-    int                             nSizeDWORD    = sizeof(DWORD);
-    int                             nLineBoundary = nBytesPerLine % nSizeDWORD;
-    int                             nPadding = 0;
-    int                             i;
-    int                             j;
-
-    //
-    // Bitmap must be ina double-word alligned address so we may
-    // have some padding to worry about
-    //
-    if (nLineBoundary > 0)
-    {
-        nPadding     = nSizeDWORD - nLineBoundary;
-        nBytesPerLine += nPadding;
-    }
-    pucBits = (unsigned char *)malloc(nBytesPerLine * rBmp.GetHeight());
-    memset(pucBits, '\0', (nBytesPerLine * rBmp.GetHeight()));
-    pucBitsMask = (unsigned char *)malloc(nBytesPerLine * rBmp.GetHeight());
-    memset(pucBitsMask, '\0', (nBytesPerLine * rBmp.GetHeight()));
-
-    //
-    // Extract the bitmap and mask data
-    //
-    if ((hOldBitmap = ::GpiSetBitmap(hPS, hBitmap)) == HBM_ERROR)
-    {
-        vError = ::WinGetLastError(vHabmain);
-        sError = wxPMErrorToStr(vError);
-    }
-    ::GpiQueryBitmapInfoHeader(hBitmap, &vHeader);
-    vInfo.cBitCount = 24;
-    if ((lScans = ::GpiQueryBitmapBits( hPS
-                                       ,0L
-                                       ,(LONG)rBmp.GetHeight()
-                                       ,(PBYTE)pucBits
-                                       ,&vInfo
-                                      )) == GPI_ALTERROR)
-    {
-        vError = ::WinGetLastError(vHabmain);
-        sError = wxPMErrorToStr(vError);
-    }
-    if ((hOldMask = ::GpiSetBitmap(hPS, hMask)) == HBM_ERROR)
-    {
-        vError = ::WinGetLastError(vHabmain);
-        sError = wxPMErrorToStr(vError);
-    }
-    ::GpiQueryBitmapInfoHeader(hMask, &vHeader);
-    vInfo.cBitCount = 24;
-    if ((lScans = ::GpiQueryBitmapBits( hPS
-                                       ,0L
-                                       ,(LONG)rBmp.GetHeight()
-                                       ,(PBYTE)pucBitsMask
-                                       ,&vInfo
-                                      )) == GPI_ALTERROR)
-    {
-        vError = ::WinGetLastError(vHabmain);
-        sError = wxPMErrorToStr(vError);
-    }
-    if (( hMask = ::GpiSetBitmap(hPS, hOldMask)) == HBM_ERROR)
-    {
-        vError = ::WinGetLastError(vHabmain);
-        sError = wxPMErrorToStr(vError);
-    }
-    pucData     = pucBits;
-    pucDataMask = pucBitsMask;
-
-    //
-    // Get the mask value
-    //
-    for (i = 0; i < rBmp.GetHeight(); i++)
-    {
-        for (j = 0; j < rBmp.GetWidth(); j++)
-        {
-            // Byte 1
-            if (bpp16 && *pucDataMask == 0xF8) // 16 bit display gobblygook
-            {
-                *pucData = 0x7F;
-                pucData++;
-            }
-            else if (*pucDataMask == 0xFF) // set to grey
-            {
-                *pucData = 0x7F;
-                pucData++;
-            }
-            else
-            {
-                *pucData = ((unsigned char)(lColor >> 16));
-                pucData++;
-            }
-
-            // Byte 2
-            if (bpp16 && *(pucDataMask + 1) == 0xFC) // 16 bit display gobblygook
-            {
-                *pucData = 0x7F;
-                pucData++;
-            }
-            else if (*(pucDataMask + 1) == 0xFF) // set to grey
-            {
-                *pucData = 0x7F;
-                pucData++;
-            }
-            else
-            {
-                *pucData = ((unsigned char)(lColor >> 8));
-                pucData++;
-            }
-
-            // Byte 3
-            if (bpp16 && *(pucDataMask + 2) == 0xF8) // 16 bit display gobblygook
-            {
-                *pucData = 0x7F;
-                pucData++;
-            }
-            else if (*(pucDataMask + 2) == 0xFF) // set to grey
-            {
-                *pucData = 0x7F;
-                pucData++;
-            }
-            else
-            {
-                *pucData = ((unsigned char)lColor);
-                pucData++;
-            }
-            pucDataMask += 3;
-        }
-        for (j = 0; j < nPadding; j++)
-        {
-            pucData++;
-            pucDataMask++;
-        }
-    }
-
-    //
-    // Create a new bitmap and set the modified bits
-    //
-    wxBitmap                        vNewBmp( rBmp.GetWidth()
-                                            ,rBmp.GetHeight()
-                                            ,24
-                                           );
-    HBITMAP                         hNewBmp = (HBITMAP)vNewBmp.GetHBITMAP();
-
-    if ((hOldBitmap = ::GpiSetBitmap(hPS, hNewBmp)) == HBM_ERROR)
-    {
-        vError = ::WinGetLastError(vHabmain);
-        sError = wxPMErrorToStr(vError);
-    }
-    if ((lScansSet = ::GpiSetBitmapBits( hPS
-                                        ,0L
-                                        ,(LONG)rBmp.GetHeight()
-                                        ,(PBYTE)pucBits
-                                        ,&vInfo
-                                       )) == GPI_ALTERROR)
-
-    {
-        vError = ::WinGetLastError(vHabmain);
-        sError = wxPMErrorToStr(vError);
-    }
-    wxMask*                         pNewMask;
-
-    pNewMask = new wxMask(pMask->GetMaskBitmap());
-    vNewBmp.SetMask(pNewMask);
-    free(pucBits);
-    ::GpiSetBitmap(hPS, NULLHANDLE);
-    ::GpiDestroyPS(hPS);
-    ::DevCloseDC(hDC);
-    if (vNewBmp.Ok())
-        return(vNewBmp);
-    return(wxNullBitmap);
-} // end of wxDisableBitmap
-
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
@@ -297,13 +84,14 @@ public:
 // wxWin macros
 // ----------------------------------------------------------------------------
 
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
     EVT_SIZE(wxToolBar::OnSize)
     EVT_PAINT(wxToolBar::OnPaint)
     EVT_KILL_FOCUS(wxToolBar::OnKillFocus)
     EVT_MOUSE_EVENTS(wxToolBar::OnMouseEvent)
 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
     EVT_SIZE(wxToolBar::OnSize)
     EVT_PAINT(wxToolBar::OnPaint)
     EVT_KILL_FOCUS(wxToolBar::OnKillFocus)
     EVT_MOUSE_EVENTS(wxToolBar::OnMouseEvent)
+    EVT_TIMER(-1, wxToolBar::OnTimer)
 END_EVENT_TABLE()
 
 // ============================================================================
 END_EVENT_TABLE()
 
 // ============================================================================
@@ -365,6 +153,8 @@ void wxToolBar::Init()
 
     m_defaultWidth = 16;
     m_defaultHeight = 15;
 
     m_defaultWidth = 16;
     m_defaultHeight = 15;
+
+    m_pToolTip = NULL;
 } // end of wxToolBar::Init
 
 wxToolBarToolBase* wxToolBar::DoAddTool(
 } // end of wxToolBar::Init
 
 wxToolBarToolBase* wxToolBar::DoAddTool(
@@ -576,7 +366,7 @@ bool wxToolBar::Create(
         wxClientDC                  vDC(this);
 
         vDC.SetFont(GetFont());
         wxClientDC                  vDC(this);
 
         vDC.SetFont(GetFont());
-        vDC.GetTextExtent( "XXXX"
+        vDC.GetTextExtent( wxT("XXXX")
                           ,&m_vTextX
                           ,&m_vTextY
                          );
                           ,&m_vTextX
                           ,&m_vTextY
                          );
@@ -589,7 +379,6 @@ bool wxToolBar::Create(
     int                             nY      = rPos.y;
     int                             nWidth  = rSize.x;
     int                             nHeight = rSize.y;
     int                             nY      = rPos.y;
     int                             nWidth  = rSize.x;
     int                             nHeight = rSize.y;
-    wxFrame*                        pFrame = wxDynamicCast(GetParent(), wxFrame);
 
     if (lStyle & wxTB_HORIZONTAL)
     {
 
     if (lStyle & wxTB_HORIZONTAL)
     {
@@ -634,14 +423,17 @@ bool wxToolBar::Create(
 
 wxToolBar::~wxToolBar()
 {
 
 wxToolBar::~wxToolBar()
 {
+    if (m_pToolTip)
+    {
+        delete m_pToolTip;
+        m_pToolTip = NULL;
+    }
 } // end of wxToolBar::~wxToolBar
 
 bool wxToolBar::Realize()
 {
     int                             nMaxToolWidth  = 0;
     int                             nMaxToolHeight = 0;
 } // end of wxToolBar::~wxToolBar
 
 bool wxToolBar::Realize()
 {
     int                             nMaxToolWidth  = 0;
     int                             nMaxToolHeight = 0;
-    int                             nX;
-    int                             nY;
 
     m_nCurrentRowsOrColumns = 0;
     m_vLastX               = m_xMargin;
 
     m_nCurrentRowsOrColumns = 0;
     m_vLastX               = m_xMargin;
@@ -653,13 +445,13 @@ bool wxToolBar::Realize()
     //
     // Find the maximum tool width and height
     //
     //
     // Find the maximum tool width and height
     //
-    wxToolBarToolsList::Node*       pNode = m_tools.GetFirst();
+    wxToolBarToolsList::compatibility_iterator     node = m_tools.GetFirst();
 
 
-    while (pNode )
+    while (node )
     {
     {
-        wxToolBarTool*              pTool = (wxToolBarTool *)pNode->GetData();
+        wxToolBarTool*              pTool = (wxToolBarTool *)node->GetData();
 
 
-        if (HasFlag(wxTB_TEXT) && !pTool->GetLabel().IsEmpty())
+        if (HasFlag(wxTB_TEXT) && !pTool->GetLabel().empty())
         {
             //
             // Set the height according to the font and the border size
         {
             //
             // Set the height according to the font and the border size
@@ -678,7 +470,7 @@ bool wxToolBar::Realize()
             if (pTool->GetHeight() > nMaxToolHeight)
                 nMaxToolHeight = pTool->GetHeight();
         }
             if (pTool->GetHeight() > nMaxToolHeight)
                 nMaxToolHeight = pTool->GetHeight();
         }
-        pNode = pNode->GetNext();
+        node = node->GetNext();
     }
 
     wxCoord                         vTbWidth = 0L;
     }
 
     wxCoord                         vTbWidth = 0L;
@@ -705,10 +497,10 @@ bool wxToolBar::Realize()
 
     int                             nSeparatorSize = m_toolSeparation;
 
 
     int                             nSeparatorSize = m_toolSeparation;
 
-    pNode = m_tools.GetFirst();
-    while (pNode)
+    node = m_tools.GetFirst();
+    while (node)
     {
     {
-        wxToolBarTool*              pTool = (wxToolBarTool *)pNode->GetData();
+        wxToolBarTool*              pTool = (wxToolBarTool *)node->GetData();
 
         if (pTool->IsSeparator())
         {
 
         if (pTool->IsSeparator())
         {
@@ -775,7 +567,7 @@ bool wxToolBar::Realize()
         if (m_vLastY > m_maxHeight)
             m_maxHeight = m_vLastY;
 
         if (m_vLastY > m_maxHeight)
             m_maxHeight = m_vLastY;
 
-        pNode = pNode->GetNext();
+        node = node->GetNext();
     }
 
     if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
     }
 
     if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
@@ -811,24 +603,22 @@ void wxToolBar::OnPaint (
     nCount++;
 
     ::WinFillRect(vDc.GetHPS(), &vDc.m_vRclPaint, GetBackgroundColour().GetPixel());
     nCount++;
 
     ::WinFillRect(vDc.GetHPS(), &vDc.m_vRclPaint, GetBackgroundColour().GetPixel());
-    for ( wxToolBarToolsList::Node* pNode = m_tools.GetFirst();
-          pNode;
-          pNode = pNode->GetNext() )
+    for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
+          node;
+          node = node->GetNext() )
     {
     {
-        wxToolBarTool*              pTool = (wxToolBarTool*)pNode->GetData();
+        wxToolBarTool*              pTool = (wxToolBarTool*)node->GetData();
 
         if (pTool->IsButton() )
             DrawTool(vDc, pTool);
         if (pTool->IsSeparator())
         {
 
         if (pTool->IsButton() )
             DrawTool(vDc, pTool);
         if (pTool->IsSeparator())
         {
-            wxPen                   vDarkGreyPen( wxColour(85, 85, 85)
-                                                 ,1
-                                                 ,wxSOLID
-                                                );
-            int                     nX;
-            int                     nY;
-            int                     nHeight = 0;
-            int                     nWidth = 0;
+            wxColour gray85(85, 85, 85);
+            wxPen vDarkGreyPen( gray85, 1, wxSOLID );
+            int nX;
+            int nY;
+            int nHeight = 0;
+            int nWidth = 0;
 
             vDc.SetPen(vDarkGreyPen);
             if (HasFlag(wxTB_TEXT))
 
             vDc.SetPen(vDarkGreyPen);
             if (HasFlag(wxTB_TEXT))
@@ -886,11 +676,21 @@ void wxToolBar::OnMouseEvent(
   wxMouseEvent&                     rEvent
 )
 {
   wxMouseEvent&                     rEvent
 )
 {
+    POINTL                          vPoint;
+    HWND                            hWnd;
     wxCoord                         vX;
     wxCoord                         vY;
     HPOINTER                        hPtr = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_ARROW, FALSE);
 
     ::WinSetPointer(HWND_DESKTOP, hPtr);
     wxCoord                         vX;
     wxCoord                         vY;
     HPOINTER                        hPtr = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_ARROW, FALSE);
 
     ::WinSetPointer(HWND_DESKTOP, hPtr);
+    ::WinQueryPointerPos(HWND_DESKTOP, &vPoint);
+    hWnd = ::WinWindowFromPoint(HWND_DESKTOP, &vPoint, TRUE);
+    if (hWnd != (HWND)GetHwnd())
+    {
+        m_vToolTimer.Stop();
+        return;
+    }
+
     rEvent.GetPosition(&vX, &vY);
 
     wxToolBarTool*            pTool = (wxToolBarTool *)FindToolForPosition( vX
     rEvent.GetPosition(&vX, &vY);
 
     wxToolBarTool*            pTool = (wxToolBarTool *)FindToolForPosition( vX
@@ -908,6 +708,7 @@ void wxToolBar::OnMouseEvent(
 
     if (!pTool)
     {
 
     if (!pTool)
     {
+        m_vToolTimer.Stop();
         if (m_nCurrentTool > -1)
         {
             if (rEvent.LeftIsDown())
         if (m_nCurrentTool > -1)
         {
             if (rEvent.LeftIsDown())
@@ -949,6 +750,15 @@ void wxToolBar::OnMouseEvent(
                          );
             m_nCurrentTool = pTool->GetId();
             OnMouseEnter(m_nCurrentTool);
                          );
             m_nCurrentTool = pTool->GetId();
             OnMouseEnter(m_nCurrentTool);
+            if (!pTool->GetShortHelp().empty())
+            {
+                if (m_pToolTip)
+                    delete m_pToolTip;
+                m_pToolTip = new wxToolTip(pTool->GetShortHelp());
+                m_vXMouse = (wxCoord)vPoint.x;
+                m_vYMouse = (wxCoord)vPoint.y;
+                m_vToolTimer.Start(1000L, TRUE);
+            }
             if (!pTool->IsToggled())
                 RaiseTool(pTool);
         }
             if (!pTool->IsToggled())
                 RaiseTool(pTool);
         }
@@ -1016,23 +826,12 @@ void wxToolBar::DrawTool(
 , wxToolBarToolBase*                pToolBase
 )
 {
 , wxToolBarToolBase*                pToolBase
 )
 {
-    wxToolBarTool*                  pTool = (wxToolBarTool *)pToolBase;
-    wxPen                           vDarkGreyPen( wxColour( 85,85,85 )
-                                                 ,1
-                                                 ,wxSOLID
-                                                );
-    wxPen                           vWhitePen( wxT("WHITE")
-                                              ,1
-                                              ,wxSOLID
-                                             );
-    wxPen                           vBlackPen( wxT("BLACK")
-                                              ,1
-                                              ,wxSOLID
-                                             );
-    wxBitmap                        vBitmap = pTool->GetNormalBitmap();
-    bool                            bUseMask = FALSE;
-    wxMask*                         pMask = NULL;
-    RECTL                           vRect;
+    wxToolBarTool* pTool = (wxToolBarTool *)pToolBase;
+    wxColour gray85( 85,85,85 );
+    wxPen vDarkGreyPen( gray85, 1, wxSOLID );
+    wxBitmap vBitmap = pTool->GetNormalBitmap();
+    bool bUseMask = FALSE;
+    wxMask* pMask = NULL;
 
     PrepareDC(rDc);
 
 
     PrepareDC(rDc);
 
@@ -1047,7 +846,7 @@ void wxToolBar::DrawTool(
         LowerTool(pTool, FALSE);
         if (!pTool->IsEnabled())
         {
         LowerTool(pTool, FALSE);
         if (!pTool->IsEnabled())
         {
-            wxColour                vColor("GREY");
+            wxColour vColor(wxT("GREY"));
 
             rDc.SetTextForeground(vColor);
             if (!pTool->GetDisabledBitmap().Ok())
 
             rDc.SetTextForeground(vColor);
             if (!pTool->GetDisabledBitmap().Ok())
@@ -1062,9 +861,7 @@ void wxToolBar::DrawTool(
         }
         else
         {
         }
         else
         {
-            wxColour                vColor("BLACK");
-
-            rDc.SetTextForeground(vColor);
+            rDc.SetTextForeground(*wxBLACK);
             rDc.DrawBitmap( vBitmap
                            ,pTool->m_vX
                            ,pTool->m_vY
             rDc.DrawBitmap( vBitmap
                            ,pTool->m_vX
                            ,pTool->m_vY
@@ -1107,7 +904,7 @@ void wxToolBar::DrawTool(
     }
     else
     {
     }
     else
     {
-        wxColour                    vColor("GREY");
+        wxColour vColor(wxT("GREY"));
 
         LowerTool(pTool);
         rDc.SetTextForeground(vColor);
 
         LowerTool(pTool);
         rDc.SetTextForeground(vColor);
@@ -1159,18 +956,16 @@ wxToolBarToolBase* wxToolBar::FindToolForPosition(
 , wxCoord                           vY
 ) const
 {
 , wxCoord                           vY
 ) const
 {
-    wxCoord                         vTextX = 0;
-    wxCoord                         vTextY = 0;
     wxCoord                         vTBarHeight = 0;
 
     GetSize( NULL
             ,&vTBarHeight
            );
     vY = vTBarHeight - vY;
     wxCoord                         vTBarHeight = 0;
 
     GetSize( NULL
             ,&vTBarHeight
            );
     vY = vTBarHeight - vY;
-    wxToolBarToolsList::Node* pNode = m_tools.GetFirst();
-    while (pNode)
+    wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
+    while (node)
     {
     {
-        wxToolBarTool*              pTool = (wxToolBarTool *)pNode->GetData();
+        wxToolBarTool*              pTool = (wxToolBarTool *)node->GetData();
 
         if (HasFlag(wxTB_TEXT) && !pTool->GetLabel().IsNull())
         {
 
         if (HasFlag(wxTB_TEXT) && !pTool->GetLabel().IsNull())
         {
@@ -1192,7 +987,7 @@ wxToolBarToolBase* wxToolBar::FindToolForPosition(
                 return pTool;
             }
         }
                 return pTool;
             }
         }
-        pNode = pNode->GetNext();
+        node = node->GetNext();
     }
     return (wxToolBarToolBase *)NULL;
 } // end of wxToolBar::FindToolForPosition
     }
     return (wxToolBarToolBase *)NULL;
 } // end of wxToolBar::FindToolForPosition
@@ -1249,29 +1044,18 @@ void wxToolBar::SpringUpButton(
 // private helpers
 // ----------------------------------------------------------------------------
 
 // private helpers
 // ----------------------------------------------------------------------------
 
-void wxToolBar::LowerTool (
-  wxToolBarToolBase*                pToolBase
-, bool                              bLower
-)
+void wxToolBar::LowerTool ( wxToolBarToolBase* pToolBase,
+                            bool               bLower )
 {
     wxToolBarTool*                  pTool = (wxToolBarTool*)pToolBase;
 {
     wxToolBarTool*                  pTool = (wxToolBarTool*)pToolBase;
-    wxCoord                         vX;
-    wxCoord                         vY;
-    wxCoord                         vWidth;
-    wxCoord                         vHeight;
-    wxPen                           vDarkGreyPen( wxColour(85, 85, 85)
-                                                 ,1
-                                                 ,wxSOLID
-                                                );
-    wxPen                           vWhitePen( "WHITE"
-                                              ,1
-                                              ,wxSOLID
-                                             );
-    wxPen                           vClearPen( GetBackgroundColour()
-                                              ,1
-                                              ,wxSOLID
-                                             );
-    wxClientDC                      vDC(this);
+    wxCoord vX;
+    wxCoord vY;
+    wxCoord vWidth;
+    wxCoord vHeight;
+    wxColour gray85( 85,85,85 );
+    wxPen vDarkGreyPen( gray85, 1, wxSOLID );
+    wxPen vClearPen( GetBackgroundColour(), 1, wxSOLID );
+    wxClientDC vDC(this);
 
     if (!pTool)
         return;
 
     if (!pTool)
         return;
@@ -1285,7 +1069,7 @@ void wxToolBar::LowerTool (
     if (!HasFlag(wxTB_FLAT))
         return;
 
     if (!HasFlag(wxTB_FLAT))
         return;
 
-    if (HasFlag(wxTB_TEXT) && !pTool->GetLabel().IsEmpty())
+    if (HasFlag(wxTB_TEXT) && !pTool->GetLabel().empty())
     {
         if (pTool->GetWidth() > m_vTextX)
         {
     {
         if (pTool->GetWidth() > m_vTextX)
         {
@@ -1309,7 +1093,7 @@ void wxToolBar::LowerTool (
     }
     if (bLower)
     {
     }
     if (bLower)
     {
-        vDC.SetPen(vWhitePen);
+        vDC.SetPen(*wxWHITE_PEN);
         vDC.DrawLine(vX + vWidth, vY + vHeight, vX, vY + vHeight);
         vDC.DrawLine(vX + vWidth, vY, vX + vWidth, vY + vHeight);
         vDC.SetPen(vDarkGreyPen);
         vDC.DrawLine(vX + vWidth, vY + vHeight, vX, vY + vHeight);
         vDC.DrawLine(vX + vWidth, vY, vX + vWidth, vY + vHeight);
         vDC.SetPen(vDarkGreyPen);
@@ -1326,29 +1110,18 @@ void wxToolBar::LowerTool (
     }
 } // end of WinGuiBase_CToolBarTool::LowerTool
 
     }
 } // end of WinGuiBase_CToolBarTool::LowerTool
 
-void wxToolBar::RaiseTool (
-  wxToolBarToolBase*                pToolBase
-, bool                              bRaise
-)
+void wxToolBar::RaiseTool ( wxToolBarToolBase* pToolBase,
+                            bool bRaise )
 {
 {
-    wxToolBarTool*                  pTool = (wxToolBarTool*)pToolBase;
-    wxCoord                         vX;
-    wxCoord                         vY;
-    wxCoord                         vWidth;
-    wxCoord                         vHeight;
-    wxPen                           vDarkGreyPen( wxColour(85, 85, 85)
-                                                 ,1
-                                                 ,wxSOLID
-                                                );
-    wxPen                           vWhitePen( "WHITE"
-                                              ,1
-                                              ,wxSOLID
-                                             );
-    wxPen                           vClearPen( GetBackgroundColour()
-                                              ,1
-                                              ,wxSOLID
-                                             );
-    wxClientDC                      vDC(this);
+    wxToolBarTool* pTool = (wxToolBarTool*)pToolBase;
+    wxCoord vX;
+    wxCoord vY;
+    wxCoord vWidth;
+    wxCoord vHeight;
+    wxColour gray85( 85,85,85 );
+    wxPen vDarkGreyPen( gray85, 1, wxSOLID );
+    wxPen vClearPen( GetBackgroundColour(), 1, wxSOLID );
+    wxClientDC vDC(this);
 
     if (!pTool)
         return;
 
     if (!pTool)
         return;
@@ -1365,7 +1138,7 @@ void wxToolBar::RaiseTool (
     if (!HasFlag(wxTB_FLAT))
         return;
 
     if (!HasFlag(wxTB_FLAT))
         return;
 
-    if (HasFlag(wxTB_TEXT) && !pTool->GetLabel().IsEmpty())
+    if (HasFlag(wxTB_TEXT) && !pTool->GetLabel().empty())
     {
         if (pTool->GetWidth() > m_vTextX)
         {
     {
         if (pTool->GetWidth() > m_vTextX)
         {
@@ -1392,7 +1165,7 @@ void wxToolBar::RaiseTool (
         vDC.SetPen(vDarkGreyPen);
         vDC.DrawLine(vX + vWidth, vY + vHeight, vX, vY + vHeight);
         vDC.DrawLine(vX + vWidth, vY, vX + vWidth, vY + vHeight);
         vDC.SetPen(vDarkGreyPen);
         vDC.DrawLine(vX + vWidth, vY + vHeight, vX, vY + vHeight);
         vDC.DrawLine(vX + vWidth, vY, vX + vWidth, vY + vHeight);
-        vDC.SetPen(vWhitePen);
+        vDC.SetPen(*wxWHITE_PEN);
         vDC.DrawLine(vX, vY, vX + vWidth, vY);
         vDC.DrawLine(vX, vY + vHeight, vX, vY);
     }
         vDC.DrawLine(vX, vY, vX + vWidth, vY);
         vDC.DrawLine(vX, vY + vHeight, vX, vY);
     }
@@ -1406,4 +1179,26 @@ void wxToolBar::RaiseTool (
     }
 } // end of wxToolBar::RaiseTool
 
     }
 } // end of wxToolBar::RaiseTool
 
+void wxToolBar::OnTimer (
+  wxTimerEvent&                     rEvent
+)
+{
+    if (rEvent.GetId() == m_vToolTimer.GetTimerId())
+    {
+        wxPoint                     vPos( m_vXMouse
+                                         ,m_vYMouse
+                                        );
+
+        m_pToolTip->DisplayToolTipWindow(vPos);
+        m_vToolTimer.Stop();
+        m_vToolExpTimer.Start(4000L, TRUE);
+    }
+    else if (rEvent.GetId() == m_vToolExpTimer.GetTimerId())
+    {
+        m_pToolTip->HideToolTipWindow();
+        GetParent()->Refresh();
+        m_vToolExpTimer.Stop();
+    }
+} // end of wxToolBar::OnTimer
+
 #endif // ndef for wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE
 #endif // ndef for wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE