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

/////////////////////////////////////////////////////////////////////////////
// Name:        toolbar.cpp
// Purpose:     wxToolBar
// Author:      AUTHOR
// Modified by:
// Created:     04/01/98
// RCS-ID:      $Id$
// Copyright:   (c) AUTHORy
/////////////////////////////////////////////////////////////////////////////

#ifdef __GNUG__
#pragma implementation "toolbar.h"
#endif

#include "wx/wx.h"

#if wxUSE_TOOLBAR

#include "wx/toolbar.h"
#include "wx/notebook.h"
#include "wx/tabctrl.h"
#include "wx/bitmap.h"

#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)

BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
    EVT_MOUSE_EVENTS( wxToolBar::OnMouse ) 
    EVT_PAINT( wxToolBar::OnPaint ) 
END_EVENT_TABLE()
#endif

#include "wx/mac/uma.h"

// ----------------------------------------------------------------------------
// private classes
// ----------------------------------------------------------------------------

class wxToolBarTool : public wxToolBarToolBase
{
public:
    wxToolBarTool(wxToolBar *tbar,
                  int id,
                  const wxBitmap& bitmap1,
                  const wxBitmap& bitmap2,
                  bool toggle,
                  wxObject *clientData,
                  const wxString& shortHelpString,
                  const wxString& longHelpString)
        : wxToolBarToolBase(tbar, id, bitmap1, bitmap2, toggle,
                            clientData, shortHelpString, longHelpString)
    {
        m_nSepCount = 0;
        m_index = -1 ;
    }

    wxToolBarTool(wxToolBar *tbar, wxControl *control)
        : wxToolBarToolBase(tbar, control)
    {
        m_nSepCount = 1;
        m_index = -1 ;
    }

    // set/get the number of separators which we use to cover the space used by
    // a control in the toolbar
    void SetSeparatorsCount(size_t count) { m_nSepCount = count; }
    size_t GetSeparatorsCount() const { return m_nSepCount; }

    int     m_index ;
private:
    size_t m_nSepCount;
};


// ============================================================================
// implementation
// ============================================================================

// ----------------------------------------------------------------------------
// wxToolBarTool
// ----------------------------------------------------------------------------

const short kwxMacToolBarToolDefaultWidth = 24 ;
const short kwxMacToolBarToolDefaultHeight = 22 ;
const short kwxMacToolBarTopMargin = 2 ;
const short kwxMacToolBarLeftMargin = 2 ;


wxToolBarToolBase *wxToolBar::CreateTool(int id,
                                         const wxBitmap& bitmap1,
                                         const wxBitmap& bitmap2,
                                         bool toggle,
                                         wxObject *clientData,
                                         const wxString& shortHelpString,
                                         const wxString& longHelpString)
{
    return new wxToolBarTool(this, id, bitmap1, bitmap2, toggle,
                             clientData, shortHelpString, longHelpString);
}

wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
{
    return new wxToolBarTool(this, control);
}

void wxToolBar::Init()
{
  m_maxWidth = -1;
  m_maxHeight = -1;
  m_defaultWidth = kwxMacToolBarToolDefaultWidth;
  m_defaultHeight = kwxMacToolBarToolDefaultHeight;
}

bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
            long style, const wxString& name)
{
  
  int x = pos.x;
  int y = pos.y;
  int width = size.x;
  int height = size.y;

  if (width <= 0)
    width = 100;
  if (height <= 0)
    height = 30;
  if (x < 0)
    x = 0;
  if (y < 0)
    y = 0;

  SetName(name);

  m_windowStyle = style;
  parent->AddChild(this);

  m_backgroundColour = parent->GetBackgroundColour() ;
  m_foregroundColour = parent->GetForegroundColour() ;

  if (id == -1)
      m_windowId = NewControlId();
  else
      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 ;
  }
  
  return TRUE;
}

wxToolBar::~wxToolBar()
{
    // we must refresh the frame size when the toolbar is deleted but the frame
    // is not - otherwise toolbar leaves a hole in the place it used to occupy
}

