The mac toolbar was redrawing buttons when not shown -

making them appear at arbitrary times.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/mac/carbon/toolbar.cpp

@@ -25,8 +25,8 @@
 IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
-	EVT_MOUSE_EVENTS( wxToolBar::OnMouse ) 
-	EVT_PAINT( wxToolBar::OnPaint ) 
+    EVT_MOUSE_EVENTS( wxToolBar::OnMouse ) 
+    EVT_PAINT( wxToolBar::OnPaint ) 
 END_EVENT_TABLE()
 #endif
 
@@ -66,7 +66,7 @@ public:
     void SetSeparatorsCount(size_t count) { m_nSepCount = count; }
     size_t GetSeparatorsCount() const { return m_nSepCount; }
 
-    int		m_index ;
+    int     m_index ;
 private:
     size_t m_nSepCount;
 };
@@ -143,13 +143,13 @@ bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
       m_windowId = id;
 
   {
-	m_width = size.x ;
-	m_height = size.y ;
-	int x = pos.x ;
-	int y = pos.y ;
-	AdjustForParentClientOrigin(x, y, wxSIZE_USE_EXISTING);
-	m_x = x ;
-	m_y = y ;
+    m_width = size.x ;
+    m_height = size.y ;
+    int x = pos.x ;
+    int y = pos.y ;
+    AdjustForParentClientOrigin(x, y, wxSIZE_USE_EXISTING);
+    m_x = x ;
+    m_y = y ;
   }
   
   return TRUE;
@@ -342,20 +342,20 @@ wxSize wxToolBar::GetToolSize() const
 
 void wxToolBar::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
 {
-	int index = 0 ;
-	for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
-	{
-		if ( m_macToolHandles[index] == (void*) control )
-		{
-   			wxToolBarTool *tool = (wxToolBarTool *)m_tools.Nth( index )->Data();
-			if ( tool->CanBeToggled() )
-    		{
-        		tool->Toggle( GetControlValue( control ) ) ;
-    		}
-			OnLeftClick( tool->GetId() , tool -> IsToggled() ) ;
-			break ;
-		}
-	}
+    int index = 0 ;
+    for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
+    {
+        if ( m_macToolHandles[index] == (void*) control )
+        {
+            wxToolBarTool *tool = (wxToolBarTool *)m_tools.Nth( index )->Data();
+            if ( tool->CanBeToggled() )
+            {
+                tool->Toggle( GetControlValue( control ) ) ;
+            }
+            OnLeftClick( tool->GetId() , tool -> IsToggled() ) ;
+            break ;
+        }
+    }
 }
 
 void wxToolBar::SetRows(int nRows)
