fixed problems with sometimes processing the events twice introduced in rev 1.170...

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

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 7ea83bd343b65db73824bd93083091830e1092d1..2aadedd4765e4641b9d0b4c74e143851ae6ae1e7 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "tbar95.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -93,9 +89,6 @@
 // these values correspond to those used by comctl32.dll
 #define DEFAULTBITMAPX   16
 #define DEFAULTBITMAPY   15
 // these values correspond to those used by comctl32.dll
 #define DEFAULTBITMAPX   16
 #define DEFAULTBITMAPY   15

-#define DEFAULTBUTTONX   24
-#define DEFAULTBUTTONY   24
-#define DEFAULTBARHEIGHT 27

 
 // ----------------------------------------------------------------------------
 // wxWin macros
 
 // ----------------------------------------------------------------------------
 // wxWin macros


@@ -245,25 +238,17 @@ bool wxToolBar::Create(wxWindow *parent,
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
     SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
     SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 

-    // workaround for flat toolbar on Windows XP classic style
+    // workaround for flat toolbar on Windows XP classic style: we have to set
+    // the style after creating the control; doing it at creation time doesn't work

 #if wxUSE_UXTHEME
     if ( style & wxTB_FLAT )
     {
 #if wxUSE_UXTHEME
     if ( style & wxTB_FLAT )
     {

-        wxUxThemeEngine *p = wxUxThemeEngine::Get();
-        if ( !p || !p->IsThemeActive() )
-        {
-            DWORD dwToolbarStyle;
+        LRESULT style = ::SendMessage(GetHwnd(), TB_GETSTYLE, 0, 0L);

 
 

-            dwToolbarStyle = (DWORD)::SendMessage(GetHwnd(), TB_GETSTYLE, 0, 0L );
-
-            if ((dwToolbarStyle & TBSTYLE_FLAT) == 0)
-            {
-                dwToolbarStyle |= TBSTYLE_FLAT;
-                ::SendMessage(GetHwnd(), TB_SETSTYLE, 0, (LPARAM)dwToolbarStyle );
-            }
-        }
+        if ( !(style & TBSTYLE_FLAT) )
+            ::SendMessage(GetHwnd(), TB_SETSTYLE, 0, style | TBSTYLE_FLAT);

     }
     }

-#endif
+#endif // wxUSE_UXTHEME

 
     return true;
 }
 
     return true;
 }


@@ -312,8 +297,8 @@ void wxToolBar::Recreate()
             ::SetParent(GetHwndOf(win), GetHwnd());
     }
 
             ::SetParent(GetHwndOf(win), GetHwnd());
     }
 

-    // only destroy the old toolbar now -- after all the children had been
-    // reparented
+    // 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
     ::DestroyWindow(hwndOld);
 
     // it is for the old bitmap control and can't be used with the new one


@@ -339,14 +324,10 @@ wxToolBar::~wxToolBar()
     // is not - otherwise toolbar leaves a hole in the place it used to occupy
     wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
     if ( frame && !frame->IsBeingDeleted() )
     // is not - otherwise toolbar leaves a hole in the place it used to occupy
     wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
     if ( frame && !frame->IsBeingDeleted() )

-    {

         frame->SendSizeEvent();
         frame->SendSizeEvent();

-    }

 
     if ( m_hBitmap )
 
     if ( m_hBitmap )

-    {

         ::DeleteObject((HBITMAP) m_hBitmap);
         ::DeleteObject((HBITMAP) m_hBitmap);

-    }

 
     delete m_disabledImgList;
 }
 
     delete m_disabledImgList;
 }


@@ -378,6 +359,8 @@ wxSize wxToolBar::DoGetBestSize() const
         sizeBest.y = size.cy;
     }
 
         sizeBest.y = size.cy;
     }
 

+    CacheBestSize(sizeBest);
+

     return sizeBest;
 }
 
     return sizeBest;
 }
 


