Change the name of the smart pointer so that wxZipOutputStreamPtr is free

[wxWidgets.git] / src / mac / carbon / toolbar.cpp

diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp
index 1f5403adb325e52f006e96659575a19f39cd4b37..70866d776d460e85cd31527fe8d7b19528782534 100644 (file)
--- a/src/mac/carbon/toolbar.cpp
+++ b/src/mac/carbon/toolbar.cpp
@@ -170,7 +170,7 @@ static pascal OSStatus wxMacToolBarToolControlEventHandler( EventHandlerCallRef
                 
                 ControlPartCode pc = kControlNoPart ;
                 if ( CGRectContainsPoint( rect , pt ) )
-                    pc = kControlButtonPart ;
+                    pc = kControlIconPart ;
                 cEvent.SetParameter( kEventParamControlPart , typeControlPartCode, pc ) ;
                 result = noErr ;
             }
@@ -436,6 +436,21 @@ bool wxToolBar::Realize()
                     DoToggleTool(tool, true);
                 }
             }
+            else if (tool->IsToggled())
+            {
+                wxToolBarToolsList::compatibility_iterator nodePrev = node->GetPrevious();
+                while ( nodePrev )
+                {
+                    wxToolBarToolBase *tool = nodePrev->GetData();
+                    if ( !tool->IsButton() || (tool->GetKind() != wxITEM_RADIO) )
+                        break;
+                    if ( tool->Toggle(false) )
+                    {
+                        DoToggleTool(tool, false);
+                    }
+                    nodePrev = nodePrev->GetPrevious();
+                }
+            }
             isRadio = TRUE;
         }
         else
@@ -617,7 +632,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
                 CreateIconControl( window , &toolrect , &info , false , &controlHandle ) ;
         #else        
                 SInt16 behaviour = kControlBehaviorOffsetContents ;
-                if ( CanBeToggled() )
+                if ( tool->CanBeToggled() )
                     behaviour += kControlBehaviorToggles ;
                 CreateBevelButtonControl( window , &toolrect , CFSTR("") , kControlBevelButtonNormalBevel , behaviour , &info , 
                     0 , 0 , 0 , &controlHandle ) ;