@@ -374,24 +374,24 @@ void wxToolBar::MacSuperChangedPosition()
   if (m_tools.Number() > 0)
   {
 
-	Point localOrigin ;
-	Rect clipRect ;
-	WindowRef window ;
-	wxWindow *win ;
+    Point localOrigin ;
+    Rect clipRect ;
+    WindowRef window ;
+    wxWindow *win ;
     
-	GetParent()->MacGetPortParams( &localOrigin , &clipRect , &window , &win ) ;
+    GetParent()->MacGetPortParams( &localOrigin , &clipRect , &window , &win ) ;
 
-	Rect toolbarrect = { m_y + localOrigin.v , m_x  + localOrigin.h , 
-		m_y + m_height + localOrigin.v  , m_x + m_width + localOrigin.h} ;
-	ControlFontStyleRec		controlstyle ;
+    Rect toolbarrect = { m_y + localOrigin.v , m_x  + localOrigin.h , 
+        m_y + m_height + localOrigin.v  , m_x + m_width + localOrigin.h} ;
+    ControlFontStyleRec     controlstyle ;
 
-	controlstyle.flags = kControlUseFontMask ;
-	controlstyle.font = kControlFontSmallSystemFont ;
+    controlstyle.flags = kControlUseFontMask ;
+    controlstyle.font = kControlFontSmallSystemFont ;
     
-	wxNode *node = m_tools.First();
-	int noButtons = 0;
-	int x = 0 ;
-	wxSize toolSize = GetToolSize() ;
+    wxNode *node = m_tools.First();
+    int noButtons = 0;
+    int x = 0 ;
+    wxSize toolSize = GetToolSize() ;
     int tw, th;
     GetSize(& tw, & th);
     
@@ -399,67 +399,67 @@ void wxToolBar::MacSuperChangedPosition()
     int maxHeight = 0 ;
     int toolcount = 0 ;
     {
-   		WindowRef rootwindow = GetMacRootWindow() ;
-   		wxWindow* wxrootwindow = wxFindWinFromMacWindow( rootwindow ) ;
-   		::SetThemeWindowBackground( rootwindow , kThemeBrushDialogBackgroundActive , false ) ;
-   		wxMacDrawingHelper focus( wxrootwindow ) ;
-    	while (node)
-    	{
-    		wxToolBarTool *tool = (wxToolBarTool *)node->Data();
-    		wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetBitmap1().GetRefData()) ;
+        WindowRef rootwindow = GetMacRootWindow() ;
+        wxWindow* wxrootwindow = wxFindWinFromMacWindow( rootwindow ) ;
+        ::SetThemeWindowBackground( rootwindow , kThemeBrushDialogBackgroundActive , false ) ;
+        wxMacDrawingHelper focus( wxrootwindow ) ;
+        while (node)
+        {
+            wxToolBarTool *tool = (wxToolBarTool *)node->Data();
+            wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetBitmap1().GetRefData()) ;
             
-    		if(  !tool->IsSeparator()  )
-    		{
-    			Rect toolrect = { toolbarrect.top + m_yMargin + kwxMacToolBarTopMargin, toolbarrect.left + x + m_xMargin + kwxMacToolBarLeftMargin , 0 , 0 } ;
-    			toolrect.right = toolrect.left + toolSize.x ;
-    			toolrect.bottom = toolrect.top + toolSize.y ;
+            if(  !tool->IsSeparator()  )
+            {
+                Rect toolrect = { toolbarrect.top + m_yMargin + kwxMacToolBarTopMargin, toolbarrect.left + x + m_xMargin + kwxMacToolBarLeftMargin , 0 , 0 } ;
+                toolrect.right = toolrect.left + toolSize.x ;
+                toolrect.bottom = toolrect.top + toolSize.y ;
                             
-    			ControlHandle m_macToolHandle = (ControlHandle) m_macToolHandles[toolcount++] ;
+                ControlHandle m_macToolHandle = (ControlHandle) m_macToolHandles[toolcount++] ;
                 
-            	{
-            		Rect contrlRect ;		
-            		GetControlBounds( m_macToolHandle , &contrlRect ) ; 
-            		int former_mac_x = contrlRect.left ;
-            		int former_mac_y = contrlRect.top ;
-            		int mac_x = toolrect.left ;
-            		int mac_y = toolrect.top ;
+                {
+                    Rect contrlRect ;       
+                    GetControlBounds( m_macToolHandle , &contrlRect ) ; 
+                    int former_mac_x = contrlRect.left ;
+                    int former_mac_y = contrlRect.top ;
+                    int mac_x = toolrect.left ;
+                    int mac_y = toolrect.top ;
                                 
-            		if ( mac_x != former_mac_x || mac_y != former_mac_y )
-            		{
-            			{
-            				Rect inval = { former_mac_y , former_mac_x , former_mac_y + toolSize.y , former_mac_x + toolSize.y } ;
-            				InvalWindowRect( rootwindow , &inval ) ;
-            			}
-            	  		UMAMoveControl( m_macToolHandle , mac_x , mac_y ) ;
-            			{
-            				Rect inval = { mac_y , mac_x , mac_y + toolSize.y , mac_x + toolSize.y } ;
-            				InvalWindowRect( rootwindow , &inval ) ;
-            			}
-            		}
-            	}
+                    if ( mac_x != former_mac_x || mac_y != former_mac_y )
+                    {
+                        {
+                            Rect inval = { former_mac_y , former_mac_x , former_mac_y + toolSize.y , former_mac_x + toolSize.y } ;
+                            InvalWindowRect( rootwindow , &inval ) ;
+                        }
+                        UMAMoveControl( m_macToolHandle , mac_x , mac_y ) ;
+                        {
+                            Rect inval = { mac_y , mac_x , mac_y + toolSize.y , mac_x + toolSize.y } ;
+                            InvalWindowRect( rootwindow , &inval ) ;
+                        }
+                    }
+                }
                 
-    			x += (int)toolSize.x;
-    			noButtons ++;
-    		}
-    		else
-    		{
+                x += (int)toolSize.x;
+                noButtons ++;
+            }
+            else
+            {
                 toolcount++ ;
-    			x += (int)toolSize.x / 4;
-    		}
-    	    if ( toolbarrect.left + x + m_xMargin  + kwxMacToolBarLeftMargin- m_x - localOrigin.h > maxWidth)
-        	  	maxWidth = toolbarrect.left + x  + kwxMacToolBarLeftMargin+ m_xMargin - m_x - localOrigin.h;
-        	if (toolbarrect.top + m_yMargin  + kwxMacToolBarTopMargin - m_y - localOrigin.v > maxHeight)
-          		maxHeight = toolbarrect.top  + kwxMacToolBarTopMargin + m_yMargin - m_y - localOrigin.v ;
+                x += (int)toolSize.x / 4;
+            }
+            if ( toolbarrect.left + x + m_xMargin  + kwxMacToolBarLeftMargin- m_x - localOrigin.h > maxWidth)
+                maxWidth = toolbarrect.left + x  + kwxMacToolBarLeftMargin+ m_xMargin - m_x - localOrigin.h;
+            if (toolbarrect.top + m_yMargin  + kwxMacToolBarTopMargin - m_y - localOrigin.v > maxHeight)
+                maxHeight = toolbarrect.top  + kwxMacToolBarTopMargin + m_yMargin - m_y - localOrigin.v ;
 
-    		node = node->Next();
-    	}
-  		if ( wxrootwindow->IsKindOf( CLASSINFO( wxDialog ) ) )
-  		{
-  		}
-  		else
-  		{
-  			::SetThemeWindowBackground( rootwindow , kThemeBrushDocumentWindowBackground , false ) ;
-  		}
+            node = node->Next();
+        }
+        if ( wxrootwindow->IsKindOf( CLASSINFO( wxDialog ) ) )
+        {
+        }
+        else
+        {
+            ::SetThemeWindowBackground( rootwindow , kThemeBrushDocumentWindowBackground , false ) ;
+        }
     }
 
      if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
@@ -469,10 +469,10 @@ void wxToolBar::MacSuperChangedPosition()
            // if not set yet, only one row
            SetRows(1);
        }