bool wxToolBar::Realize()
{
    if (m_tools.Number() == 0)
        return FALSE;

    Point localOrigin ;
    Rect clipRect ;
    WindowRef window = (WindowRef) MacGetRootWindow() ;
    wxWindow *win ;
    
    int lx , ly ;
    lx = ly = 0 ;
    MacWindowToRootWindow( &lx , &ly ) ;
    localOrigin.v = ly ;
    localOrigin.h = lx ;
    
//    GetParent()->MacGetPortParams( &localOrigin , &clipRect , &window , &win ) ;

    Rect toolbarrect = { localOrigin.v ,localOrigin.h , 
        m_height + localOrigin.v  , m_width + localOrigin.h} ;
    ControlFontStyleRec                controlstyle ;

    controlstyle.flags = kControlUseFontMask ;
    controlstyle.font = kControlFontSmallSystemFont ;
    
    wxNode *node = m_tools.First();
    int noButtons = 0;
    int x = 0 ;
    int y = 0 ;
    wxSize toolSize = GetToolSize() ;
    int tw, th;
    GetSize(& tw, & th);
    
    int maxWidth = 0 ;
    int maxHeight = 0 ;
    
    while (node)
    {
        wxToolBarTool *tool = (wxToolBarTool *)node->Data();
        wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetBitmap1().GetRefData()) ;
        
        if(  !tool->IsSeparator()  )
        {
            Rect toolrect = { toolbarrect.top + y + m_yMargin + kwxMacToolBarTopMargin,
                              toolbarrect.left + x + m_xMargin + kwxMacToolBarLeftMargin , 0 , 0 } ;
            toolrect.right = toolrect.left + toolSize.x ;
            toolrect.bottom = toolrect.top + toolSize.y ;
            
            ControlButtonContentInfo info ;
            if ( bmap )
            {
                if ( bmap->m_bitmapType == kMacBitmapTypePict )
                {
                    info.contentType = kControlContentPictHandle ;
                    info.u.picture = MAC_WXHMETAFILE(bmap->m_hPict) ;
                }
                else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
                {
                    if ( tool->GetBitmap1().GetMask() )
                    {
                        info.contentType = kControlContentCIconHandle ;
                        info.u.cIconHandle = wxMacCreateCIcon( MAC_WXHBITMAP(bmap->m_hBitmap) , MAC_WXHBITMAP(tool->GetBitmap1().GetMask()->GetMaskBitmap()) ,
                                                               8 , 16 ) ;
                    }
                    else
                    {
                        info.contentType = kControlContentCIconHandle ;
                        info.u.cIconHandle = wxMacCreateCIcon( MAC_WXHBITMAP(bmap->m_hBitmap) , NULL ,
                                                               8 , 16 ) ;
                    }
                }
            }
            
            ControlHandle m_macToolHandle ;
            
            SInt16 behaviour = kControlBehaviorOffsetContents ;
            if ( tool->CanBeToggled() )
                behaviour += kControlBehaviorToggles ;
            
            if ( info.u.cIconHandle ) // since it is a handle we can use one of them
            {
                m_macToolHandle = ::NewControl( window , &toolrect , "\p" , false , 0 , 
                                                behaviour + info.contentType , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;
                
                ::SetControlData( m_macToolHandle , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
            }
            else
            {
                m_macToolHandle = ::NewControl( window , &toolrect , "\p" , false , 0 , 
                                                behaviour  , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;
            }
            UMAShowControl( m_macToolHandle ) ;
            m_macToolHandles.Add( m_macToolHandle ) ;
            tool->m_index = m_macToolHandles.Count() -1 ;
            if ( !tool->IsEnabled() )
            {
                UMADeactivateControl( m_macToolHandle ) ;
            }
            if ( tool->CanBeToggled() && tool->IsToggled() )
            {
                ::SetControlValue( m_macToolHandle , 1 ) ;
            }
            else
            {
                ::SetControlValue( m_macToolHandle , 0 ) ;
            }
            /*
              ::SetControlFontStyle( m_macToolHandle , &controlstyle ) ;
            */
            ControlHandle container = (ControlHandle) GetParent()->MacGetContainerForEmbedding() ;
            wxASSERT_MSG( container != NULL , "No valid mac container control" ) ;
            ::EmbedControl( m_macToolHandle , container ) ;
            
            if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
            {
                x += (int)toolSize.x;
            }
            else
            {
                y += (int)toolSize.y;
            }
            noButtons ++;
        }
        else
        {
            m_macToolHandles.Add( NULL ) ;
            if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
            {
                x += (int)toolSize.x / 4;
            }
            else
            {
                y += (int)toolSize.y / 4;
            }
        }
        if ( toolbarrect.left + x + m_xMargin + kwxMacToolBarLeftMargin - m_x - localOrigin.h > maxWidth) {
            maxWidth = toolbarrect.left + x + m_xMargin + kwxMacToolBarLeftMargin - m_x - localOrigin.h;
        }
        if (toolbarrect.top + y + m_yMargin + kwxMacToolBarTopMargin - m_y - localOrigin.v > maxHeight) {
            maxHeight = toolbarrect.top + y + m_yMargin + kwxMacToolBarTopMargin - m_y - localOrigin.v ;
        }
        node = node->Next();
    }
    
    if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
    {
        if ( m_maxRows == 0 )
        {
            // if not set yet, only one row
            SetRows(1);
        }
        maxWidth = tw ; 
        maxHeight += toolSize.y;
        maxHeight += m_yMargin + kwxMacToolBarTopMargin;
        m_maxHeight = maxHeight ;
    }
    else
    {
        if ( noButtons > 0 && m_maxRows == 0 )
        {
            // if not set yet, have one column
            SetRows(noButtons);
        }
        maxHeight = th ;
        maxWidth += toolSize.x;
        maxWidth += m_xMargin + kwxMacToolBarLeftMargin;
        m_maxWidth = maxWidth ;
    }
    
    SetSize(maxWidth, maxHeight);
    
    return TRUE;
}

void wxToolBar::SetToolBitmapSize(const wxSize& size)
{
    m_defaultWidth = size.x+4; m_defaultHeight = size.y+4;
}

// The button size is bigger than the bitmap size
wxSize wxToolBar::GetToolSize() const
{
    return wxSize(m_defaultWidth + 4, m_defaultHeight + 4);
}

void wxToolBar::MacHandleControlClick( WXWidget control , wxInt16 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( (ControlHandle) control ) ) ;
            }
            OnLeftClick( tool->GetId() , tool -> IsToggled() ) ;
            break ;
        }
    }
}

void wxToolBar::SetRows(int nRows)
{
    if ( nRows == m_maxRows )
    {
        // avoid resizing the frame uselessly
        return;
    }

    m_maxRows = nRows;
}

