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 8e32ae39ed584469cf7ae12f423df405e4121d27..2aadedd4765e4641b9d0b4c74e143851ae6ae1e7 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -239,17 +239,14 @@ bool wxToolBar::Create(wxWindow *parent,
     SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
     // workaround for flat toolbar on Windows XP classic style: we have to set
     SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
     // 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
+    // the style after creating the control; doing it at creation time doesn't work

 #if wxUSE_UXTHEME
     if ( style & wxTB_FLAT )
     {
         LRESULT style = ::SendMessage(GetHwnd(), TB_GETSTYLE, 0, 0L);
 
         if ( !(style & TBSTYLE_FLAT) )
 #if wxUSE_UXTHEME
     if ( style & wxTB_FLAT )
     {
         LRESULT style = ::SendMessage(GetHwnd(), TB_GETSTYLE, 0, 0L);
 
         if ( !(style & TBSTYLE_FLAT) )

-        {

             ::SendMessage(GetHwnd(), TB_SETSTYLE, 0, style | TBSTYLE_FLAT);
             ::SendMessage(GetHwnd(), TB_SETSTYLE, 0, style | TBSTYLE_FLAT);

-        }

     }
 #endif // wxUSE_UXTHEME
 
     }
 #endif // wxUSE_UXTHEME
 


@@ -300,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


@@ -327,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;
 }


@@ -367,6 +360,7 @@ wxSize wxToolBar::DoGetBestSize() const
     }
 
     CacheBestSize(sizeBest);
     }
 
     CacheBestSize(sizeBest);

+

     return sizeBest;
 }
 
     return sizeBest;
 }
 


@@ -379,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) )


@@ -393,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 )


@@ -451,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


@@ -471,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;
     }
 


@@ -504,6 +491,7 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
     }
 
     InvalidateBestSize();
     }
 
     InvalidateBestSize();

+

     return true;
 }
 
     return true;
 }
 


@@ -546,29 +534,25 @@ bool wxToolBar::Realize()
 {
     const size_t nTools = GetToolsCount();
     if ( nTools == 0 )
 {
     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
 


@@ -607,17 +591,18 @@ bool wxToolBar::Realize()
                                           wx_truncate_cast(wxCoord, nTools),
                       totalBitmapHeight = m_defaultHeight;
 
                                           wx_truncate_cast(wxCoord, nTools),
                       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();
 


@@ -703,9 +688,7 @@ bool wxToolBar::Realize()
 #endif // wxUSE_IMAGE
 
                     if (doRemap)
 #endif // wxUSE_IMAGE
 
                     if (doRemap)

-                    {

                         MapBitmap(bmpDisabled.GetHBITMAP(), w, h);
                         MapBitmap(bmpDisabled.GetHBITMAP(), w, h);

-                    }

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


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

-

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


@@ -847,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();


@@ -888,9 +868,8 @@ bool wxToolBar::Realize()
                                     break;
 
                                 if ( tool->Toggle(false) )
                                     break;
 
                                 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--;


@@ -904,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++;


@@ -963,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


@@ -1039,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
         {


@@ -1059,18 +1039,14 @@ 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();


@@ -1232,13 +1208,12 @@ 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;

-    }

 
     // when TB_SETBUTTONINFO is available (both during compile- and run-time),
     // we don't use the dummy separators hack
 
     // when TB_SETBUTTONINFO is available (both during compile- and run-time),
     // we don't use the dummy separators hack


@@ -1262,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();

-    }

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


@@ -1445,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() )
     {


@@ -1457,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);


@@ -1469,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);


@@ -1550,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() );


@@ -1584,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);


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

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