-      	maxWidth = tw ; 
+        maxWidth = tw ; 
        maxHeight += toolSize.y;
-     	maxHeight += m_yMargin + kwxMacToolBarTopMargin;
-     	m_maxHeight = maxHeight ;
+        maxHeight += m_yMargin + kwxMacToolBarTopMargin;
+        m_maxHeight = maxHeight ;
      }
      else
      {
@@ -483,8 +483,8 @@ void wxToolBar::MacSuperChangedPosition()
        }
        maxHeight = th ;
        maxWidth += toolSize.x;
-     	maxWidth += m_xMargin + kwxMacToolBarLeftMargin;
-     	m_maxWidth = maxWidth ;
+        maxWidth += m_xMargin + kwxMacToolBarLeftMargin;
+        m_maxWidth = maxWidth ;
      }
 
      SetSize(maxWidth, maxHeight);
@@ -498,55 +498,61 @@ wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
     MacClientToRootWindow( &x , &y ) ;
     Point pt = { y ,x } ;
 
-	int index = 0 ;
-	for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
-	{
-		if ( m_macToolHandles[index] )
-		{
-			Rect bounds ;
-			GetControlBounds((ControlHandle) m_macToolHandles[index], &bounds ) ;
-			if ( PtInRect( pt , &bounds ) )
-			{
-				return  (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ;
-			}
-		}
-	}
+    int index = 0 ;
+    for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
+    {
+        if ( m_macToolHandles[index] )
+        {
+            Rect bounds ;
+            GetControlBounds((ControlHandle) m_macToolHandles[index], &bounds ) ;
+            if ( PtInRect( pt , &bounds ) )
+            {
+                return  (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ;
+            }
+        }
+    }
 
     return (wxToolBarToolBase *)NULL;
 }
 
 wxString wxToolBar::MacGetToolTipString( wxPoint &pt )
 {
-	wxToolBarToolBase* tool = FindToolForPosition( pt.x , pt.y ) ;
-	if ( tool )
-	{
-		return tool->GetShortHelp() ;
-	}
-	return "" ;
+    wxToolBarToolBase* tool = FindToolForPosition( pt.x , pt.y ) ;
+    if ( tool )
+    {
+        return tool->GetShortHelp() ;
+    }
+    return "" ;
 }
 
 void wxToolBar::DoEnableTool(wxToolBarToolBase *t, bool enable)
 {
-        wxToolBarTool *tool = (wxToolBarTool *)t;
-        if ( tool->m_index < 0 )
-        	return ;
+    if (!IsShown())
+        return ;
 
-        ControlHandle control = (ControlHandle) m_macToolHandles[ tool->m_index ] ;
+    wxToolBarTool *tool = (wxToolBarTool *)t;
+    if ( tool->m_index < 0 )
+        return ;
            
-		if ( enable )
-			UMAActivateControl( control ) ;
-		else
-			UMADeactivateControl( control ) ;
+    ControlHandle control = (ControlHandle) m_macToolHandles[ tool->m_index ] ;
+
+    if ( enable )
+        UMAActivateControl( control ) ;
+    else
+        UMADeactivateControl( control ) ;
 }
 
 void wxToolBar::DoToggleTool(wxToolBarToolBase *t, bool toggle)
 {
-       wxToolBarTool *tool = (wxToolBarTool *)t;
-        if ( tool->m_index < 0 )
-        	return ;
+    if (!IsShown())
+        return ;
 
-       ControlHandle control = (ControlHandle) m_macToolHandles[ tool->m_index ] ;
-   		::SetControlValue( control , toggle ) ;
+    wxToolBarTool *tool = (wxToolBarTool *)t;
+    if ( tool->m_index < 0 )
+        return ;
+        
+    ControlHandle control = (ControlHandle) m_macToolHandles[ tool->m_index ] ;
+        ::SetControlValue( control , toggle ) ;
 }
 
 bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
@@ -567,117 +573,117 @@ void wxToolBar::DoSetToggle(wxToolBarToolBase *t, bool toggle)
 
 bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
 {
-		return TRUE ;
+        return TRUE ;
 }
 
 void wxToolBar::OnPaint(wxPaintEvent& event)
 {
-	Point localOrigin ;
-	Rect clipRect ;
-	WindowRef window ;
-	wxWindow *win ;
+    Point localOrigin ;
+    Rect clipRect ;
+    WindowRef window ;
+    wxWindow *win ;
     
-	GetParent()->MacGetPortParams( &localOrigin , &clipRect , &window , &win ) ;
-	if ( window && win )
-	{
-		wxMacDrawingHelper help( win ) ;
-		// the mac control manager always assumes to have the origin at 0,0
-		SetOrigin( 0 , 0 ) ;
+    GetParent()->MacGetPortParams( &localOrigin , &clipRect , &window , &win ) ;
+    if ( window && win )
+    {
+        wxMacDrawingHelper help( win ) ;
+        // the mac control manager always assumes to have the origin at 0,0
+        SetOrigin( 0 , 0 ) ;
         
-		bool			hasTabBehind = false ;
-		wxWindow* parent = GetParent() ;
-		while ( parent )
-		{
-			if( parent->MacGetWindowData() )
-			{
-				::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
-				break ;
-			}
+        bool            hasTabBehind = false ;
+        wxWindow* parent = GetParent() ;
+        while ( parent )
+        {
+            if( parent->MacGetWindowData() )
+            {
+                ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
+                break ;
+            }
             
-			if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) ||  parent->IsKindOf( CLASSINFO( wxTabCtrl ) ))
-			{
-				if ( ((wxControl*)parent)->GetMacControl() )
-					SetUpControlBackground( ((wxControl*)parent)->GetMacControl() , -1 , true ) ;
-				break ;
-			}
+            if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) ||  parent->IsKindOf( CLASSINFO( wxTabCtrl ) ))
+            {
+                if ( ((wxControl*)parent)->GetMacControl() )
+                    SetUpControlBackground( ((wxControl*)parent)->GetMacControl() , -1 , true ) ;
+                break ;
+            }
             
-			parent = parent->GetParent() ;
-		} 
+            parent = parent->GetParent() ;
+        } 
 