void wxToolBar::MacSuperChangedPosition() 
{
  if (m_tools.Number() > 0)
  {

    Point localOrigin ;
    Rect clipRect ;
    WindowRef window ;
    wxWindow *win ;
    int lx , ly ;
    lx = ly = 0 ;
    MacWindowToRootWindow( &lx , &ly ) ;
    localOrigin.v = ly ;
    localOrigin.h = lx ;
    
//    GetParent()->MacGetPortParams( &localOrigin , &clipRect , &window , &win ) ;

    Rect toolbarrect = { localOrigin.v ,localOrigin.h , 
        m_height + localOrigin.v  , m_width + localOrigin.h} ;
    ControlFontStyleRec     controlstyle ;

    controlstyle.flags = kControlUseFontMask ;
    controlstyle.font = kControlFontSmallSystemFont ;
    
    wxNode *node = m_tools.First();
    int noButtons = 0;
    int x = 0 ;
    wxSize toolSize = GetToolSize() ;
    int tw, th;
    GetSize(& tw, & th);
    
    int maxWidth = 0 ;
    int maxHeight = 0 ;
    int toolcount = 0 ;
    {
      WindowRef rootwindow = (WindowRef) MacGetRootWindow() ;
    	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 ;
    						
    			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 ;
             		        	
            		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
    		{
                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 ;

            node = node->Next();
        }
    }

     if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
     {
       if ( m_maxRows == 0 )
       {
           // if not set yet, only one row
           SetRows(1);
       }
        maxWidth = tw ; 
       maxHeight += toolSize.y;
        maxHeight += m_yMargin + kwxMacToolBarTopMargin;
        m_maxHeight = maxHeight ;
     }
     else
     {
       if ( noButtons > 0 && m_maxRows == 0 )
       {
           // if not set yet, have one column
           SetRows(noButtons);
       }
       maxHeight = th ;
       maxWidth += toolSize.x;
        maxWidth += m_xMargin + kwxMacToolBarLeftMargin;
        m_maxWidth = maxWidth ;
     }

     SetSize(maxWidth, maxHeight);
    }

    wxWindow::MacSuperChangedPosition() ;
}

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() ) ;
            }
        }
    }

    return (wxToolBarToolBase *)NULL;
}

wxString wxToolBar::MacGetToolTipString( wxPoint &pt )
{
    wxToolBarToolBase* tool = FindToolForPosition( pt.x , pt.y ) ;
    if ( tool )
    {
        return tool->GetShortHelp() ;
    }
    return "" ;
}

void wxToolBar::DoEnableTool(wxToolBarToolBase *t, bool enable)
{
    if (!IsShown())
        return ;

    wxToolBarTool *tool = (wxToolBarTool *)t;
    if ( tool->m_index < 0 )
        return ;
           
    ControlHandle control = (ControlHandle) m_macToolHandles[ tool->m_index ] ;

    if ( enable )
        UMAActivateControl( control ) ;
    else
        UMADeactivateControl( control ) ;
}

void wxToolBar::DoToggleTool(wxToolBarToolBase *t, bool toggle)
{
    if (!IsShown())
        return ;

    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),
                             wxToolBarToolBase *tool)
{
    // nothing special to do here - we really create the toolbar buttons in
    // Realize() later
    tool->Attach(this);

    return TRUE;
}

void wxToolBar::DoSetToggle(wxToolBarToolBase *t, bool toggle)
{
       wxToolBarTool *tool = (wxToolBarTool *)t;
       // TODO: set toggle state
}

bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
{
        return TRUE ;
}

void wxToolBar::OnPaint(wxPaintEvent& event)
{
  wxPaintDC dc(this) ;
  wxMacPortSetter helper(&dc) ;
  
	Rect toolbarrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , 
		dc.YLOG2DEVMAC(m_height) , dc.XLOG2DEVMAC(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] ) ;
			}
		}
	}
}

void  wxToolBar::OnMouse( wxMouseEvent &event ) 
{
	if (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK )
	{
			
		int x = event.m_x ;
		int y = event.m_y ;
		
		MacClientToRootWindow( &x , &y ) ;
			
		ControlHandle	control ;
		Point		localwhere ;
		GrafPtr		port ;
		SInt16		controlpart ;
		WindowRef	window = (WindowRef) MacGetRootWindow() ;
		
		localwhere.h = x ;
		localwhere.v = y ;
	
		short modifiers = 0;
		
		if ( !event.m_leftDown && !event.m_rightDown )
			modifiers  |= btnState ;
	
		if ( event.m_shiftDown )
			modifiers |= shiftKey ;
			
		if ( event.m_controlDown )
			modifiers |= controlKey ;
	
		if ( event.m_altDown )
			modifiers |= optionKey ;
	
		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 ) ;
					}
				}
			}
		}
	}
}

#endif // wxUSE_TOOLBAR
Commit	Line	Data
e9576ca5 SC	1	/////////////////////////////////////////////////////////////////////////////
	2	// Name: toolbar.cpp
	3	// Purpose: wxToolBar
	4	// Author: AUTHOR
	5	// Modified by:
	6	// Created: 04/01/98
	7	// RCS-ID: $Id$