@@ -390,8 +373,8 @@ WXDWORD wxToolBar::MSWGetStyle(long style, WXDWORD *exstyle) const
                         (style & ~wxBORDER_MASK) | wxBORDER_NONE, exstyle
                       );
 
                         (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
+    // 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 | wxTB_HORZ_LAYOUT) )
     msStyle |= TBSTYLE_TOOLTIPS;
 
     if ( style & (wxTB_FLAT | wxTB_HORZ_LAYOUT) )


@@ -404,14 +387,10 @@ WXDWORD wxToolBar::MSWGetStyle(long style, WXDWORD *exstyle) const
         // 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 )
         // 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;
             msStyle |= TBSTYLE_FLAT | TBSTYLE_TRANSPARENT;

-        }

 
         if ( s_verComCtl >= 470 && style & wxTB_HORZ_LAYOUT )
 
         if ( s_verComCtl >= 470 && style & wxTB_HORZ_LAYOUT )

-        {

             msStyle |= TBSTYLE_LIST;
             msStyle |= TBSTYLE_LIST;

-        }

     }
 
     if ( style & wxTB_NODIVIDER )
     }
 
     if ( style & wxTB_NODIVIDER )


@@ -462,9 +441,7 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
         }
 
         if ( tool2->IsControl() )
         }
 
         if ( tool2->IsControl() )

-        {

             pos += ((wxToolBarTool *)tool2)->GetSeparatorsCount() - 1;
             pos += ((wxToolBarTool *)tool2)->GetSeparatorsCount() - 1;

-        }

     }
 
     // now determine the number of buttons to delete and the area taken by them
     }
 
     // now determine the number of buttons to delete and the area taken by them


@@ -482,7 +459,6 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
     if ( tool->IsControl() )
     {
         nButtonsToDelete = ((wxToolBarTool *)tool)->GetSeparatorsCount();
     if ( tool->IsControl() )
     {
         nButtonsToDelete = ((wxToolBarTool *)tool)->GetSeparatorsCount();

-

         width *= nButtonsToDelete;
     }
 
         width *= nButtonsToDelete;
     }
 


@@ -515,11 +491,18 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
     }
 
     InvalidateBestSize();
     }
 
     InvalidateBestSize();

+

     return true;
 }
 
 void wxToolBar::CreateDisabledImageList()
 {
     return true;
 }
 
 void wxToolBar::CreateDisabledImageList()
 {

+    if (m_disabledImgList != NULL)
+    {
+        delete m_disabledImgList;
+        m_disabledImgList = NULL;
+    }
+

     // as we can't use disabled image list with older versions of comctl32.dll,
     // don't even bother creating it
     if ( wxTheApp->GetComCtl32Version() >= 470 )
     // as we can't use disabled image list with older versions of comctl32.dll,
     // don't even bother creating it
     if ( wxTheApp->GetComCtl32Version() >= 470 )


@@ -539,43 +522,37 @@ void wxToolBar::CreateDisabledImageList()
                                             bmpDisabled.GetMask() != NULL,
                                             GetToolsCount()
                                         );
                                             bmpDisabled.GetMask() != NULL,
                                             GetToolsCount()
                                         );

-                return;
+                break;

             }
         }
 
         // we don't have any disabled bitmaps
     }
             }
         }
 
         // we don't have any disabled bitmaps
     }

