wxMenu Review, added Carbon Events and full OSX Support

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

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 7c6515ff121ade578094738c8e1286391acfa22e..b0c059dd89606e080b7070523dd90fdda0ae4911 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -233,69 +233,78 @@ bool wxToolBar::Create(wxWindow *parent,
                        long style,
                        const wxString& name)
 {
                        long style,
                        const wxString& name)
 {

-    // toolbars never have border, giving one to them results in broken
-    // appearance
-    style &= ~wxBORDER_MASK;
-    style |= wxBORDER_NONE;
-

     // common initialisation
     if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
         return FALSE;
 
     // common initialisation
     if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
         return FALSE;
 

-    // prepare flags
-    DWORD msflags = TBSTYLE_TOOLTIPS;  // WS_VISIBLE | WS_CHILD always included
-
-   if ( style & wxCLIP_SIBLINGS )
-        msflags |= WS_CLIPSIBLINGS;
+    // MSW-specific initialisation
+    if ( !MSWCreateToolbar(pos, size) )
+        return FALSE;

 
 

-    if ( style & wxTB_FLAT )
-    {
-        // static as it doesn't change during the program lifetime
-        static int s_verComCtl = wxTheApp->GetComCtl32Version();
+    // set up the colors and fonts
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR));
+    SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));

 
 

-        // comctl32.dll 4.00 doesn't support the flat toolbars and using this
-        // style with 6.00 (part of Windows XP) leads to the toolbar with
-        // incorrect background colour - and not using it still results in the
-        // correct (flat) toolbar, so don't use it there
-        if ( s_verComCtl > 400 && s_verComCtl < 600 )
-        {
-            msflags |= TBSTYLE_FLAT | TBSTYLE_TRANSPARENT;
-        }
-    }
-    if (style & wxTB_NODIVIDER)
-        msflags |= CCS_NODIVIDER;
-    if (style & wxTB_NOALIGN)
-        msflags |= CCS_NOPARENTALIGN;
+    return TRUE;
+}

 
 

-    // MSW-specific initialisation
-    if ( !wxControl::MSWCreateControl(TOOLBARCLASSNAME, msflags) )
+bool wxToolBar::MSWCreateToolbar(const wxPoint& pos, const wxSize& size)
+{
+    if ( !MSWCreateControl(TOOLBARCLASSNAME, _T(""), pos, size) )

         return FALSE;
 
     // toolbar-specific post initialisation
     ::SendMessage(GetHwnd(), TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0);
 
         return FALSE;
 
     // toolbar-specific post initialisation
     ::SendMessage(GetHwnd(), TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0);
 

-    // set up the colors and fonts
-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR));
-    SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
+    return TRUE;
+}

 
 

-    // position it
-    int x = pos.x;
-    int y = pos.y;
-    int width = size.x;
-    int height = size.y;
+void wxToolBar::Recreate()
+{
+    const HWND hwndOld = GetHwnd();
+    if ( !hwndOld )
+    {
+        // we haven't been created yet, no need to recreate
+        return;
+    }

 
 

-    if (width <= 0)
-        width = 100;
-    if (height <= 0)
-        height = m_defaultHeight;
-    if (x < 0)
-        x = 0;
-    if (y < 0)
-        y = 0;
+    // get the position and size before unsubclassing the old toolbar
+    const wxPoint pos = GetPosition();
+    const wxSize size = GetSize();

 
 

-    SetSize(x, y, width, height);
+    UnsubclassWin();

 
 

-    return TRUE;
+    if ( !MSWCreateToolbar(pos, size) )
+    {
+        // what can we do?
+        wxFAIL_MSG( _T("recreating the toolbar failed") );
+
+        return;
+    }
+
+    // reparent all our children under the new toolbar
+    for ( wxWindowList::Node *node = m_children.GetFirst();
+          node;
+          node = node->GetNext() )
+    {
+        wxWindow *win = node->GetData();
+        if ( !win->IsTopLevel() )
+            ::SetParent(GetHwndOf(win), GetHwnd());
+    }
+
+    // only destroy the old toolbar now -- after all the children had been
+    // reparented
+    ::DestroyWindow(hwndOld);
+
+    // it is for the old bitmap control and can't be used with the new one
+    if ( m_hBitmap )
+    {
+        ::DeleteObject((HBITMAP) m_hBitmap);
+        m_hBitmap = 0;
+    }
+
+    Realize();
+    UpdateSize();

 }
 
 wxToolBar::~wxToolBar()
 }
 
 wxToolBar::~wxToolBar()