-		Rect toolbarrect = { m_y + localOrigin.v , m_x + localOrigin.h , 
-			m_y  + localOrigin.v + m_height , m_x + localOrigin.h + m_width } ;
+        Rect toolbarrect = { m_y + localOrigin.v , m_x + localOrigin.h , 
+            m_y  + localOrigin.v + m_height , m_x + localOrigin.h + m_width } ;
 
-		UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
-		{
-			int index = 0 ;
-			for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
-			{
-				if ( m_macToolHandles[index] )
-				{
-					UMADrawControl( (ControlHandle) m_macToolHandles[index] ) ;
-				}
-			}
-		}
-		::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
-	}
+        UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
+        {
+            int index = 0 ;
+            for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
+            {
+                if ( m_macToolHandles[index] )
+                {
+                    UMADrawControl( (ControlHandle) m_macToolHandles[index] ) ;
+                }
+            }
+        }
+        ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
+    }
 }
 
 void  wxToolBar::OnMouse( wxMouseEvent &event ) 
 {
         
-	if (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK )
-	{
+    if (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK )
+    {
             
-		int x = event.m_x ;
-		int y = event.m_y ;
+        int x = event.m_x ;
+        int y = event.m_y ;
         
-		MacClientToRootWindow( &x , &y ) ;
+        MacClientToRootWindow( &x , &y ) ;
             
-		ControlHandle	control ;
-		Point		localwhere ;
-		GrafPtr		port ;
-		SInt16		controlpart ;
-		WindowRef	window = GetMacRootWindow() ;
+        ControlHandle   control ;
+        Point       localwhere ;
+        GrafPtr     port ;
+        SInt16      controlpart ;
+        WindowRef   window = GetMacRootWindow() ;
         
-		localwhere.h = x ;
-		localwhere.v = y ;
+        localwhere.h = x ;
+        localwhere.v = y ;
     
-		short modifiers = 0;
+        short modifiers = 0;
         
-		if ( !event.m_leftDown && !event.m_rightDown )
-			modifiers  |= btnState ;
+        if ( !event.m_leftDown && !event.m_rightDown )
+            modifiers  |= btnState ;
     
-		if ( event.m_shiftDown )
-			modifiers |= shiftKey ;
+        if ( event.m_shiftDown )
+            modifiers |= shiftKey ;
             
-		if ( event.m_controlDown )
-			modifiers |= controlKey ;
+        if ( event.m_controlDown )
+            modifiers |= controlKey ;
     
-		if ( event.m_altDown )
-			modifiers |= optionKey ;
+        if ( event.m_altDown )
+            modifiers |= optionKey ;
     
-		if ( event.m_metaDown )
-			modifiers |= cmdKey ;
+        if ( event.m_metaDown )
+            modifiers |= cmdKey ;
     
-		controlpart = FindControl( localwhere , window , &control ) ;
-		{
-			if ( control && ::IsControlActive( control ) )
-			{
-				{
-					if ( controlpart == kControlIndicatorPart && !UMAHasAppearance() )
-						controlpart = ::HandleControlClick( control , localwhere , modifiers , (ControlActionUPP) NULL ) ;
-					else
-						controlpart = ::HandleControlClick( control , localwhere , modifiers , (ControlActionUPP) -1 ) ;
-					wxTheApp->s_lastMouseDown = 0 ;
-					if ( controlpart && ! ( ( UMAHasAppearance() || (controlpart != kControlIndicatorPart) ) 
-						&& (IsKindOf( CLASSINFO( wxScrollBar ) ) ) ) ) // otherwise we will get the event twice
-					{
-						MacHandleControlClick( control , controlpart ) ;
-					}
-				}
-			}
-		}
-	}
+        controlpart = FindControl( localwhere , window , &control ) ;
+        {
+            if ( control && ::IsControlActive( control ) )
+            {
+                {
+                    if ( controlpart == kControlIndicatorPart && !UMAHasAppearance() )
+                        controlpart = ::HandleControlClick( control , localwhere , modifiers , (ControlActionUPP) NULL ) ;
+                    else
+                        controlpart = ::HandleControlClick( control , localwhere , modifiers , (ControlActionUPP) -1 ) ;
+                    wxTheApp->s_lastMouseDown = 0 ;
+                    if ( controlpart && ! ( ( UMAHasAppearance() || (controlpart != kControlIndicatorPart) ) 
+                        && (IsKindOf( CLASSINFO( wxScrollBar ) ) ) ) ) // otherwise we will get the event twice
+                    {
+                        MacHandleControlClick( control , controlpart ) ;
+                    }
+                }
+            }
+        }
+    }
 }
 
 #endif // wxUSE_TOOLBAR