2f1ae414	8	// Copyright: (c) AUTHORy
e9576ca5 SC	9	/////////////////////////////////////////////////////////////////////////////
	10
	11	#ifdef __GNUG__
	12	#pragma implementation "toolbar.h"
	13	#endif
	14
	15	#include "wx/wx.h"
519cb848 SC	16
	17	#if wxUSE_TOOLBAR
	18
e9576ca5	19	#include "wx/toolbar.h"
2f1ae414 SC	20	#include "wx/notebook.h"
2f1ae414 SC	21	#include "wx/tabctrl.h"
72055702	22	#include "wx/bitmap.h"
e9576ca5	23
2f1ae414	24	#if !USE_SHARED_LIBRARY
12ed316d	25	IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
e9576ca5 SC	26
e9576ca5 SC	27	BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
e044f600 RR	28	EVT_MOUSE_EVENTS( wxToolBar::OnMouse )
e044f600 RR	29	EVT_PAINT( wxToolBar::OnPaint )
e9576ca5	30	END_EVENT_TABLE()
2f1ae414	31	#endif
e9576ca5	32
d497dca4	33	#include "wx/mac/uma.h"
519cb848	34
37e2cb08 SC	35	// ----------------------------------------------------------------------------
	36	// private classes
	37	// ----------------------------------------------------------------------------
	38
	39	class wxToolBarTool : public wxToolBarToolBase
	40	{
	41	public:
	42	wxToolBarTool(wxToolBar *tbar,
	43	int id,
	44	const wxBitmap& bitmap1,
	45	const wxBitmap& bitmap2,
	46	bool toggle,
	47	wxObject *clientData,
	48	const wxString& shortHelpString,
	49	const wxString& longHelpString)
	50	: wxToolBarToolBase(tbar, id, bitmap1, bitmap2, toggle,
	51	clientData, shortHelpString, longHelpString)
	52	{
	53	m_nSepCount = 0;
2f1ae414	54	m_index = -1 ;
37e2cb08 SC	55	}
	56
	57	wxToolBarTool(wxToolBar tbar, wxControl control)
	58	: wxToolBarToolBase(tbar, control)
	59	{
	60	m_nSepCount = 1;
2f1ae414	61	m_index = -1 ;
37e2cb08 SC	62	}
	63
	64	// set/get the number of separators which we use to cover the space used by
	65	// a control in the toolbar
	66	void SetSeparatorsCount(size_t count) { m_nSepCount = count; }
	67	size_t GetSeparatorsCount() const { return m_nSepCount; }
	68
e044f600	69	int m_index ;
37e2cb08 SC	70	private:
	71	size_t m_nSepCount;
	72	};
	73
	74
	75	// ============================================================================
	76	// implementation
	77	// ============================================================================
	78
	79	// ----------------------------------------------------------------------------
	80	// wxToolBarTool
	81	// ----------------------------------------------------------------------------
	82
895f5af7 SC	83	const short kwxMacToolBarToolDefaultWidth = 24 ;
	84	const short kwxMacToolBarToolDefaultHeight = 22 ;
	85	const short kwxMacToolBarTopMargin = 2 ;
	86	const short kwxMacToolBarLeftMargin = 2 ;
	87
2f1ae414	88
37e2cb08 SC	89	wxToolBarToolBase *wxToolBar::CreateTool(int id,
	90	const wxBitmap& bitmap1,
	91	const wxBitmap& bitmap2,
	92	bool toggle,
	93	wxObject *clientData,
	94	const wxString& shortHelpString,
	95	const wxString& longHelpString)
	96	{
	97	return new wxToolBarTool(this, id, bitmap1, bitmap2, toggle,
	98	clientData, shortHelpString, longHelpString);
	99	}
	100
	101	wxToolBarToolBase wxToolBar::CreateTool(wxControl control)
	102	{
	103	return new wxToolBarTool(this, control);
	104	}
	105