-
-    m_disabledImgList = NULL;

 }
 
 bool wxToolBar::Realize()
 {
     const size_t nTools = GetToolsCount();
     if ( nTools == 0 )
 }
 
 bool wxToolBar::Realize()
 {
     const size_t nTools = GetToolsCount();
     if ( nTools == 0 )

-    {

         // nothing to do
         return true;
         // nothing to do
         return true;

-    }

 
     const bool isVertical = HasFlag(wxTB_VERTICAL);
 
     bool doRemap, doRemapBg, doTransparent;
 
     const bool isVertical = HasFlag(wxTB_VERTICAL);
 
     bool doRemap, doRemapBg, doTransparent;

-#ifdef __WXWINCE__
-    doRemapBg = false;
-    doRemap = false;
-    doTransparent = false;
-#else
-    if (wxSystemOptions::GetOptionInt(wxT("msw.remap")) == 2)
+    doRemapBg = doRemap = doTransparent = false;
+
+#ifndef __WXWINCE__
+    int remapValue = (-1);
+    const wxChar *remapOptionStr = wxT("msw.remap");
+    if (wxSystemOptions::HasOption( remapOptionStr ))
+        remapValue = wxSystemOptions::GetOptionInt( remapOptionStr );
+
+    doTransparent = (remapValue == 2);
+    if (!doTransparent)

     {
     {

-        doRemapBg = doRemap = false;
-        doTransparent = true;
-    }
-    else
-    {   doRemap = !wxSystemOptions::HasOption(wxT("msw.remap"))
-            || wxSystemOptions::GetOptionInt(wxT("msw.remap")) == 1;
+        doRemap = (remapValue != 0);

         doRemapBg = !doRemap;
         doRemapBg = !doRemap;

-        doTransparent = false;

     }
 #endif
 
     }
 #endif
 


@@ -610,20 +587,22 @@ bool wxToolBar::Realize()
         sizeBmp.x = m_defaultWidth;
         sizeBmp.y = m_defaultHeight;
 
         sizeBmp.x = m_defaultWidth;
         sizeBmp.y = m_defaultHeight;
 

-        const wxCoord totalBitmapWidth = m_defaultWidth * nTools,
+        const wxCoord totalBitmapWidth  = m_defaultWidth *
+                                          wx_truncate_cast(wxCoord, nTools),

                       totalBitmapHeight = m_defaultHeight;
 
                       totalBitmapHeight = m_defaultHeight;
 

-        // Create a bitmap and copy all the tool bitmaps to it
+        // Create a bitmap and copy all the tool bitmaps into it

         wxMemoryDC dcAllButtons;
         wxBitmap bitmap(totalBitmapWidth, totalBitmapHeight);
         dcAllButtons.SelectObject(bitmap);
         wxMemoryDC dcAllButtons;
         wxBitmap bitmap(totalBitmapWidth, totalBitmapHeight);
         dcAllButtons.SelectObject(bitmap);

-#ifdef __WXWINCE__
-        dcAllButtons.SetBackground(wxBrush(wxColour(192,192,192)));
-#else
+
+#ifndef __WXWINCE__

         if (doTransparent)
             dcAllButtons.SetBackground(*wxTRANSPARENT_BRUSH);
         else
         if (doTransparent)
             dcAllButtons.SetBackground(*wxTRANSPARENT_BRUSH);
         else

-            dcAllButtons.SetBackground(*wxLIGHT_GREY_BRUSH);
+            dcAllButtons.SetBackground(wxBrush(GetBackgroundColour()));
+#else
+        dcAllButtons.SetBackground(wxBrush(wxColour(192,192,192)));

 #endif
         dcAllButtons.Clear();
 
 #endif
         dcAllButtons.Clear();
 


@@ -641,8 +620,6 @@ bool wxToolBar::Realize()
                 totalBitmapWidth, totalBitmapHeight);
 
             dcAllButtons.SelectObject(bitmap);
                 totalBitmapWidth, totalBitmapHeight);
 
             dcAllButtons.SelectObject(bitmap);

-
-

         }
 #endif // !__WXWINCE__
 
         }
 #endif // !__WXWINCE__
 


@@ -689,17 +666,20 @@ bool wxToolBar::Realize()
                         wxImage imgGreyed;
                         wxCreateGreyedImage(bmp.ConvertToImage(), imgGreyed);
 
                         wxImage imgGreyed;
                         wxCreateGreyedImage(bmp.ConvertToImage(), imgGreyed);
 