src/mac/toolbar.cpp

@@ -25,8 +25,8 @@
 IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
-	EVT_MOUSE_EVENTS( wxToolBar::OnMouse ) 
-	EVT_PAINT( wxToolBar::OnPaint ) 
+    EVT_MOUSE_EVENTS( wxToolBar::OnMouse ) 
+    EVT_PAINT( wxToolBar::OnPaint ) 
 END_EVENT_TABLE()
 #endif
 
@@ -66,7 +66,7 @@ public:
     void SetSeparatorsCount(size_t count) { m_nSepCount = count; }
     size_t GetSeparatorsCount() const { return m_nSepCount; }
 
-    int		m_index ;
+    int     m_index ;
 private:
     size_t m_nSepCount;
 };
@@ -143,13 +143,13 @@ bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
       m_windowId = id;
 
   {
-	m_width = size.x ;
-	m_height = size.y ;
-	int x = pos.x ;
-	int y = pos.y ;
-	AdjustForParentClientOrigin(x, y, wxSIZE_USE_EXISTING);
-	m_x = x ;
-	m_y = y ;
+    m_width = size.x ;
+    m_height = size.y ;
+    int x = pos.x ;
+    int y = pos.y ;
+    AdjustForParentClientOrigin(x, y, wxSIZE_USE_EXISTING);
+    m_x = x ;
+    m_y = y ;
   }
   
   return TRUE;
@@ -342,20 +342,20 @@ wxSize wxToolBar::GetToolSize() const
 
 void wxToolBar::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
 {
-	int index = 0 ;
-	for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
-	{
-		if ( m_macToolHandles[index] == (void*) control )
-		{
-   			wxToolBarTool *tool = (wxToolBarTool *)m_tools.Nth( index )->Data();
-			if ( tool->CanBeToggled() )
-    		{
-        		tool->Toggle( GetControlValue( control ) ) ;
-    		}
-			OnLeftClick( tool->GetId() , tool -> IsToggled() ) ;
-			break ;
-		}
-	}
+    int index = 0 ;
+    for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
+    {
+        if ( m_macToolHandles[index] == (void*) control )
+        {
+            wxToolBarTool *tool = (wxToolBarTool *)m_tools.Nth( index )->Data();
+            if ( tool->CanBeToggled() )
+            {
+                tool->Toggle( GetControlValue( control ) ) ;
+            }
+            OnLeftClick( tool->GetId() , tool -> IsToggled() ) ;
+            break ;
+        }
+    }
 }
 
 void wxToolBar::SetRows(int nRows)