37e2cb08	106	void wxToolBar::Init()
e9576ca5 SC	107	{
	108	m_maxWidth = -1;
	109	m_maxHeight = -1;
895f5af7 SC	110	m_defaultWidth = kwxMacToolBarToolDefaultWidth;
895f5af7 SC	111	m_defaultHeight = kwxMacToolBarToolDefaultHeight;
e9576ca5 SC	112	}
	113
	114	bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
	115	long style, const wxString& name)
	116	{
e9576ca5	117
519cb848 SC	118	int x = pos.x;
	119	int y = pos.y;
	120	int width = size.x;
	121	int height = size.y;
e9576ca5	122
519cb848 SC	123	if (width <= 0)
	124	width = 100;
	125	if (height <= 0)
	126	height = 30;
	127	if (x < 0)
	128	x = 0;
	129	if (y < 0)
	130	y = 0;
e9576ca5	131
895f5af7 SC	132	SetName(name);
	133
	134	m_windowStyle = style;
	135	parent->AddChild(this);
	136
	137	m_backgroundColour = parent->GetBackgroundColour() ;
	138	m_foregroundColour = parent->GetForegroundColour() ;
	139
	140	if (id == -1)
	141	m_windowId = NewControlId();
	142	else
	143	m_windowId = id;
	144
	145	{
e044f600 RR	146	m_width = size.x ;
	147	m_height = size.y ;
	148	int x = pos.x ;
	149	int y = pos.y ;
	150	AdjustForParentClientOrigin(x, y, wxSIZE_USE_EXISTING);
	151	m_x = x ;
	152	m_y = y ;
895f5af7	153	}
a90c95aa RR	154
a90c95aa RR	155	return TRUE;
e9576ca5 SC	156	}
	157
	158	wxToolBar::~wxToolBar()
	159	{
7810c95b SC	160	// we must refresh the frame size when the toolbar is deleted but the frame
7810c95b SC	161	// is not - otherwise toolbar leaves a hole in the place it used to occupy
e9576ca5 SC	162	}
e9576ca5 SC	163
37e2cb08	164	bool wxToolBar::Realize()
e9576ca5	165	{
0b7a8cd3 GD	166	if (m_tools.Number() == 0)
	167	return FALSE;
	168
	169	Point localOrigin ;
	170	Rect clipRect ;
76a5e5d2	171	WindowRef window = (WindowRef) MacGetRootWindow() ;
0b7a8cd3 GD	172	wxWindow *win ;
0b7a8cd3 GD	173
de043984 SC	174	int lx , ly ;
	175	lx = ly = 0 ;
	176	MacWindowToRootWindow( &lx , &ly ) ;
	177	localOrigin.v = ly ;
	178	localOrigin.h = lx ;
	179
	180	// GetParent()->MacGetPortParams( &localOrigin , &clipRect , &window , &win ) ;
0b7a8cd3	181
de043984 SC	182	Rect toolbarrect = { localOrigin.v ,localOrigin.h ,
de043984 SC	183	m_height + localOrigin.v , m_width + localOrigin.h} ;
0b7a8cd3 GD	184	ControlFontStyleRec controlstyle ;
	185
	186	controlstyle.flags = kControlUseFontMask ;
	187	controlstyle.font = kControlFontSmallSystemFont ;
	188
	189	wxNode *node = m_tools.First();
	190	int noButtons = 0;
	191	int x = 0 ;
	192	int y = 0 ;
	193	wxSize toolSize = GetToolSize() ;
7c551d95 SC	194	int tw, th;
7c551d95 SC	195	GetSize(& tw, & th);
895f5af7 SC	196
	197	int maxWidth = 0 ;
	198	int maxHeight = 0 ;
	199
0b7a8cd3	200	while (node)
7810c95b	201	{
0b7a8cd3 GD	202	wxToolBarTool tool = (wxToolBarTool )node->Data();
	203	wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetBitmap1().GetRefData()) ;
	204
	205	if( !tool->IsSeparator() )
	206	{
	207	Rect toolrect = { toolbarrect.top + y + m_yMargin + kwxMacToolBarTopMargin,
	208	toolbarrect.left + x + m_xMargin + kwxMacToolBarLeftMargin , 0 , 0 } ;
	209	toolrect.right = toolrect.left + toolSize.x ;
	210	toolrect.bottom = toolrect.top + toolSize.y ;
	211
	212	ControlButtonContentInfo info ;
	213	if ( bmap )
	214	{
	215	if ( bmap->m_bitmapType == kMacBitmapTypePict )
	216	{
	217	info.contentType = kControlContentPictHandle ;
76a5e5d2	218	info.u.picture = MAC_WXHMETAFILE(bmap->m_hPict) ;
0b7a8cd3 GD	219	}
	220	else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
	221	{
	222	if ( tool->GetBitmap1().GetMask() )
	223	{
	224	info.contentType = kControlContentCIconHandle ;
76a5e5d2	225	info.u.cIconHandle = wxMacCreateCIcon( MAC_WXHBITMAP(bmap->m_hBitmap) , MAC_WXHBITMAP(tool->GetBitmap1().GetMask()->GetMaskBitmap()) ,
0b7a8cd3 GD	226	8 , 16 ) ;
	227	}
	228	else
	229	{
	230	info.contentType = kControlContentCIconHandle ;
76a5e5d2	231	info.u.cIconHandle = wxMacCreateCIcon( MAC_WXHBITMAP(bmap->m_hBitmap) , NULL ,
0b7a8cd3 GD	232	8 , 16 ) ;
	233	}
	234	}
	235	}
	236
	237	ControlHandle m_macToolHandle ;
	238
	239	SInt16 behaviour = kControlBehaviorOffsetContents ;
	240	if ( tool->CanBeToggled() )
	241	behaviour += kControlBehaviorToggles ;
	242
	243	if ( info.u.cIconHandle ) // since it is a handle we can use one of them
	244	{
	245	m_macToolHandle = ::NewControl( window , &toolrect , "\p" , false , 0 ,
	246	behaviour + info.contentType , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;
	247
	248	::SetControlData( m_macToolHandle , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
	249	}
	250	else
	251	{
	252	m_macToolHandle = ::NewControl( window , &toolrect , "\p" , false , 0 ,
	253	behaviour , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;
	254	}
	255	UMAShowControl( m_macToolHandle ) ;
	256	m_macToolHandles.Add( m_macToolHandle ) ;
	257	tool->m_index = m_macToolHandles.Count() -1 ;
	258	if ( !tool->IsEnabled() )
	259	{
	260	UMADeactivateControl( m_macToolHandle ) ;
	261	}
	262	if ( tool->CanBeToggled() && tool->IsToggled() )
	263	{
	264	::SetControlValue( m_macToolHandle , 1 ) ;
	265	}
	266	else
	267	{
	268	::SetControlValue( m_macToolHandle , 0 ) ;
	269	}
	270	/*
	271	::SetControlFontStyle( m_macToolHandle , &controlstyle ) ;
	272	*/
76a5e5d2	273	ControlHandle container = (ControlHandle) GetParent()->MacGetContainerForEmbedding() ;
0b7a8cd3 GD	274	wxASSERT_MSG( container != NULL , "No valid mac container control" ) ;
	275	::EmbedControl( m_macToolHandle , container ) ;
	276
	277	if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
	278	{
	279	x += (int)toolSize.x;
	280	}
	281	else
	282	{
	283	y += (int)toolSize.y;
	284	}
	285	noButtons ++;
	286	}
	287	else
	288	{
	289	m_macToolHandles.Add( NULL ) ;
	290	if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
	291	{
	292	x += (int)toolSize.x / 4;
	293	}
	294	else
	295	{
	296	y += (int)toolSize.y / 4;
	297	}
	298	}
	299	if ( toolbarrect.left + x + m_xMargin + kwxMacToolBarLeftMargin - m_x - localOrigin.h > maxWidth) {
	300	maxWidth = toolbarrect.left + x + m_xMargin + kwxMacToolBarLeftMargin - m_x - localOrigin.h;
	301	}
	302	if (toolbarrect.top + y + m_yMargin + kwxMacToolBarTopMargin - m_y - localOrigin.v > maxHeight) {
	303	maxHeight = toolbarrect.top + y + m_yMargin + kwxMacToolBarTopMargin - m_y - localOrigin.v ;
	304	}
	305	node = node->Next();
7810c95b	306	}
0b7a8cd3 GD	307
0b7a8cd3 GD	308	if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
7810c95b	309	{
0b7a8cd3 GD	310	if ( m_maxRows == 0 )
	311	{
	312	// if not set yet, only one row
	313	SetRows(1);
	314	}
	315	maxWidth = tw ;
	316	maxHeight += toolSize.y;
	317	maxHeight += m_yMargin + kwxMacToolBarTopMargin;
	318	m_maxHeight = maxHeight ;
7810c95b	319	}
0b7a8cd3 GD	320	else
	321	{
	322	if ( noButtons > 0 && m_maxRows == 0 )
	323	{
	324	// if not set yet, have one column
	325	SetRows(noButtons);
	326	}
	327	maxHeight = th ;
	328	maxWidth += toolSize.x;
	329	maxWidth += m_xMargin + kwxMacToolBarLeftMargin;
	330	m_maxWidth = maxWidth ;
	331	}
	332
	333	SetSize(maxWidth, maxHeight);
	334
	335	return TRUE;
e9576ca5 SC	336	}
	337
	338	void wxToolBar::SetToolBitmapSize(const wxSize& size)
	339	{
9aad97fd	340	m_defaultWidth = size.x+4; m_defaultHeight = size.y+4;
e9576ca5 SC	341	}
e9576ca5 SC	342
e9576ca5 SC	343	// The button size is bigger than the bitmap size
	344	wxSize wxToolBar::GetToolSize() const
	345	{
2f1ae414	346	return wxSize(m_defaultWidth + 4, m_defaultHeight + 4);
e9576ca5 SC	347	}
e9576ca5 SC	348
76a5e5d2	349	void wxToolBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart )
519cb848	350	{
e044f600 RR	351	int index = 0 ;
	352	for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
	353	{
	354	if ( m_macToolHandles[index] == (void*) control )
	355	{
	356	wxToolBarTool tool = (wxToolBarTool )m_tools.Nth( index )->Data();
	357	if ( tool->CanBeToggled() )
	358	{
76a5e5d2	359	tool->Toggle( GetControlValue( (ControlHandle) control ) ) ;
e044f600 RR	360	}
	361	OnLeftClick( tool->GetId() , tool -> IsToggled() ) ;
	362	break ;
	363	}
	364	}
519cb848 SC	365	}
519cb848 SC	366
37e2cb08	367	void wxToolBar::SetRows(int nRows)
e9576ca5	368	{
37e2cb08	369	if ( nRows == m_maxRows )
e9576ca5	370	{
37e2cb08 SC	371	// avoid resizing the frame uselessly
37e2cb08 SC	372	return;
e9576ca5	373	}
37e2cb08 SC	374
37e2cb08 SC	375	m_maxRows = nRows;
e9576ca5 SC	376	}
e9576ca5 SC	377
c257d44d SC	378	void wxToolBar::MacSuperChangedPosition()
	379	{
	380	if (m_tools.Number() > 0)
	381	{
	382
e044f600 RR	383	Point localOrigin ;
	384	Rect clipRect ;
	385	WindowRef window ;
	386	wxWindow *win ;
de043984 SC	387	int lx , ly ;
	388	lx = ly = 0 ;
	389	MacWindowToRootWindow( &lx , &ly ) ;
	390	localOrigin.v = ly ;
	391	localOrigin.h = lx ;
e044f600	392
de043984	393	// GetParent()->MacGetPortParams( &localOrigin , &clipRect , &window , &win ) ;
e044f600	394
de043984 SC	395	Rect toolbarrect = { localOrigin.v ,localOrigin.h ,
de043984 SC	396	m_height + localOrigin.v , m_width + localOrigin.h} ;
e044f600 RR	397	ControlFontStyleRec controlstyle ;
	398
	399	controlstyle.flags = kControlUseFontMask ;
	400	controlstyle.font = kControlFontSmallSystemFont ;
	401
	402	wxNode *node = m_tools.First();
	403	int noButtons = 0;
	404	int x = 0 ;
	405	wxSize toolSize = GetToolSize() ;
c257d44d SC	406	int tw, th;
	407	GetSize(& tw, & th);
	408
	409	int maxWidth = 0 ;
	410	int maxHeight = 0 ;
	411	int toolcount = 0 ;
	412	{
76a5e5d2	413	WindowRef rootwindow = (WindowRef) MacGetRootWindow() ;
cd9bcf8a SC	414	while (node)
	415	{
	416	wxToolBarTool tool = (wxToolBarTool )node->Data();
	417	wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetBitmap1().GetRefData()) ;
	418
	419	if( !tool->IsSeparator() )
	420	{
	421	Rect toolrect = { toolbarrect.top + m_yMargin + kwxMacToolBarTopMargin, toolbarrect.left + x + m_xMargin + kwxMacToolBarLeftMargin , 0 , 0 } ;
	422	toolrect.right = toolrect.left + toolSize.x ;
	423	toolrect.bottom = toolrect.top + toolSize.y ;
	424
	425	ControlHandle m_macToolHandle = (ControlHandle) m_macToolHandles[toolcount++] ;
	426
	427	{
	428	Rect contrlRect ;
	429	GetControlBounds( m_macToolHandle , &contrlRect ) ;
	430	int former_mac_x = contrlRect.left ;
	431	int former_mac_y = contrlRect.top ;
	432	int mac_x = toolrect.left ;
	433	int mac_y = toolrect.top ;
	434
	435	if ( mac_x != former_mac_x \|\| mac_y != former_mac_y )
	436	{
	437	{
	438	Rect inval = { former_mac_y , former_mac_x , former_mac_y + toolSize.y , former_mac_x + toolSize.y } ;
	439	InvalWindowRect( rootwindow , &inval ) ;
	440	}
	441	UMAMoveControl( m_macToolHandle , mac_x , mac_y ) ;
	442	{
	443	Rect inval = { mac_y , mac_x , mac_y + toolSize.y , mac_x + toolSize.y } ;
	444	InvalWindowRect( rootwindow , &inval ) ;
	445	}
	446	}
	447	}
	448
	449	x += (int)toolSize.x;
	450	noButtons ++;
	451	}
	452	else
	453	{
c257d44d	454	toolcount++ ;
e044f600 RR	455	x += (int)toolSize.x / 4;
	456	}
	457	if ( toolbarrect.left + x + m_xMargin + kwxMacToolBarLeftMargin- m_x - localOrigin.h > maxWidth)
	458	maxWidth = toolbarrect.left + x + kwxMacToolBarLeftMargin+ m_xMargin - m_x - localOrigin.h;
	459	if (toolbarrect.top + m_yMargin + kwxMacToolBarTopMargin - m_y - localOrigin.v > maxHeight)
	460	maxHeight = toolbarrect.top + kwxMacToolBarTopMargin + m_yMargin - m_y - localOrigin.v ;
	461
	462	node = node->Next();
	463	}
c257d44d SC	464	}
	465
	466	if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
	467	{
	468	if ( m_maxRows == 0 )
	469	{
	470	// if not set yet, only one row
	471	SetRows(1);
	472	}
e044f600	473	maxWidth = tw ;
c257d44d	474	maxHeight += toolSize.y;
e044f600 RR	475	maxHeight += m_yMargin + kwxMacToolBarTopMargin;
e044f600 RR	476	m_maxHeight = maxHeight ;
c257d44d SC	477	}
	478	else
	479	{
	480	if ( noButtons > 0 && m_maxRows == 0 )
	481	{
	482	// if not set yet, have one column
	483	SetRows(noButtons);
	484	}
	485	maxHeight = th ;
	486	maxWidth += toolSize.x;
e044f600 RR	487	maxWidth += m_xMargin + kwxMacToolBarLeftMargin;
e044f600 RR	488	m_maxWidth = maxWidth ;
c257d44d SC	489	}
	490
	491	SetSize(maxWidth, maxHeight);
	492	}
	493
	494	wxWindow::MacSuperChangedPosition() ;
	495	}
	496