-                        // we need to have light grey background colour for
-                        // MapBitmap() to work correctly
-                        for ( int y = 0; y < h; y++ )
+                        if (doRemap)

                         {
                         {

-                            for ( int x = 0; x < w; x++ )
+                            // we need to have light grey background colour for
+                            // MapBitmap() to work correctly
+                            for ( int y = 0; y < h; y++ )

                             {
                             {

-                                if ( imgGreyed.IsTransparent(x, y) )
-                                    imgGreyed.SetRGB(x, y,
-                                                     wxLIGHT_GREY->Red(),
-                                                     wxLIGHT_GREY->Green(),
-                                                     wxLIGHT_GREY->Blue());
+                                for ( int x = 0; x < w; x++ )
+                                {
+                                    if ( imgGreyed.IsTransparent(x, y) )
+                                        imgGreyed.SetRGB(x, y,
+                                                         wxLIGHT_GREY->Red(),
+                                                         wxLIGHT_GREY->Green(),
+                                                         wxLIGHT_GREY->Blue());
+                                }

                             }
                         }
 
                             }
                         }
 


@@ -707,7 +687,8 @@ bool wxToolBar::Realize()
                     }
 #endif // wxUSE_IMAGE
 
                     }
 #endif // wxUSE_IMAGE
 

-                    MapBitmap(bmpDisabled.GetHBITMAP(), w, h);
+                    if (doRemap)
+                        MapBitmap(bmpDisabled.GetHBITMAP(), w, h);

 
                     m_disabledImgList->Add(bmpDisabled);
                 }
 
                     m_disabledImgList->Add(bmpDisabled);
                 }


@@ -730,8 +711,6 @@ bool wxToolBar::Realize()
             // Map to system colours
             hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,
                 totalBitmapWidth, totalBitmapHeight);
             // Map to system colours
             hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,
                 totalBitmapWidth, totalBitmapHeight);

-
-

         }
 
         bool addBitmap = true;
         }
 
         bool addBitmap = true;


@@ -826,7 +805,6 @@ bool wxToolBar::Realize()
             continue;
         }
 
             continue;
         }
 

-

         TBBUTTON& button = buttons[i];
 
         wxZeroMemory(button);
         TBBUTTON& button = buttons[i];
 
         wxZeroMemory(button);


@@ -851,9 +829,7 @@ bool wxToolBar::Realize()
                 {
                     const wxString& label = tool->GetLabel();
                     if ( !label.empty() )
                 {
                     const wxString& label = tool->GetLabel();
                     if ( !label.empty() )

-                    {

                         button.iString = (int)label.c_str();
                         button.iString = (int)label.c_str();

-                    }

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


@@ -890,15 +866,14 @@ bool wxToolBar::Realize()
                                 wxToolBarToolBase *tool = nodePrev->GetData();
                                 if ( !tool->IsButton() || tool->GetKind() != wxITEM_RADIO )
                                     break;
                                 wxToolBarToolBase *tool = nodePrev->GetData();
                                 if ( !tool->IsButton() || tool->GetKind() != wxITEM_RADIO )
                                     break;

-                                
+

                                 if ( tool->Toggle(false) )
                                 if ( tool->Toggle(false) )

-                                {

                                     DoToggleTool(tool, false);
                                     DoToggleTool(tool, false);

-                                }
+

                                 prevButton.fsState = TBSTATE_ENABLED;
                                 nodePrev = nodePrev->GetPrevious();
                                 prevIndex--;
                                 prevButton.fsState = TBSTATE_ENABLED;
                                 nodePrev = nodePrev->GetPrevious();
                                 prevIndex--;

-                            }                            
+                            }

                         }
 
                         isRadio = true;
                         }
 
                         isRadio = true;