@@ -374,24 +374,24 @@ void wxToolBar::MacSuperChangedPosition()
   if (m_tools.Number() > 0)
   {
 
-	Point localOrigin ;
-	Rect clipRect ;
-	WindowRef window ;
-	wxWindow *win ;
+    Point localOrigin ;
+    Rect clipRect ;
+    WindowRef window ;
+    wxWindow *win ;
     
-	GetParent()->MacGetPortParams( &localOrigin , &clipRect , &window , &win ) ;
+    GetParent()->MacGetPortParams( &localOrigin , &clipRect , &window , &win ) ;
 
-	Rect toolbarrect = { m_y + localOrigin.v , m_x  + localOrigin.h , 
-		m_y + m_height + localOrigin.v  , m_x + m_width + localOrigin.h} ;
-	ControlFontStyleRec		controlstyle ;
+    Rect toolbarrect = { m_y + localOrigin.v , m_x  + localOrigin.h , 
+        m_y + m_height + localOrigin.v  , m_x + m_width + localOrigin.h} ;
+    ControlFontStyleRec     controlstyle ;
 
-	controlstyle.flags = kControlUseFontMask ;
-	controlstyle.font = kControlFontSmallSystemFont ;
+    controlstyle.flags = kControlUseFontMask ;
+    controlstyle.font = kControlFontSmallSystemFont ;
     
-	wxNode *node = m_tools.First();
-	int noButtons = 0;
-	int x = 0 ;
-	wxSize toolSize = GetToolSize() ;
+    wxNode *node = m_tools.First();
+    int noButtons = 0;
+    int x = 0 ;
+    wxSize toolSize = GetToolSize() ;
     int tw, th;
     GetSize(& tw, & th);
     
@@ -399,67 +399,67 @@ void wxToolBar::MacSuperChangedPosition()
     int maxHeight = 0 ;
     int toolcount = 0 ;
     {
-   		WindowRef rootwindow = GetMacRootWindow() ;
-   		wxWindow* wxrootwindow = wxFindWinFromMacWindow( rootwindow ) ;
-   		::SetThemeWindowBackground( rootwindow , kThemeBrushDialogBackgroundActive , false ) ;
-   		wxMacDrawingHelper focus( wxrootwindow ) ;
-    	while (node)
-    	{
-    		wxToolBarTool *tool = (wxToolBarTool *)node->Data();
-    		wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetBitmap1().GetRefData()) ;
+        WindowRef rootwindow = GetMacRootWindow() ;
+        wxWindow* wxrootwindow = wxFindWinFromMacWindow( rootwindow ) ;
+        ::SetThemeWindowBackground( rootwindow , kThemeBrushDialogBackgroundActive , false ) ;
+        wxMacDrawingHelper focus( wxrootwindow ) ;
+        while (node)
+        {
+            wxToolBarTool *tool = (wxToolBarTool *)node->Data();
+            wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetBitmap1().GetRefData()) ;
             
-    		if(  !tool->IsSeparator()  )
-    		{
-    			Rect toolrect = { toolbarrect.top + m_yMargin + kwxMacToolBarTopMargin, toolbarrect.left + x + m_xMargin + kwxMacToolBarLeftMargin , 0 , 0 } ;
-    			toolrect.right = toolrect.left + toolSize.x ;
-    			toolrect.bottom = toolrect.top + toolSize.y ;
+            if(  !tool->IsSeparator()  )
+            {
+                Rect toolrect = { toolbarrect.top + m_yMargin + kwxMacToolBarTopMargin, toolbarrect.left + x + m_xMargin + kwxMacToolBarLeftMargin , 0 , 0 } ;
+                toolrect.right = toolrect.left + toolSize.x ;
+                toolrect.bottom = toolrect.top + toolSize.y ;
                             
-    			ControlHandle m_macToolHandle = (ControlHandle) m_macToolHandles[toolcount++] ;
+                ControlHandle m_macToolHandle = (ControlHandle) m_macToolHandles[toolcount++] ;
                 
-            	{
-            		Rect contrlRect ;		
-            		GetControlBounds( m_macToolHandle , &contrlRect ) ; 
-            		int former_mac_x = contrlRect.left ;
-            		int former_mac_y = contrlRect.top ;
-            		int mac_x = toolrect.left ;
-            		int mac_y = toolrect.top ;
+                {
+                    Rect contrlRect ;       
+                    GetControlBounds( m_macToolHandle , &contrlRect ) ; 
+                    int former_mac_x = contrlRect.left ;
+                    int former_mac_y = contrlRect.top ;
+                    int mac_x = toolrect.left ;
+                    int mac_y = toolrect.top ;
                                 
-            		if ( mac_x != former_mac_x || mac_y != former_mac_y )
-            		{
-            			{
-            				Rect inval = { former_mac_y , former_mac_x , former_mac_y + toolSize.y , former_mac_x + toolSize.y } ;
-            				InvalWindowRect( rootwindow , &inval ) ;
-            			}
-            	  		UMAMoveControl( m_macToolHandle , mac_x , mac_y ) ;
-            			{
-            				Rect inval = { mac_y , mac_x , mac_y + toolSize.y , mac_x + toolSize.y } ;
-            				InvalWindowRect( rootwindow , &inval ) ;
-            			}
-            		}
-            	}
+                    if ( mac_x != former_mac_x || mac_y != former_mac_y )
+                    {
+                        {
+                            Rect inval = { former_mac_y , former_mac_x , former_mac_y + toolSize.y , former_mac_x + toolSize.y } ;
+                            InvalWindowRect( rootwindow , &inval ) ;
+                        }
+                        UMAMoveControl( m_macToolHandle , mac_x , mac_y ) ;
+                        {
+                            Rect inval = { mac_y , mac_x , mac_y + toolSize.y , mac_x + toolSize.y } ;
+                            InvalWindowRect( rootwindow , &inval ) ;
+                        }
+                    }
+                }
                 
-    			x += (int)toolSize.x;
-    			noButtons ++;
-    		}
-    		else
-    		{
+                x += (int)toolSize.x;
+                noButtons ++;
+            }
+            else
+            {
                 toolcount++ ;
-    			x += (int)toolSize.x / 4;
-    		}
-    	    if ( toolbarrect.left + x + m_xMargin  + kwxMacToolBarLeftMargin- m_x - localOrigin.h > maxWidth)
-        	  	maxWidth = toolbarrect.left + x  + kwxMacToolBarLeftMargin+ m_xMargin - m_x - localOrigin.h;
-        	if (toolbarrect.top + m_yMargin  + kwxMacToolBarTopMargin - m_y - localOrigin.v > maxHeight)
-          		maxHeight = toolbarrect.top  + kwxMacToolBarTopMargin + m_yMargin - m_y - localOrigin.v ;
+                x += (int)toolSize.x / 4;
+            }
+            if ( toolbarrect.left + x + m_xMargin  + kwxMacToolBarLeftMargin- m_x - localOrigin.h > maxWidth)
+                maxWidth = toolbarrect.left + x  + kwxMacToolBarLeftMargin+ m_xMargin - m_x - localOrigin.h;
+            if (toolbarrect.top + m_yMargin  + kwxMacToolBarTopMargin - m_y - localOrigin.v > maxHeight)
+                maxHeight = toolbarrect.top  + kwxMacToolBarTopMargin + m_yMargin - m_y - localOrigin.v ;
 
-    		node = node->Next();
-    	}
-  		if ( wxrootwindow->IsKindOf( CLASSINFO( wxDialog ) ) )
-  		{
-  		}
-  		else
-  		{
-  			::SetThemeWindowBackground( rootwindow , kThemeBrushDocumentWindowBackground , false ) ;
-  		}
+            node = node->Next();
+        }
+        if ( wxrootwindow->IsKindOf( CLASSINFO( wxDialog ) ) )
+        {
+        }
+        else
+        {
+            ::SetThemeWindowBackground( rootwindow , kThemeBrushDocumentWindowBackground , false ) ;
+        }
     }
 
      if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
@@ -469,10 +469,10 @@ void wxToolBar::MacSuperChangedPosition()
            // if not set yet, only one row
            SetRows(1);
        }