37e2cb08	497	wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
e9576ca5	498	{
37e2cb08	499	MacClientToRootWindow( &x , &y ) ;
2f1ae414	500	Point pt = { y ,x } ;
37e2cb08	501
e044f600 RR	502	int index = 0 ;
	503	for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
	504	{
	505	if ( m_macToolHandles[index] )
	506	{
	507	Rect bounds ;
	508	GetControlBounds((ControlHandle) m_macToolHandles[index], &bounds ) ;
	509	if ( PtInRect( pt , &bounds ) )
	510	{
	511	return (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ;
	512	}
	513	}
	514	}
37e2cb08 SC	515
37e2cb08 SC	516	return (wxToolBarToolBase *)NULL;
e9576ca5 SC	517	}
e9576ca5 SC	518
2f1ae414 SC	519	wxString wxToolBar::MacGetToolTipString( wxPoint &pt )
2f1ae414 SC	520	{
e044f600 RR	521	wxToolBarToolBase* tool = FindToolForPosition( pt.x , pt.y ) ;
	522	if ( tool )
	523	{
	524	return tool->GetShortHelp() ;
	525	}
	526	return "" ;
2f1ae414 SC	527	}
2f1ae414 SC	528
37e2cb08	529	void wxToolBar::DoEnableTool(wxToolBarToolBase *t, bool enable)
e9576ca5	530	{
e044f600 RR	531	if (!IsShown())
	532	return ;
	533
	534	wxToolBarTool tool = (wxToolBarTool )t;
	535	if ( tool->m_index < 0 )
	536	return ;
	537
	538	ControlHandle control = (ControlHandle) m_macToolHandles[ tool->m_index ] ;
	539
	540	if ( enable )
	541	UMAActivateControl( control ) ;
	542	else
	543	UMADeactivateControl( control ) ;
e9576ca5 SC	544	}
e9576ca5 SC	545
37e2cb08	546	void wxToolBar::DoToggleTool(wxToolBarToolBase *t, bool toggle)
e9576ca5	547	{
e044f600 RR	548	if (!IsShown())
	549	return ;
	550
	551	wxToolBarTool tool = (wxToolBarTool )t;
	552	if ( tool->m_index < 0 )
	553	return ;
8208e181	554
e044f600 RR	555	ControlHandle control = (ControlHandle) m_macToolHandles[ tool->m_index ] ;
e044f600 RR	556	::SetControlValue( control , toggle ) ;
37e2cb08	557	}
7c551d95	558
37e2cb08 SC	559	bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
	560	wxToolBarToolBase *tool)
	561	{
	562	// nothing special to do here - we really create the toolbar buttons in
	563	// Realize() later
	564	tool->Attach(this);
7c551d95	565
37e2cb08 SC	566	return TRUE;
37e2cb08 SC	567	}
e9576ca5	568
37e2cb08 SC	569	void wxToolBar::DoSetToggle(wxToolBarToolBase *t, bool toggle)
	570	{
	571	wxToolBarTool tool = (wxToolBarTool )t;
	572	// TODO: set toggle state
e9576ca5 SC	573	}
e9576ca5 SC	574
37e2cb08 SC	575	bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
37e2cb08 SC	576	{
e044f600	577	return TRUE ;
37e2cb08	578	}
2f1ae414 SC	579
	580	void wxToolBar::OnPaint(wxPaintEvent& event)
	581	{
de043984 SC	582	wxPaintDC dc(this) ;
	583	wxMacPortSetter helper(&dc) ;
	584
	585	Rect toolbarrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) ,
	586	dc.YLOG2DEVMAC(m_height) , dc.XLOG2DEVMAC(m_width) } ;
	587	UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
