cleanup image after application

[wxWidgets.git] / src / common / tbarbase.cpp

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index 2496b8a9749f95617a530d51c375fd42025ffa78..69f106b9ee85172b1b780cd3d94e2efd34316caf 100644 (file)
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -59,7 +59,7 @@ WX_DEFINE_LIST(wxToolBarToolsList);
 // wxToolBarToolBase
 // ----------------------------------------------------------------------------
 
 // wxToolBarToolBase
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxToolBarToolBase, wxObject)   
+IMPLEMENT_DYNAMIC_CLASS(wxToolBarToolBase, wxObject)

 
 bool wxToolBarToolBase::Enable(bool enable)
 {
 
 bool wxToolBarToolBase::Enable(bool enable)
 {


@@ -385,7 +385,10 @@ void wxToolBarBase::UnToggleRadioGroup(wxToolBarToolBase *tool)
         if ( !tool->IsButton() || tool->GetKind() != wxITEM_RADIO )
             break;
 
         if ( !tool->IsButton() || tool->GetKind() != wxITEM_RADIO )
             break;
 

-        tool->Toggle(false);
+        if ( tool->Toggle(false) )
+        {
+            DoToggleTool(tool, false);
+        }

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


@@ -398,7 +401,10 @@ void wxToolBarBase::UnToggleRadioGroup(wxToolBarToolBase *tool)
         if ( !tool->IsButton() || tool->GetKind() != wxITEM_RADIO )
             break;
 
         if ( !tool->IsButton() || tool->GetKind() != wxITEM_RADIO )
             break;
 

-        tool->Toggle(false);
+        if ( tool->Toggle(false) )
+        {
+            DoToggleTool(tool, false);
+        }

 
         nodePrev = nodePrev->GetPrevious();
     }
 
         nodePrev = nodePrev->GetPrevious();
     }


@@ -592,7 +598,7 @@ void wxToolBarBase::OnRightClick(int id,
 }
 
 // Called when the mouse cursor enters a tool bitmap (no button pressed).
 }
 
 // Called when the mouse cursor enters a tool bitmap (no button pressed).

-// Argument is -1 if mouse is exiting the toolbar.
+// Argument is wxID_ANY if mouse is exiting the toolbar.

 // Note that for this event, the id of the window is used,
 // and the integer parameter of wxCommandEvent is used to retrieve
 // the tool id.
 // Note that for this event, the id of the window is used,
 // and the integer parameter of wxCommandEvent is used to retrieve
 // the tool id.


@@ -605,9 +611,9 @@ void wxToolBarBase::OnMouseEnter(int id)
     wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
     if( frame )
     {
     wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
     if( frame )
     {

-        wxToolBarToolBase* tool = id == -1 ? (wxToolBarToolBase*)0 : FindById(id);
+        wxToolBarToolBase* tool = id == wxID_ANY ? (wxToolBarToolBase*)0 : FindById(id);

         wxString help = tool ? tool->GetLongHelp() : wxString();
         wxString help = tool ? tool->GetLongHelp() : wxString();

-        frame->DoGiveHelp( help, id != -1 );
+        frame->DoGiveHelp( help, id != wxID_ANY );

     }
 
     (void)GetEventHandler()->ProcessEvent(event);
     }
 
     (void)GetEventHandler()->ProcessEvent(event);