@@ -314,12 +323,57 @@ wxToolBar::~wxToolBar()
     }
 }
 
     }
 }
 

+wxSize wxToolBar::DoGetBestSize() const
+{
+    wxSize sizeBest = GetToolSize();
+    sizeBest.x *= GetToolsCount();
+
+    // reverse horz and vertical components if necessary
+    return HasFlag(wxTB_VERTICAL) ? wxSize(sizeBest.y, sizeBest.x) : sizeBest;
+}
+
+WXDWORD wxToolBar::MSWGetStyle(long style, WXDWORD *exstyle) const
+{
+    // toolbars never have border, giving one to them results in broken
+    // appearance
+    WXDWORD msStyle = wxControl::MSWGetStyle
+                      (
+                        (style & ~wxBORDER_MASK) | wxBORDER_NONE, exstyle
+                      );
+
+    // always include this one, it never hurts and setting it later only if we
+    // do have tooltips wouldn't work
+    msStyle |= TBSTYLE_TOOLTIPS;
+
+    if ( style & wxTB_FLAT )
+    {
+        // static as it doesn't change during the program lifetime
+        static int s_verComCtl = wxTheApp->GetComCtl32Version();
+
+        // comctl32.dll 4.00 doesn't support the flat toolbars and using this
+        // style with 6.00 (part of Windows XP) leads to the toolbar with
+        // incorrect background colour - and not using it still results in the
+        // correct (flat) toolbar, so don't use it there
+        if ( s_verComCtl > 400 && s_verComCtl < 600 )
+        {
+            msStyle |= TBSTYLE_FLAT | TBSTYLE_TRANSPARENT;
+        }
+    }
+
+    if ( style & wxTB_NODIVIDER )
+        msStyle |= CCS_NODIVIDER;
+
+    if ( style & wxTB_NOALIGN )
+        msStyle |= CCS_NOPARENTALIGN;
+
+    return msStyle;
+}
+

 // ----------------------------------------------------------------------------
 // adding/removing tools
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // adding/removing tools
 // ----------------------------------------------------------------------------
 

-bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
-                             wxToolBarToolBase *tool)
+bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool)

 {
     // nothing special to do here - we really create the toolbar buttons in
     // Realize() later
 {
     // nothing special to do here - we really create the toolbar buttons in
     // Realize() later


@@ -407,171 +461,185 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
 
 bool wxToolBar::Realize()
 {
 
 bool wxToolBar::Realize()
 {

-    size_t nTools = GetToolsCount();
+    const size_t nTools = GetToolsCount();

     if ( nTools == 0 )
     {
         // nothing to do
         return TRUE;
     }
 
     if ( nTools == 0 )
     {
         // nothing to do
         return TRUE;
     }
 

-    bool isVertical = (GetWindowStyle() & wxTB_VERTICAL) != 0;
+    const bool isVertical = HasFlag(wxTB_VERTICAL);
+
+    // delete all old buttons, if any
+    for ( size_t pos = 0; pos < m_nButtons; pos++ )
+    {
+        if ( !::SendMessage(GetHwnd(), TB_DELETEBUTTON, 0, 0) )
+        {
+            wxLogDebug(wxT("TB_DELETEBUTTON failed"));
+        }
+    }

 
     // First, add the bitmap: we use one bitmap for all toolbar buttons
     // ----------------------------------------------------------------
 
 
     // First, add the bitmap: we use one bitmap for all toolbar buttons
     // ----------------------------------------------------------------
 

-    // if we already have a bitmap, we'll replace the existing one - otherwise
-    // we'll install a new one
-    HBITMAP oldToolBarBitmap = (HBITMAP)m_hBitmap;
+    wxToolBarToolsList::Node *node;
+    int bitmapId = 0;
+
+    wxSize sizeBmp;
+    if ( HasFlag(wxTB_NOICONS) )
+    {
+        // no icons, don't leave space for them
+        sizeBmp.x =
+        sizeBmp.y = 0;
+    }
+    else // do show icons
+    {
+        // if we already have a bitmap, we'll replace the existing one --
+        // otherwise we'll install a new one
+        HBITMAP oldToolBarBitmap = (HBITMAP)m_hBitmap;

 
 

-    int totalBitmapWidth = (int)(m_defaultWidth * nTools);
-    int totalBitmapHeight = (int)m_defaultHeight;
+        sizeBmp.x = m_defaultWidth;
+        sizeBmp.y = m_defaultHeight;

 
 

-    // Create a bitmap and copy all the tool bitmaps to it
+        const wxCoord totalBitmapWidth = m_defaultWidth * nTools,
+                      totalBitmapHeight = m_defaultHeight;
+
+        // Create a bitmap and copy all the tool bitmaps to it

 #if USE_BITMAP_MASKS
 #if USE_BITMAP_MASKS

-    wxMemoryDC dcAllButtons;
-    wxBitmap bitmap(totalBitmapWidth, totalBitmapHeight);
-    dcAllButtons.SelectObject(bitmap);
-    dcAllButtons.SetBackground(*wxLIGHT_GREY_BRUSH);
-    dcAllButtons.Clear();
-
-    m_hBitmap = bitmap.GetHBITMAP();
-    HBITMAP hBitmap = (HBITMAP)m_hBitmap;
+        wxMemoryDC dcAllButtons;
+        wxBitmap bitmap(totalBitmapWidth, totalBitmapHeight);
+        dcAllButtons.SelectObject(bitmap);
+        dcAllButtons.SetBackground(*wxLIGHT_GREY_BRUSH);
+        dcAllButtons.Clear();
+
+        m_hBitmap = bitmap.GetHBITMAP();
+        HBITMAP hBitmap = (HBITMAP)m_hBitmap;

 #else // !USE_BITMAP_MASKS
 #else // !USE_BITMAP_MASKS

-    HBITMAP hBitmap = ::CreateCompatibleBitmap(ScreenHDC(),
-                                               totalBitmapWidth,
-                                               totalBitmapHeight);
-    if ( !hBitmap )
-    {
-        wxLogLastError(_T("CreateCompatibleBitmap"));
+        HBITMAP hBitmap = ::CreateCompatibleBitmap(ScreenHDC(),
+                                                   totalBitmapWidth,
+                                                   totalBitmapHeight);
+        if ( !hBitmap )
+        {
+            wxLogLastError(_T("CreateCompatibleBitmap"));

 
 

-        return FALSE;
-    }
+            return FALSE;
+        }

 
 

-    m_hBitmap = (WXHBITMAP)hBitmap;
+        m_hBitmap = (WXHBITMAP)hBitmap;

 
 

-    HDC memoryDC = ::CreateCompatibleDC(NULL);
-    HBITMAP oldBitmap = (HBITMAP) ::SelectObject(memoryDC, hBitmap);
+        MemoryHDC memoryDC;
+        SelectInHDC hdcSelector(memoryDC, hBitmap);

 
 

-    HDC memoryDC2 = ::CreateCompatibleDC(NULL);
+        MemoryHDC memoryDC2;

 #endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS
 
 #endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS
 

-    // the button position
-    wxCoord x = 0;
+        // the button position
+        wxCoord x = 0;

 
 

-    // the number of buttons (not separators)
-    int nButtons = 0;
+        // the number of buttons (not separators)
+        int nButtons = 0;

 
 

-    wxToolBarToolsList::Node *node = m_tools.GetFirst();
-    while ( node )
-    {
-        wxToolBarToolBase *tool = node->GetData();
-        if ( tool->IsButton() )
+        for ( node = m_tools.GetFirst(); node; node = node->GetNext() )

         {
         {

-            const wxBitmap& bmp = tool->GetNormalBitmap();
-            if ( bmp.Ok() )
+            wxToolBarToolBase *tool = node->GetData();
+            if ( tool->IsButton() )

             {
             {

+                const wxBitmap& bmp = tool->GetNormalBitmap();
+                if ( bmp.Ok() )
+                {

 #if USE_BITMAP_MASKS
 #if USE_BITMAP_MASKS

-                // notice the last parameter: do use mask
-                dcAllButtons.DrawBitmap(bmp, x, 0, TRUE);
+                    // notice the last parameter: do use mask
+                    dcAllButtons.DrawBitmap(bmp, x, 0, TRUE);

 #else // !USE_BITMAP_MASKS
 #else // !USE_BITMAP_MASKS

-                HBITMAP hbmp = GetHbitmapOf(bmp);
-                HBITMAP oldBitmap2 = (HBITMAP)::SelectObject(memoryDC2, hbmp);
-                if ( !BitBlt(memoryDC, x, 0,  m_defaultWidth, m_defaultHeight,
-                             memoryDC2, 0, 0, SRCCOPY) )
+                    SelectInHDC hdcSelector2(memoryDC2, GetHbitmapOf(bmp));
+                    if ( !BitBlt(memoryDC,
+                                 x, 0,  m_defaultWidth, m_defaultHeight,
+                                 memoryDC2,
+                                 0, 0, SRCCOPY) )
+                    {
+                        wxLogLastError(wxT("BitBlt"));
+                    }
+#endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS
+                }
+                else

                 {
                 {

-                    wxLogLastError(wxT("BitBlt"));
+                    wxFAIL_MSG( _T("invalid tool button bitmap") );

                 }
 
                 }
 

-                ::SelectObject(memoryDC2, oldBitmap2);
-#endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS
+                // still inc width and number of buttons because otherwise the
+                // subsequent buttons will all be shifted which is rather confusing
+                // (and like this you'd see immediately which bitmap was bad)
+                x += m_defaultWidth;
+                nButtons++;

             }
             }

-            else
-            {
-                wxFAIL_MSG( _T("invalid tool button bitmap") );
-            }
-
-            // still inc width and number of buttons because otherwise the
-            // subsequent buttons will all be shifted which is rather confusing
-            // (and like this you'd see immediately which bitmap was bad)
-            x += m_defaultWidth;
-            nButtons++;

         }
 
         }
 

-        node = node->GetNext();
-    }
-

 #if USE_BITMAP_MASKS
 #if USE_BITMAP_MASKS

-    dcAllButtons.SelectObject(wxNullBitmap);
+        dcAllButtons.SelectObject(wxNullBitmap);

 
 

-    // don't delete this HBITMAP!
-    bitmap.SetHBITMAP(0);
-#else // !USE_BITMAP_MASKS
-    ::SelectObject(memoryDC, oldBitmap);
-    ::DeleteDC(memoryDC);
-    ::DeleteDC(memoryDC2);
+        // don't delete this HBITMAP!
+        bitmap.SetHBITMAP(0);

 #endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS
 
 #endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS
 

-    // Map to system colours
-    hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,
-                                 totalBitmapWidth, totalBitmapHeight);
+        // Map to system colours
+        hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,
+                                     totalBitmapWidth, totalBitmapHeight);

 
 

-    int bitmapId = 0;
-
-    bool addBitmap = TRUE;
+        bool addBitmap = TRUE;

 
 

-    if ( oldToolBarBitmap )
-    {
-#ifdef TB_REPLACEBITMAP
-        if ( wxTheApp->GetComCtl32Version() >= 400 )
+        if ( oldToolBarBitmap )

         {
         {

-            TBREPLACEBITMAP replaceBitmap;
-            replaceBitmap.hInstOld = NULL;
-            replaceBitmap.hInstNew = NULL;
-            replaceBitmap.nIDOld = (UINT) oldToolBarBitmap;
-            replaceBitmap.nIDNew = (UINT) hBitmap;
-            replaceBitmap.nButtons = nButtons;
-            if ( !::SendMessage(GetHwnd(), TB_REPLACEBITMAP,
-                                0, (LPARAM) &replaceBitmap) )
+#ifdef TB_REPLACEBITMAP
+            if ( wxTheApp->GetComCtl32Version() >= 400 )

             {
             {

-                wxFAIL_MSG(wxT("Could not replace the old bitmap"));
-            }
+                TBREPLACEBITMAP replaceBitmap;
+                replaceBitmap.hInstOld = NULL;
+                replaceBitmap.hInstNew = NULL;
+                replaceBitmap.nIDOld = (UINT) oldToolBarBitmap;
+                replaceBitmap.nIDNew = (UINT) hBitmap;
+                replaceBitmap.nButtons = nButtons;
+                if ( !::SendMessage(GetHwnd(), TB_REPLACEBITMAP,
+                                    0, (LPARAM) &replaceBitmap) )
+                {
+                    wxFAIL_MSG(wxT("Could not replace the old bitmap"));
+                }

 
 

-            ::DeleteObject(oldToolBarBitmap);
+                ::DeleteObject(oldToolBarBitmap);

 
 

-            // already done
-            addBitmap = FALSE;
-        }
-        else
+                // already done
+                addBitmap = FALSE;
+            }
+            else

 #endif // TB_REPLACEBITMAP
 #endif // TB_REPLACEBITMAP

-        {
-            // we can't replace the old bitmap, so we will add another one
-            // (awfully inefficient, but what else to do?) and shift the bitmap
-            // indices accordingly
-            addBitmap = TRUE;
+            {
+                // we can't replace the old bitmap, so we will add another one
+                // (awfully inefficient, but what else to do?) and shift the bitmap
+                // indices accordingly
+                addBitmap = TRUE;

 
 

-            bitmapId = m_nButtons;
+                bitmapId = m_nButtons;
+            }

         }
 
         }
 

-        // Now delete all the buttons
-        for ( size_t pos = 0; pos < m_nButtons; pos++ )
+        if ( addBitmap ) // no old bitmap or we can't replace it

         {
         {

-            if ( !::SendMessage(GetHwnd(), TB_DELETEBUTTON, 0, 0) )
+            TBADDBITMAP addBitmap;
+            addBitmap.hInst = 0;
+            addBitmap.nID = (UINT) hBitmap;
+            if ( ::SendMessage(GetHwnd(), TB_ADDBITMAP,
+                               (WPARAM) nButtons, (LPARAM)&addBitmap) == -1 )

             {
             {

-                wxLogDebug(wxT("TB_DELETEBUTTON failed"));
+                wxFAIL_MSG(wxT("Could not add bitmap to toolbar"));

             }
         }
     }
 
             }
         }
     }
 

-    if ( addBitmap ) // no old bitmap or we can't replace it
+    // don't call SetToolBitmapSize() as we don't want to change the values of
+    // m_defaultWidth/Height
+    if ( !::SendMessage(GetHwnd(), TB_SETBITMAPSIZE, 0,
+                        MAKELONG(sizeBmp.x, sizeBmp.y)) )

     {
     {

-        TBADDBITMAP addBitmap;
-        addBitmap.hInst = 0;
-        addBitmap.nID = (UINT) hBitmap;
-        if ( ::SendMessage(GetHwnd(), TB_ADDBITMAP,
-                           (WPARAM) nButtons, (LPARAM)&addBitmap) == -1 )
-        {
-            wxFAIL_MSG(wxT("Could not add bitmap to toolbar"));
-        }
+        wxLogLastError(_T("TB_SETBITMAPSIZE"));

     }
 
     // Next add the buttons and separators
     }
 
     // Next add the buttons and separators


@@ -609,11 +677,16 @@ bool wxToolBar::Realize()
                 break;
 
             case wxTOOL_STYLE_BUTTON:
                 break;
 
             case wxTOOL_STYLE_BUTTON:

-                button.iBitmap = bitmapId;
+                if ( !HasFlag(wxTB_NOICONS) )
+                    button.iBitmap = bitmapId;

 
 

-                if ( HasFlag(wxTB_TEXT) && !tool->GetLabel().empty() )
+                if ( HasFlag(wxTB_TEXT) )

                 {
                 {

-                    button.iString = (int)tool->GetLabel().c_str();
+                    const wxString& label = tool->GetLabel();
+                    if ( !label.empty() )
+                    {
+                        button.iString = (int)label.c_str();
+                    }

                 }
 
                 button.idCommand = tool->GetId();
                 }
 
                 button.idCommand = tool->GetId();


@@ -858,13 +931,14 @@ bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl),
                             WXLPARAM lParam,
                             WXLPARAM *WXUNUSED(result))
 {
                             WXLPARAM lParam,
                             WXLPARAM *WXUNUSED(result))
 {

+#if wxUSE_TOOLTIPS

     // First check if this applies to us
     NMHDR *hdr = (NMHDR *)lParam;
 
     // the tooltips control created by the toolbar is sometimes Unicode, even
     // in an ANSI application - this seems to be a bug in comctl32.dll v5
     // First check if this applies to us
     NMHDR *hdr = (NMHDR *)lParam;
 
     // the tooltips control created by the toolbar is sometimes Unicode, even
     // in an ANSI application - this seems to be a bug in comctl32.dll v5

-    int code = (int)hdr->code;
-    if ( (code != TTN_NEEDTEXTA) && (code != TTN_NEEDTEXTW) )
+    UINT code = hdr->code;
+    if ( (code != (UINT) TTN_NEEDTEXTA) && (code != (UINT) TTN_NEEDTEXTW) )

         return FALSE;
 
     HWND toolTipWnd = (HWND)::SendMessage((HWND)GetHWND(), TB_GETTOOLTIPS, 0, 0);
         return FALSE;
 
     HWND toolTipWnd = (HWND)::SendMessage((HWND)GetHWND(), TB_GETTOOLTIPS, 0, 0);


@@ -878,51 +952,10 @@ bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl),
     if ( !tool )
         return FALSE;
 
     if ( !tool )
         return FALSE;
 