-      	maxWidth = tw ; 
+        maxWidth = tw ; 
        maxHeight += toolSize.y;
-     	maxHeight += m_yMargin + kwxMacToolBarTopMargin;
-     	m_maxHeight = maxHeight ;
+        maxHeight += m_yMargin + kwxMacToolBarTopMargin;
+        m_maxHeight = maxHeight ;
      }
      else
      {
@@ -483,8 +483,8 @@ void wxToolBar::MacSuperChangedPosition()
        }
        maxHeight = th ;
        maxWidth += toolSize.x;
-     	maxWidth += m_xMargin + kwxMacToolBarLeftMargin;
-     	m_maxWidth = maxWidth ;
+        maxWidth += m_xMargin + kwxMacToolBarLeftMargin;
+        m_maxWidth = maxWidth ;
      }
 
      SetSize(maxWidth, maxHeight);
@@ -498,55 +498,61 @@ wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
     MacClientToRootWindow( &x , &y ) ;
     Point pt = { y ,x } ;
 
-	int index = 0 ;
-	for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
-	{
-		if ( m_macToolHandles[index] )
-		{
-			Rect bounds ;
-			GetControlBounds((ControlHandle) m_macToolHandles[index], &bounds ) ;
-			if ( PtInRect( pt , &bounds ) )
-			{
-				return  (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ;
-			}
-		}
-	}
+    int index = 0 ;
+    for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
+    {
+        if ( m_macToolHandles[index] )
+        {
+            Rect bounds ;
+            GetControlBounds((ControlHandle) m_macToolHandles[index], &bounds ) ;
+            if ( PtInRect( pt , &bounds ) )
+            {
+                return  (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ;
+            }
+        }
+    }
 
     return (wxToolBarToolBase *)NULL;
 }
 
 wxString wxToolBar::MacGetToolTipString( wxPoint &pt )
 {
-	wxToolBarToolBase* tool = FindToolForPosition( pt.x , pt.y ) ;
-	if ( tool )
-	{
-		return tool->GetShortHelp() ;
-	}
-	return "" ;
+    wxToolBarToolBase* tool = FindToolForPosition( pt.x , pt.y ) ;
+    if ( tool )
+    {
+        return tool->GetShortHelp() ;
+    }
+    return "" ;
 }
 
 void wxToolBar::DoEnableTool(wxToolBarToolBase *t, bool enable)
 {
-        wxToolBarTool *tool = (wxToolBarTool *)t;
-        if ( tool->m_index < 0 )
-        	return ;
+    if (!IsShown())
+        return ;
 
-        ControlHandle control = (ControlHandle) m_macToolHandles[ tool->m_index ] ;
+    wxToolBarTool *tool = (wxToolBarTool *)t;
+    if ( tool->m_index < 0 )
+        return ;
            
-		if ( enable )
-			UMAActivateControl( control ) ;
-		else
-			UMADeactivateControl( control ) ;
+    ControlHandle control = (ControlHandle) m_macToolHandles[ tool->m_index ] ;
+
+    if ( enable )
+        UMAActivateControl( control ) ;
+    else
+        UMADeactivateControl( control ) ;
 }
 
 void wxToolBar::DoToggleTool(wxToolBarToolBase *t, bool toggle)
 {
-       wxToolBarTool *tool = (wxToolBarTool *)t;
-        if ( tool->m_index < 0 )
-        	return ;
+    if (!IsShown())
+        return ;
 
-       ControlHandle control = (ControlHandle) m_macToolHandles[ tool->m_index ] ;
-   		::SetControlValue( control , toggle ) ;
+    wxToolBarTool *tool = (wxToolBarTool *)t;
+    if ( tool->m_index < 0 )
+        return ;
+        
+    ControlHandle control = (ControlHandle) m_macToolHandles[ tool->m_index ] ;
+        ::SetControlValue( control , toggle ) ;
 }
 
 bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
@@ -567,117 +573,117 @@ void wxToolBar::DoSetToggle(wxToolBarToolBase *t, bool toggle)
 
 bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
 {
-		return TRUE ;
+        return TRUE ;
 }
 
 void wxToolBar::OnPaint(wxPaintEvent& event)
 {
-	Point localOrigin ;
-	Rect clipRect ;
-	WindowRef window ;
-	wxWindow *win ;
+    Point localOrigin ;
+    Rect clipRect ;
+    WindowRef window ;
+    wxWindow *win ;
     
-	GetParent()->MacGetPortParams( &localOrigin , &clipRect , &window , &win ) ;
-	if ( window && win )
-	{
-		wxMacDrawingHelper help( win ) ;
-		// the mac control manager always assumes to have the origin at 0,0
-		SetOrigin( 0 , 0 ) ;
+    GetParent()->MacGetPortParams( &localOrigin , &clipRect , &window , &win ) ;
+    if ( window && win )
+    {
+        wxMacDrawingHelper help( win ) ;
+        // the mac control manager always assumes to have the origin at 0,0
+        SetOrigin( 0 , 0 ) ;
         
-		bool			hasTabBehind = false ;
-		wxWindow* parent = GetParent() ;
-		while ( parent )
-		{
-			if( parent->MacGetWindowData() )
-			{
-				::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
-				break ;
-			}
+        bool            hasTabBehind = false ;
+        wxWindow* parent = GetParent() ;
+        while ( parent )
+        {
+            if( parent->MacGetWindowData() )
+            {
+                ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
+                break ;
+            }
             
-			if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) ||  parent->IsKindOf( CLASSINFO( wxTabCtrl ) ))
-			{
-				if ( ((wxControl*)parent)->GetMacControl() )
-					SetUpControlBackground( ((wxControl*)parent)->GetMacControl() , -1 , true ) ;
-				break ;
-			}
+            if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) ||  parent->IsKindOf( CLASSINFO( wxTabCtrl ) ))
+            {
+                if ( ((wxControl*)parent)->GetMacControl() )
+                    SetUpControlBackground( ((wxControl*)parent)->GetMacControl() , -1 , true ) ;
+                break ;
+            }
             
-			parent = parent->GetParent() ;
-		} 
+            parent = parent->GetParent() ;
+        } 
 
