Fix STL compilation (note: this is not the correct fix, but since

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

diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp
index 91d3f6f47fa633b99dc40d7a9aaeafc7cc9f6ebc..9806009b293964f8215c8a915d92e5940592138a 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 ;
             }
@@ -182,7 +182,7 @@ static pascal OSStatus wxMacToolBarToolControlEventHandler( EventHandlerCallRef
     return result ;
 }
 
-pascal OSStatus wxMacToolBarToolEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+static pascal OSStatus wxMacToolBarToolEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
     OSStatus result = eventNotHandledErr ;
 
@@ -632,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 ) ;