@@ -908,12 +883,14 @@ bool wxToolBar::Realize()
                         button.fsStyle = TBSTYLE_CHECK;
                         break;
 
                         button.fsStyle = TBSTYLE_CHECK;
                         break;
 

+                    case wxITEM_NORMAL:
+                        button.fsStyle = TBSTYLE_BUTTON;
+                        break;
+

                     default:
                         wxFAIL_MSG( _T("unexpected toolbar button kind") );
                     default:
                         wxFAIL_MSG( _T("unexpected toolbar button kind") );

-                        // fall through
-
-                    case wxITEM_NORMAL:

                         button.fsStyle = TBSTYLE_BUTTON;
                         button.fsStyle = TBSTYLE_BUTTON;

+                        break;

                 }
 
                 bitmapId++;
                 }
 
                 bitmapId++;


@@ -967,7 +944,6 @@ bool wxToolBar::Realize()
         }
 
         wxControl *control = tool->GetControl();
         }
 
         wxControl *control = tool->GetControl();

-

         wxSize size = control->GetSize();
 
         // the position of the leftmost controls corner
         wxSize size = control->GetSize();
 
         // the position of the leftmost controls corner


@@ -1043,7 +1019,7 @@ bool wxToolBar::Realize()
             left = 0;
             top = y;
 
             left = 0;
             top = y;
 

-            y += height + 2*GetMargins().y;
+            y += height + 2 * GetMargins().y;

         }
         else // horizontal toolbar
         {
         }
         else // horizontal toolbar
         {


@@ -1063,21 +1039,19 @@ bool wxToolBar::Realize()
     if ( !isVertical )
     {
         if ( m_maxRows == 0 )
     if ( !isVertical )
     {
         if ( m_maxRows == 0 )

-        {

             // if not set yet, only one row
             SetRows(1);
             // if not set yet, only one row
             SetRows(1);

-        }

     }
     else if ( m_nButtons > 0 ) // vertical non empty toolbar
     {
         if ( m_maxRows == 0 )
     }
     else if ( m_nButtons > 0 ) // vertical non empty toolbar
     {
         if ( m_maxRows == 0 )

-        {

             // if not set yet, have one column
             SetRows(m_nButtons);
             // if not set yet, have one column
             SetRows(m_nButtons);

-        }

     }
 
     InvalidateBestSize();
     }
 
     InvalidateBestSize();

+    SetBestFittingSize();
+

     return true;
 }
 
     return true;
 }
 


@@ -1234,22 +1208,22 @@ wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
     pt.x = x;
     pt.y = y;
     int index = (int)::SendMessage(GetHwnd(), TB_HITTEST, 0, (LPARAM)&pt);
     pt.x = x;
     pt.y = y;
     int index = (int)::SendMessage(GetHwnd(), TB_HITTEST, 0, (LPARAM)&pt);

+

     // MBN: when the point ( x, y ) is close to the toolbar border
     //      TB_HITTEST returns m_nButtons ( not -1 )
     if ( index < 0 || (size_t)index >= m_nButtons )
     // MBN: when the point ( x, y ) is close to the toolbar border
     //      TB_HITTEST returns m_nButtons ( not -1 )
     if ( index < 0 || (size_t)index >= m_nButtons )

-    {

         // it's a separator or there is no tool at all there
         return (wxToolBarToolBase *)NULL;
         // it's a separator or there is no tool at all there
         return (wxToolBarToolBase *)NULL;

-    }

 
 

-    // if comctl32 version < 4.71 wxToolBar95 adds dummy spacers
-#if defined(_WIN32_IE) && (_WIN32_IE >= 0x400 )
+    // when TB_SETBUTTONINFO is available (both during compile- and run-time),
+    // we don't use the dummy separators hack
+#ifdef TB_SETBUTTONINFO

     if ( wxApp::GetComCtl32Version() >= 471 )
     {
         return m_tools.Item((size_t)index)->GetData();
     }
     else
     if ( wxApp::GetComCtl32Version() >= 471 )
     {
         return m_tools.Item((size_t)index)->GetData();
     }
     else