-    const wxString& help = tool->GetShortHelp();
-
-    if ( !help.IsEmpty() )
-    {
-        if ( code == TTN_NEEDTEXTA )
-        {
-            ttText->lpszText = (wxChar *)help.c_str();
-        }
-        else
-        {
-#if wxUSE_UNICODE
-            ttText->lpszText = (wxChar *)help.c_str();
+    return HandleTooltipNotify(code, lParam, tool->GetShortHelp());

 #else
 #else

-            // VZ: I don't know why it happens, but the versions of
-            //     comctl32.dll starting from 4.70 sometimes send TTN_NEEDTEXTW
-            //     even to ANSI programs (normally, this message is supposed
-            //     to be sent to Unicode programs only) - hence we need to
-            //     handle it as well, otherwise no tooltips will be shown in
-            //     this case
-
-            size_t lenAnsi = help.Len();
-            #if defined( __MWERKS__ ) || defined( __CYGWIN__ )
-                // MetroWerks doesn't like calling mbstowcs with NULL argument
-                // neither Cygwin does
-                size_t lenUnicode = 2*lenAnsi;
-            #else
-                size_t lenUnicode = mbstowcs(NULL, help, lenAnsi);
-            #endif
-
-            // using the pointer of right type avoids us doing all sorts of
-            // pointer arithmetics ourselves
-            wchar_t *dst = (wchar_t *)ttText->szText,
-                    *pwz = new wchar_t[lenUnicode + 1];
-            mbstowcs(pwz, help, lenAnsi + 1);
-            memcpy(dst, pwz, lenUnicode*sizeof(wchar_t));
-
-            // put the terminating _wide_ NUL
-            dst[lenUnicode] = 0;
-
-            delete [] pwz;
+    return FALSE;

 #endif
 #endif

-        }
-    }
-
-    return TRUE;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -1045,59 +1078,24 @@ void wxToolBar::UpdateSize()
 
 void wxToolBar::SetWindowStyleFlag(long style)
 {
 
 void wxToolBar::SetWindowStyleFlag(long style)
 {

-    // there doesn't seem to be any reasonably simple way to prevent the
-    // toolbar from showing the icons so for now we don't honour wxTB_NOICONS
-    if ( (style & wxTB_TEXT) != (GetWindowStyle() & wxTB_TEXT) )
-    {
-        // update the strings of all toolbar buttons
-        //
-        // NB: we can only do it using TB_SETBUTTONINFO which is available
-        //     in comctl32.dll >= 4.71 only
-#if defined(_WIN32_IE) && (_WIN32_IE >= 0x400 )
-        if ( wxTheApp->GetComCtl32Version() >= 471 )
-        {
-            // set the (underlying) separators width to be that of the
-            // control
-            TBBUTTONINFO tbbi;
-            tbbi.cbSize = sizeof(tbbi);
-            tbbi.dwMask = TBIF_TEXT;
-            if ( !(style & wxTB_TEXT) )
-            {
-                // don't show the text - remove the labels
-                tbbi.pszText = NULL;
-            }
+    // the style bits whose changes force us to recreate the toolbar
+    static const long MASK_NEEDS_RECREATE = wxTB_TEXT | wxTB_NOICONS;

 
 

-            for ( wxToolBarToolsList::Node *node = m_tools.GetFirst();
-                  node;
-                  node = node->GetNext() )
-            {
-                wxToolBarToolBase *tool = node->GetData();
-                if ( !tool->IsButton() )
-                {
-                    continue;
-                }
-
-                if ( style & wxTB_TEXT )
-                {
-                    // cast is harmless
-                    tbbi.pszText = (wxChar *)tool->GetLabel().c_str();
-                }
+    const long styleOld = GetWindowStyle();

 
 

-                if ( !SendMessage(GetHwnd(), TB_SETBUTTONINFO,
-                                  tool->GetId(), (LPARAM)&tbbi) )
-                {
-                    // the id is probably invalid?
-                    wxLogLastError(wxT("TB_SETBUTTONINFO"));
-                }
-            }
+    wxToolBarBase::SetWindowStyleFlag(style);

 
 

-            UpdateSize();
-            Refresh();
-        }
-#endif // comctl32.dll 4.71
+    // don't recreate an empty toolbar: not only this is unnecessary, but it is
+    // also fatal as we'd then try to recreate the toolbar when it's just being
+    // created
+    if ( GetToolsCount() &&
+            (style & MASK_NEEDS_RECREATE) != (styleOld & MASK_NEEDS_RECREATE) )
+    {
+        // to remove the text labels, simply re-realizing the toolbar is enough
+        // but I don't know of any way to add the text to an existing toolbar
+        // other than by recreating it entirely
+        Recreate();

     }
     }

-
-    wxToolBarBase::SetWindowStyleFlag(style);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -1148,6 +1146,13 @@ void wxToolBar::OnSysColourChanged(wxSysColourChangedEvent& event)
 
 void wxToolBar::OnMouseEvent(wxMouseEvent& event)
 {
 
 void wxToolBar::OnMouseEvent(wxMouseEvent& event)
 {

+    if (event.Leaving() && m_pInTool)
+    {
+        OnMouseEnter( -1 );
+        event.Skip();
+        return;
+    }
+

     if (event.RightDown())
     {
         // For now, we don't have an id. Later we could
     if (event.RightDown())
     {
         // For now, we don't have an id. Later we could


@@ -1190,7 +1195,7 @@ bool wxToolBar::HandleSize(WXWPARAM wParam, WXLPARAM lParam)
                 // FIXME: 6 is hardcoded separator line height...
                 //h += 6;
                 if (HasFlag(wxTB_NODIVIDER))
                 // FIXME: 6 is hardcoded separator line height...
                 //h += 6;
                 if (HasFlag(wxTB_NODIVIDER))

-                    h += 3;
+                    h += 4;

                 else
                     h += 6;
                 h *= m_maxRows;
                 else
                     h += 6;
                 h *= m_maxRows;