-		Rect toolbarrect = { m_y + localOrigin.v , m_x + localOrigin.h , 
-			m_y  + localOrigin.v + m_height , m_x + localOrigin.h + m_width } ;
+        Rect toolbarrect = { m_y + localOrigin.v , m_x + localOrigin.h , 
+            m_y  + localOrigin.v + m_height , m_x + localOrigin.h + m_width } ;
 
-		UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
-		{
-			int index = 0 ;
-			for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
-			{
-				if ( m_macToolHandles[index] )
-				{
-					UMADrawControl( (ControlHandle) m_macToolHandles[index] ) ;
-				}
-			}
-		}
-		::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
-	}
+        UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
+        {
+            int index = 0 ;
+            for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
+            {
+                if ( m_macToolHandles[index] )
+                {
+                    UMADrawControl( (ControlHandle) m_macToolHandles[index] ) ;
+                }
+            }
+        }
+        ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
+    }
 }
 
 void  wxToolBar::OnMouse( wxMouseEvent &event ) 
 {
         
-	if (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK )
-	{
+    if (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK )
+    {
             
-		int x = event.m_x ;
-		int y = event.m_y ;
+        int x = event.m_x ;
+        int y = event.m_y ;
         
-		MacClientToRootWindow( &x , &y ) ;
+        MacClientToRootWindow( &x , &y ) ;
             
-		ControlHandle	control ;
-		Point		localwhere ;
-		GrafPtr		port ;
-		SInt16		controlpart ;
-		WindowRef	window = GetMacRootWindow() ;
+        ControlHandle   control ;
+        Point       localwhere ;
+        GrafPtr     port ;
+        SInt16      controlpart ;
+        WindowRef   window = GetMacRootWindow() ;
         
-		localwhere.h = x ;
-		localwhere.v = y ;
+        localwhere.h = x ;
+        localwhere.v = y ;
     
-		short modifiers = 0;
+        short modifiers = 0;
         
-		if ( !event.m_leftDown && !event.m_rightDown )
-			modifiers  |= btnState ;
+        if ( !event.m_leftDown && !event.m_rightDown )
+            modifiers  |= btnState ;
     
-		if ( event.m_shiftDown )
-			modifiers |= shiftKey ;
+        if ( event.m_shiftDown )
+            modifiers |= shiftKey ;
             
-		if ( event.m_controlDown )
-			modifiers |= controlKey ;
+        if ( event.m_controlDown )
+            modifiers |= controlKey ;
     
-		if ( event.m_altDown )
-			modifiers |= optionKey ;
+        if ( event.m_altDown )
+            modifiers |= optionKey ;
     
-		if ( event.m_metaDown )
-			modifiers |= cmdKey ;
+        if ( event.m_metaDown )
+            modifiers |= cmdKey ;
     
-		controlpart = FindControl( localwhere , window , &control ) ;
-		{
-			if ( control && ::IsControlActive( control ) )
-			{
-				{
-					if ( controlpart == kControlIndicatorPart && !UMAHasAppearance() )
-						controlpart = ::HandleControlClick( control , localwhere , modifiers , (ControlActionUPP) NULL ) ;
-					else
-						controlpart = ::HandleControlClick( control , localwhere , modifiers , (ControlActionUPP) -1 ) ;
-					wxTheApp->s_lastMouseDown = 0 ;
-					if ( controlpart && ! ( ( UMAHasAppearance() || (controlpart != kControlIndicatorPart) ) 
-						&& (IsKindOf( CLASSINFO( wxScrollBar ) ) ) ) ) // otherwise we will get the event twice
-					{
-						MacHandleControlClick( control , controlpart ) ;
-					}
-				}
-			}
-		}
-	}
+        controlpart = FindControl( localwhere , window , &control ) ;
+        {
+            if ( control && ::IsControlActive( control ) )
+            {
+                {
+                    if ( controlpart == kControlIndicatorPart && !UMAHasAppearance() )
+                        controlpart = ::HandleControlClick( control , localwhere , modifiers , (ControlActionUPP) NULL ) ;
+                    else
+                        controlpart = ::HandleControlClick( control , localwhere , modifiers , (ControlActionUPP) -1 ) ;
+                    wxTheApp->s_lastMouseDown = 0 ;
+                    if ( controlpart && ! ( ( UMAHasAppearance() || (controlpart != kControlIndicatorPart) ) 
+                        && (IsKindOf( CLASSINFO( wxScrollBar ) ) ) ) ) // otherwise we will get the event twice
+                    {
+                        MacHandleControlClick( control , controlpart ) ;
+                    }
+                }
+            }
+        }
+    }
 }
 
 #endif // wxUSE_TOOLBAR