-#endif
+#endif // TB_SETBUTTONINFO

     {
         return GetItemSkippingDummySpacers( m_tools, (size_t) index );
     }
     {
         return GetItemSkippingDummySpacers( m_tools, (size_t) index );
     }


@@ -1263,9 +1237,7 @@ void wxToolBar::UpdateSize()
     // we must also refresh the frame after the toolbar size (possibly) changed
     wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
     if ( frame )
     // we must also refresh the frame after the toolbar size (possibly) changed
     wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
     if ( frame )

-    {

         frame->SendSizeEvent();
         frame->SendSizeEvent();

-    }

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


@@ -1446,10 +1418,10 @@ bool wxToolBar::HandleSize(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)
 
 bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
 {
 
 bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
 {

-    // erase any dummy separators which we used for aligning the controls if
-    // any here
+    // erase any dummy separators which were used
+    // for aligning the controls if any here

 
 

-    // first of all, do we have any controls at all?
+    // first of all, are there any controls at all?

     wxToolBarToolsList::compatibility_iterator node;
     for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
     {
     wxToolBarToolsList::compatibility_iterator node;
     for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
     {


@@ -1458,10 +1430,8 @@ bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
     }
 
     if ( !node )
     }
 
     if ( !node )

-    {

         // no controls, nothing to erase
         return false;
         // no controls, nothing to erase
         return false;

-    }

 
     // prepare the DC on which we'll be drawing
     wxClientDC dc(this);
 
     // prepare the DC on which we'll be drawing
     wxClientDC dc(this);


@@ -1470,10 +1440,8 @@ bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
 
     RECT r;
     if ( !::GetUpdateRect(GetHwnd(), &r, FALSE) )
 
     RECT r;
     if ( !::GetUpdateRect(GetHwnd(), &r, FALSE) )

-    {

         // nothing to redraw anyhow
         return false;
         // nothing to redraw anyhow
         return false;

-    }

 
     wxRect rectUpdate;
     wxCopyRECTToRect(r, rectUpdate);
 
     wxRect rectUpdate;
     wxCopyRECTToRect(r, rectUpdate);


@@ -1551,14 +1519,14 @@ void wxToolBar::HandleMouseMove(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)
     wxToolBarToolBase* tool = FindToolForPosition( x, y );
 
     // cursor left current tool
     wxToolBarToolBase* tool = FindToolForPosition( x, y );
 
     // cursor left current tool

-    if( tool != m_pInTool && !tool )
+    if ( tool != m_pInTool && !tool )

     {
         m_pInTool = 0;
         OnMouseEnter( -1 );
     }
 
     // cursor entered a tool
     {
         m_pInTool = 0;
         OnMouseEnter( -1 );
     }
 
     // cursor entered a tool

-    if( tool != m_pInTool && tool )
+    if ( tool != m_pInTool && tool )

     {
         m_pInTool = tool;
         OnMouseEnter( tool->GetId() );
     {
         m_pInTool = tool;
         OnMouseEnter( tool->GetId() );


@@ -1585,6 +1553,9 @@ WXLRESULT wxToolBar::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam
             if ( HandlePaint(wParam, lParam) )
                 return 0;
 #endif
             if ( HandlePaint(wParam, lParam) )
                 return 0;
 #endif

+
+        default:
+            break;

     }
 
     return wxControl::MSWWindowProc(nMsg, wParam, lParam);
     }
 
     return wxControl::MSWWindowProc(nMsg, wParam, lParam);


@@ -1700,5 +1671,5 @@ WXHBITMAP wxToolBar::MapBitmap(WXHBITMAP bitmap, int width, int height)
 #endif // 0
 }
 
 #endif // 0
 }
 

-#endif // wxUSE_TOOLBAR && Win95
+#endif // wxUSE_TOOLBAR