cd9bcf8a	588	{
de043984 SC	589	int index = 0 ;
de043984 SC	590	for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
cd9bcf8a	591	{
de043984	592	if ( m_macToolHandles[index] )
cd9bcf8a	593	{
de043984	594	UMADrawControl( (ControlHandle) m_macToolHandles[index] ) ;
cd9bcf8a SC	595	}
cd9bcf8a SC	596	}
cd9bcf8a	597	}
2f1ae414	598	}
895f5af7	599
2f1ae414 SC	600	void wxToolBar::OnMouse( wxMouseEvent &event )
2f1ae414 SC	601	{
cd9bcf8a SC	602	if (event.GetEventType() == wxEVT_LEFT_DOWN \|\| event.GetEventType() == wxEVT_LEFT_DCLICK )
	603	{
	604
	605	int x = event.m_x ;
	606	int y = event.m_y ;
	607
	608	MacClientToRootWindow( &x , &y ) ;
	609
	610	ControlHandle control ;
	611	Point localwhere ;
	612	GrafPtr port ;
	613	SInt16 controlpart ;
76a5e5d2	614	WindowRef window = (WindowRef) MacGetRootWindow() ;
cd9bcf8a SC	615
	616	localwhere.h = x ;
	617	localwhere.v = y ;
	618
	619	short modifiers = 0;
	620
	621	if ( !event.m_leftDown && !event.m_rightDown )
	622	modifiers \|= btnState ;
	623
	624	if ( event.m_shiftDown )
	625	modifiers \|= shiftKey ;
	626
	627	if ( event.m_controlDown )
	628	modifiers \|= controlKey ;
	629
	630	if ( event.m_altDown )
	631	modifiers \|= optionKey ;
	632
	633	if ( event.m_metaDown )
	634	modifiers \|= cmdKey ;
	635
	636	controlpart = FindControl( localwhere , window , &control ) ;
	637	{
	638	if ( control && ::IsControlActive( control ) )
	639	{
	640	{
	641	if ( controlpart == kControlIndicatorPart && !UMAHasAppearance() )
	642	controlpart = ::HandleControlClick( control , localwhere , modifiers , (ControlActionUPP) NULL ) ;
	643	else
	644	controlpart = ::HandleControlClick( control , localwhere , modifiers , (ControlActionUPP) -1 ) ;
	645	wxTheApp->s_lastMouseDown = 0 ;
	646	if ( controlpart && ! ( ( UMAHasAppearance() \|\| (controlpart != kControlIndicatorPart) )
	647	&& (IsKindOf( CLASSINFO( wxScrollBar ) ) ) ) ) // otherwise we will get the event twice
	648	{
	649	MacHandleControlClick( control , controlpart ) ;
	650	}
	651	}
	652	}
	653	}
	654	}
2f1ae414 SC	655	}
2f1ae414 SC	656
519cb848 SC	657	#endif // wxUSE_TOOLBAR
519cb848 SC	658