BestSize is ok for built-ins

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

diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp
index 26f3a748cb6d47e1063ddb7751e473587f06cce4..58b625e7b2360c2934b7473a6673e53b40000ca2 100644 (file)
--- a/src/mac/carbon/toolbar.cpp
+++ b/src/mac/carbon/toolbar.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        toolbar.cpp
 // Purpose:     wxToolBar
 /////////////////////////////////////////////////////////////////////////////
 // Name:        toolbar.cpp
 // Purpose:     wxToolBar

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     The wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -18,14 +18,21 @@
 #if wxUSE_TOOLBAR
 
 #include "wx/toolbar.h"
 #if wxUSE_TOOLBAR
 
 #include "wx/toolbar.h"

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

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
+#if !USE_SHARED_LIBRARY
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)

 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)

+    EVT_MOUSE_EVENTS( wxToolBar::OnMouse ) 
+    EVT_PAINT( wxToolBar::OnPaint ) 

 END_EVENT_TABLE()
 END_EVENT_TABLE()

+#endif

 
 

-#include <wx/mac/uma.h>
-
+#include "wx/mac/uma.h"
+#include "wx/geometry.h"

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


@@ -35,36 +42,115 @@ class wxToolBarTool : public wxToolBarToolBase
 public:
     wxToolBarTool(wxToolBar *tbar,
                   int id,
 public:
     wxToolBarTool(wxToolBar *tbar,
                   int id,

-                  const wxBitmap& bitmap1,
-                  const wxBitmap& bitmap2,
-                  bool toggle,
+                  const wxString& label,
+                  const wxBitmap& bmpNormal,
+                  const wxBitmap& bmpDisabled,
+                  wxItemKind kind,

                   wxObject *clientData,
                   wxObject *clientData,

-                  const wxString& shortHelpString,
-                  const wxString& longHelpString)
-        : wxToolBarToolBase(tbar, id, bitmap1, bitmap2, toggle,
-                            clientData, shortHelpString, longHelpString)
-    {
-        m_nSepCount = 0;
-        m_index = 0 ;
-    }
-
+                  const wxString& shortHelp,
+                  const wxString& longHelp) ;
+                  

     wxToolBarTool(wxToolBar *tbar, wxControl *control)
         : wxToolBarToolBase(tbar, control)
     {
     wxToolBarTool(wxToolBar *tbar, wxControl *control)
         : wxToolBarToolBase(tbar, control)
     {

-        m_nSepCount = 1;
-        m_index = 0 ;
+        Init() ;
+    }
+    
+    ~wxToolBarTool()
+    {
+        if ( m_controlHandle )
+            DisposeControl( m_controlHandle ) ;

     }
     }

+    
+    WXWidget GetControlHandle() { return (WXWidget) m_controlHandle ; }
+    void SetControlHandle( ControlRef handle ) { m_controlHandle = handle ; }

 
 

-    // 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; }
+    void SetSize(const wxSize& size) ;
+    void SetPosition( const wxPoint& position ) ;
+    wxSize GetSize() const
+    {
+        if ( IsControl() )
+        {
+            return GetControl()->GetSize() ;
+        }
+        else if ( IsButton() )
+        {
+            return GetToolBar()->GetToolSize() ;
+        }
+        else
+        {
+            wxSize sz = GetToolBar()->GetToolSize() ;
+            sz.x /= 4 ;
+            sz.y /= 4 ;
+            return sz ;
+        }
+    }
+    wxPoint GetPosition() const
+    {
+        return wxPoint(m_x, m_y);
+    }    
+private :
+    void Init() 
+    {
+        m_controlHandle = NULL ;
+    }
+    ControlRef m_controlHandle ;

 
 

-    int                m_index ;
-private:
-    size_t m_nSepCount;
+    wxCoord     m_x;
+    wxCoord     m_y;

 };
 
 };
 

+static const EventTypeSpec eventList[] =
+{
+       { kEventClassControl , kEventControlHit } ,
+} ;
+
+static pascal OSStatus wxMacToolBarToolControlEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+    OSStatus result = eventNotHandledErr ;
+
+    wxMacCarbonEvent cEvent( event ) ;
+    
+    ControlRef controlRef ;
+
+    cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ;
+
+    switch( GetEventKind( event ) )
+    {
+        case kEventControlHit :
+            {
+                wxToolBarTool* tbartool = (wxToolBarTool*)data ;
+                if ( tbartool->CanBeToggled() )
+                {
+                    tbartool->Toggle( GetControl32BitValue( (ControlRef) tbartool->GetControlHandle() ) ) ;
+                }
+                ((wxToolBar*)tbartool->GetToolBar())->OnLeftClick( tbartool->GetId() , tbartool -> IsToggled() ) ;
+
+                result = noErr; 
+            }
+            break ;
+        default :
+            break ;
+    }
+    return result ;
+}
+
+pascal OSStatus wxMacToolBarToolEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+    OSStatus result = eventNotHandledErr ;
+
+    switch ( GetEventClass( event ) )
+    {
+        case kEventClassControl :
+            result = wxMacToolBarToolControlEventHandler( handler, event, data ) ;
+            break ;
+        default :
+            break ;
+    }
+    return result ;
+}
+
+DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacToolBarToolEventHandler )

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


@@ -74,252 +160,271 @@ private:
 // wxToolBarTool
 // ----------------------------------------------------------------------------
 
 // wxToolBarTool
 // ----------------------------------------------------------------------------
 

-wxToolBarToolBase *wxToolBar::CreateTool(int id,
-                                         const wxBitmap& bitmap1,
-                                         const wxBitmap& bitmap2,
-                                         bool toggle,
-                                         wxObject *clientData,
-                                         const wxString& shortHelpString,
-                                         const wxString& longHelpString)
+void wxToolBarTool::SetSize(const wxSize& size)

 {
 {

-    return new wxToolBarTool(this, id, bitmap1, bitmap2, toggle,
-                             clientData, shortHelpString, longHelpString);
+    if ( IsControl() )
+    {
+        GetControl()->SetSize( size ) ;
+    }

 }
 
 }
 

-wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
+void wxToolBarTool::SetPosition(const wxPoint& position)

 {
 {

-    return new wxToolBarTool(this, control);
+    m_x = position.x;
+    m_y = position.y;
+
+    if ( IsButton() )
+    {
+        int x , y ;
+        x = y = 0 ;
+        int mac_x = position.x ;
+        int mac_y = position.y ;
+#if !TARGET_API_MAC_OSX
+        WindowRef rootwindow = (WindowRef) GetToolBar()->MacGetTopLevelWindowRef() ;    
+        GetToolBar()->MacWindowToRootWindow( &x , &y ) ;
+        mac_x += x;
+        mac_y += y;
+#endif
+        Rect contrlRect ;       
+        GetControlBounds( m_controlHandle , &contrlRect ) ; 
+        int former_mac_x = contrlRect.left ;
+        int former_mac_y = contrlRect.top ;
+        wxSize sz = GetToolBar()->GetToolSize() ;
+        
+        if ( mac_x != former_mac_x || mac_y != former_mac_y )
+        {
+            UMAMoveControl( m_controlHandle , mac_x , mac_y ) ;
+        }
+    }
+    else if ( IsControl() )
+    {
+        GetControl()->Move( position ) ;
+    }

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// wxToolBar construction
-// ----------------------------------------------------------------------------
+const short kwxMacToolBarToolDefaultWidth = 24 ;
+const short kwxMacToolBarToolDefaultHeight = 22 ;
+const short kwxMacToolBarTopMargin = 2 ;
+const short kwxMacToolBarLeftMargin = 2 ;

 
 

-void wxToolBar::Init()
+wxToolBarTool::wxToolBarTool(wxToolBar *tbar,
+  int id,
+  const wxString& label,
+  const wxBitmap& bmpNormal,
+  const wxBitmap& bmpDisabled,
+  wxItemKind kind,
+  wxObject *clientData,
+  const wxString& shortHelp,
+  const wxString& longHelp)
+        : wxToolBarToolBase(tbar, id, label, bmpNormal, bmpDisabled, kind,
+                            clientData, shortHelp, longHelp)

 {
 {

-  m_maxWidth = -1;
-  m_maxHeight = -1;
-  m_defaultWidth = 24;
-  m_defaultHeight = 22;
-  // TODO
+    Init();
+    
+    if (id == wxID_SEPARATOR) return;
+    
+    WindowRef window = (WindowRef) tbar->MacGetTopLevelWindowRef() ;    
+    wxSize toolSize = tbar->GetToolSize() ;    
+    Rect toolrect = { 0, 0 , toolSize.y , toolSize.x } ;
+    
+    ControlButtonContentInfo info ;
+    wxMacCreateBitmapButton( &info , GetNormalBitmap() ) ;
+    
+    SInt16 behaviour = kControlBehaviorOffsetContents ;
+    if ( CanBeToggled() )
+        behaviour += kControlBehaviorToggles ;
+    
+    if ( info.contentType != kControlNoContent ) 
+    {
+        m_controlHandle = ::NewControl( window , &toolrect , "\p" , true , 0 , 
+                                        behaviour + info.contentType , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;
+        
+        ::SetControlData( m_controlHandle , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+    }
+    else
+    {
+        m_controlHandle = ::NewControl( window , &toolrect , "\p" , true , 0 , 
+                                        behaviour  , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;
+    }
+    InstallControlEventHandler( (ControlRef) m_controlHandle, GetwxMacToolBarToolEventHandlerUPP(),
+        GetEventTypeCount(eventList), eventList, this,NULL);
+    UMAShowControl( m_controlHandle ) ;
+    if ( !IsEnabled() )
+    {
+        UMADeactivateControl( m_controlHandle ) ;
+    }
+    if ( CanBeToggled() && IsToggled() )
+    {
+        ::SetControl32BitValue( m_controlHandle , 1 ) ;
+    }
+    else
+    {
+        ::SetControl32BitValue( m_controlHandle , 0 ) ;
+    }
+    
+    ControlRef container = (ControlRef) tbar->GetHandle() ;
+    wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
+    ::EmbedControl( m_controlHandle , container ) ;

 }
 
 }
 

-bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
-            long style, const wxString& name)
+
+wxToolBarToolBase *wxToolBar::CreateTool(int id,
+                                         const wxString& label,
+                                         const wxBitmap& bmpNormal,
+                                         const wxBitmap& bmpDisabled,
+                                         wxItemKind kind,
+                                         wxObject *clientData,
+                                         const wxString& shortHelp,
+                                         const wxString& longHelp)

 {
 {

-  m_maxWidth = m_maxHeight = 0;
-
-  m_defaultWidth = 24;
-  m_defaultHeight = 22;
-  
-  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;
-
-       Rect bounds ;
-       Str255 title ;
-       
-       MacPreControlCreate( parent , id ,  "" , wxPoint( x , y ) , wxSize( width , height ) ,style, *((wxValidator*)NULL) , name , &bounds , title ) ;
-
-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , "\p" , true , 0 , 0 , 1, 
-               kControlPlacardProc , (long) this ) ;
-       MacPostControlCreate() ;
-
-  return TRUE;
+    return new wxToolBarTool(this, id, label, bmpNormal, bmpDisabled, kind,
+                             clientData, shortHelp, longHelp);

 }
 
 }
 

-wxToolBar::~wxToolBar()
+wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)

 {
 {

-    // TODO
+    return new wxToolBarTool(this, control);

 }
 
 }
 

-PicHandle MakePict(GWorldPtr wp)
+void wxToolBar::Init()

 {
 {

-       CGrafPtr                origPort ;
-       GDHandle                origDev ;
-       
-       PicHandle               pict;                           // this is the Picture we give back
-
-       RGBColor                gray = { 0xCCCC ,0xCCCC , 0xCCCC } ;
-       
-       GetGWorld( &origPort , &origDev ) ;
-       SetGWorld( wp , NULL ) ;
-       
-       pict = OpenPicture(&wp->portRect);      // open a picture, this disables drawing
-       if(!pict)       
-               return NULL;
-       
-       RGBBackColor( &gray ) ;
-       EraseRect(&wp->portRect) ;
-       CopyBits((BitMap*)*wp->portPixMap,                      // src PixMap   - we copy image over itself -
-                               (BitMap*)*wp->portPixMap,               // dst PixMap   - no drawing occurs -
-                               &wp->portRect,                  // srcRect              - it will be recorded and compressed -
-                               &wp->portRect,                  // dstRect              - into the picture that is open -
-                               srcCopy,NULL);                  // copyMode and no clip region
-
-       ClosePicture();                                         // We are done recording the picture
-       SetGWorld( origPort , origDev ) ;
-       return pict;                                            // return our groovy pict handle
+    m_maxWidth = -1;
+    m_maxHeight = -1;
+    m_defaultWidth = kwxMacToolBarToolDefaultWidth;
+    m_defaultHeight = kwxMacToolBarToolDefaultHeight;

 }
 
 }
 

-PicHandle MakePictWhite(GWorldPtr wp)
-{
-       CGrafPtr                origPort ;
-       GDHandle                origDev ;
-       
-       PicHandle               pict;                           // this is the Picture we give back
-
-       RGBColor                white = { 0xFFFF ,0xFFFF  , 0xFFFF  } ;
-       
-       GetGWorld( &origPort , &origDev ) ;
-       SetGWorld( wp , NULL ) ;
-       
-       pict = OpenPicture(&wp->portRect);      // open a picture, this disables drawing
-       if(!pict)       
-               return NULL;
-       
-       RGBBackColor( &white ) ;
-       EraseRect(&wp->portRect) ;
-       CopyBits((BitMap*)*wp->portPixMap,                      // src PixMap   - we copy image over itself -
-                               (BitMap*)*wp->portPixMap,               // dst PixMap   - no drawing occurs -
-                               &wp->portRect,                  // srcRect              - it will be recorded and compressed -
-                               &wp->portRect,                  // dstRect              - into the picture that is open -
-                               srcCopy,NULL);                  // copyMode and no clip region
-
-       ClosePicture();                                         // We are done recording the picture
-       SetGWorld( origPort , origDev ) ;
-       return pict;                                            // return our groovy pict handle
+bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
+            long style, const wxString& name)
+{  
+    if ( !wxToolBarBase::Create( parent , id , pos , size , style ) )
+        return FALSE ;
+    
+    return TRUE;

 }
 
 }
 

-const short kwxMacToolBarTopMargin = 2 ;
-const short kwxMacToolBarLeftMargin = 2 ;
+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()
 {
 
 bool wxToolBar::Realize()
 {

-  if (m_tools.Number() == 0)
-      return FALSE;
-
-       Rect toolbarrect = { m_y , m_x , m_y + m_height , m_x + m_width } ;
-       ControlFontStyleRec             controlstyle ;
-       WindowPtr                               window = GetMacRootWindow() ;
-       controlstyle.flags = kControlUseFontMask ;
-       controlstyle.font = kControlFontSmallSystemFont ;
-       
-       wxNode *node = m_tools.First();
-       int noButtons = 0;
-       int x = 0 ;
-       wxSize toolSize = GetToolSize() ;
+    if (m_tools.GetCount() == 0)
+        return FALSE;
+
+    int x = m_xMargin + kwxMacToolBarLeftMargin ;
+    int y = m_yMargin + kwxMacToolBarTopMargin ;
+

     int tw, th;
     GetSize(& tw, & th);
     int tw, th;
     GetSize(& tw, & th);

-       while (node)
-       {
-               wxToolBarTool *tool = (wxToolBarTool *)node->Data();
-               wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetBitmap1().GetRefData()) ;
-               
-               if( !tool->IsSeparator() )
-               {
-                       Rect toolrect = { toolbarrect.top + kwxMacToolBarTopMargin , toolbarrect.left + x + kwxMacToolBarLeftMargin , 0 , 0 } ;
-                       toolrect.right = toolrect.left + toolSize.x ;
-                       toolrect.bottom = toolrect.top + toolSize.y ;
-                       
-                       PicHandle       icon = NULL ;
-                       if ( bmap )
-                       {
-                               if ( bmap->m_bitmapType == kMacBitmapTypePict )
-                                       icon = bmap->m_hPict ;
-                               else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
-                               {
-                                       icon = MakePict( bmap->m_hBitmap ) ;
-                               }
-                       }
-                       
-                       ControlHandle m_macToolHandle ;
-                               
-                       if ( icon )
-                       {
-                               m_macToolHandle = UMANewControl( window , &toolrect , "\p" , true , 0 , 
-                                       kControlBehaviorOffsetContents + kControlContentPictHandle , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;
-                               ControlButtonContentInfo info ;
-                               
-                               info.contentType = kControlContentPictHandle ;
-                               info.u.picture = icon ;
-                               
-                               UMASetControlData( m_macToolHandle , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
-                       }
-                       else
-                       {
-                                               m_macToolHandle = UMANewControl( window , &toolrect , "\p" , true , 0 , 
-                                               kControlBehaviorOffsetContents  , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;
-                       }
-                       m_macToolHandles.Add( m_macToolHandle ) ;
-                       UMASetControlFontStyle( m_macToolHandle , &controlstyle ) ;
-                       UMAEmbedControl( m_macToolHandle , m_macControl ) ;
-                       
-                       x += (int)toolSize.x;
-                       noButtons ++;
-               }
-               else
-               {
-                       m_macToolHandles.Add( NULL ) ;
-                       x += (int)toolSize.x / 4;
-               }
-           if ( toolbarrect.left + x + kwxMacToolBarLeftMargin > m_maxWidth)
-               m_maxWidth = toolbarrect.left + x + kwxMacToolBarLeftMargin;
-       if (toolbarrect.top + kwxMacToolBarTopMargin + toolSize.y > m_maxHeight)
-               m_maxHeight = toolbarrect.top + kwxMacToolBarTopMargin ;
-
-               node = node->Next();
-       }
-
-  if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
-  {
-    m_maxWidth = tw ; // +=toolSize.x;
-    m_maxHeight += toolSize.y;
-       m_maxHeight += m_yMargin;
-  }
-  else
-  {
-    m_maxHeight = th ;// += toolSize.y;
-    m_maxWidth += toolSize.x;
-       m_maxWidth += m_xMargin;
-  }
-
-  SetSize(m_maxWidth, m_maxHeight);
-
-  return TRUE;
+    
+    int maxWidth = 0 ;
+    int maxHeight = 0 ;
+    
+    int maxToolWidth = 0;
+    int maxToolHeight = 0;
+
+    // Find the maximum tool width and height
+    wxToolBarToolsList::Node *node = m_tools.GetFirst();
+    while ( node )
+    {
+        wxToolBarTool *tool = (wxToolBarTool *)node->GetData();
+        wxSize sz = tool->GetSize() ;
+
+        if ( sz.x > maxToolWidth )
+            maxToolWidth = sz.x ;
+        if (sz.y> maxToolHeight)
+            maxToolHeight = sz.y;
+
+        node = node->GetNext();
+    }
+
+    node = m_tools.GetFirst();
+    while (node)
+    {
+        wxToolBarTool *tool = (wxToolBarTool *)node->GetData();
+        wxSize cursize = tool->GetSize() ;
+        
+        // for the moment we just do a single row/column alignement
+        if ( x + cursize.x > maxWidth )
+            maxWidth = x + cursize.x ;
+        if ( y + cursize.y > maxHeight )
+            maxHeight = y + cursize.y ;
+            
+        tool->SetPosition( wxPoint( x , y ) ) ;
+        
+        if ( GetWindowStyleFlag() & wxTB_VERTICAL )
+        {
+            y += cursize.y ;
+        }
+        else
+        {
+            x += cursize.x ;
+        }
+
+        node = node->GetNext();
+    }
+    
+    if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
+    {
+        if ( m_maxRows == 0 )
+        {
+            // if not set yet, only one row
+            SetRows(1);
+        }
+        maxWidth = tw ; 
+        maxHeight += m_yMargin + kwxMacToolBarTopMargin;
+        m_maxHeight = maxHeight ;
+    }
+    else
+    {
+        if ( GetToolsCount() > 0 && m_maxRows == 0 )
+        {
+            // if not set yet, have one column
+            SetRows(GetToolsCount());
+        }
+        maxHeight = th ;
+        maxWidth += m_xMargin + kwxMacToolBarLeftMargin;
+        m_maxWidth = maxWidth ;
+    }
+    
+    SetSize( maxWidth, maxHeight );
+    
+    return TRUE;

 }
 
 void wxToolBar::SetToolBitmapSize(const wxSize& size)
 {
 }
 
 void wxToolBar::SetToolBitmapSize(const wxSize& size)
 {

-    m_defaultWidth = size.x; m_defaultHeight = size.y;
+    m_defaultWidth = size.x+4; m_defaultHeight = size.y+4;

 }
 
 // The button size is bigger than the bitmap size
 wxSize wxToolBar::GetToolSize() const
 {
 }
 
 // The button size is bigger than the bitmap size
 wxSize wxToolBar::GetToolSize() const
 {

-    return wxSize(m_defaultWidth + 8, m_defaultHeight + 7);
+    return wxSize(m_defaultWidth + 4, m_defaultHeight + 4);

 }
 
 }
 

-void wxToolBar::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+void wxToolBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED( mouseStillDown ) ) 

 {
 {

-       int index = 0 ;
-       for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
-       {
-               if ( m_macToolHandles[index] == (void*) control )
-               {
-                       OnLeftClick( ( (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ) ->m_index , ( (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ) ->IsToggled() ) ;
-               }
-       }
+    wxToolBarToolsList::Node *node;
+    for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
+    {
+        wxToolBarTool* tool = (wxToolBarTool*) node->GetData() ; 
+        if ( tool->IsButton() )
+        {
+           if( tool->GetControlHandle() == control ) 
+           {
+                if ( tool->CanBeToggled() )
+                {
+                    tool->Toggle( GetControl32BitValue( (ControlRef) control ) ) ;
+                }
+                OnLeftClick( tool->GetId() , tool -> IsToggled() ) ;
+                break ;
+           }
+        }
+    }

 }
 
 void wxToolBar::SetRows(int nRows)
 }
 
 void wxToolBar::SetRows(int nRows)


@@ -333,53 +438,196 @@ void wxToolBar::SetRows(int nRows)
     m_maxRows = nRows;
 }
 
     m_maxRows = nRows;
 }
 

+void wxToolBar::MacSuperChangedPosition() 
+{
+    wxWindow::MacSuperChangedPosition() ;
+    Realize() ;
+}
+

 wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
 {
 wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
 {

-    MacClientToRootWindow( &x , &y ) ;
-    Point pt = { x ,y } ;
-
-       int index = 0 ;
-       for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
-       {
-               if ( PtInRect( pt , &(**(ControlHandle)(m_macToolHandles[index])).contrlRect) )
-               {
-                       return  (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ;
-               }
-       }
+    wxToolBarToolsList::Node *node = m_tools.GetFirst();
+    while (node)
+    {
+        wxToolBarTool *tool = (wxToolBarTool *)node->GetData() ;
+        wxRect2DInt r( tool->GetPosition() , tool->GetSize() ) ;
+        if ( r.Contains( wxPoint( x , y ) ) )
+        {
+            return tool;
+        }
+
+        node = node->GetNext();
+    }

 
     return (wxToolBarToolBase *)NULL;
 }
 
 
     return (wxToolBarToolBase *)NULL;
 }
 

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

 void wxToolBar::DoEnableTool(wxToolBarToolBase *t, bool enable)
 {
 void wxToolBar::DoEnableTool(wxToolBarToolBase *t, bool enable)
 {

-        wxToolBarTool *tool = (wxToolBarTool *)t;
+    if (!IsShown())
+        return ;
+
+    wxToolBarTool *tool = (wxToolBarTool *)t;
+    if ( tool->IsControl() )
+    {
+        tool->GetControl()->Enable( enable ) ;
+    }
+    else if ( tool->IsButton() )
+    {
+        if ( enable )
+            UMAActivateControl( (ControlRef) tool->GetControlHandle() ) ;
+        else
+            UMADeactivateControl( (ControlRef) tool->GetControlHandle() ) ;
+    }

 }
 
 void wxToolBar::DoToggleTool(wxToolBarToolBase *t, bool toggle)
 {
 }
 
 void wxToolBar::DoToggleTool(wxToolBarToolBase *t, bool toggle)
 {

-       wxToolBarTool *tool = (wxToolBarTool *)t;
-       // TODO: set toggle state
+    if (!IsShown())
+        return ;
+
+    wxToolBarTool *tool = (wxToolBarTool *)t;
+    if ( tool->IsButton() )
+    {
+        ::SetControl32BitValue( (ControlRef) tool->GetControlHandle() , toggle ) ;
+    }

 }
 
 bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
                              wxToolBarToolBase *tool)
 {
 }
 
 bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
                              wxToolBarToolBase *tool)
 {

-    // nothing special to do here - we really create the toolbar buttons in
-    // Realize() later
+    // nothing special to do here - we relayout in Realize() later

     tool->Attach(this);
 
     return TRUE;
 }
 
     tool->Attach(this);
 
     return TRUE;
 }
 

-void wxToolBar::DoSetToggle(wxToolBarToolBase *t, bool toggle)
+void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(toggle))
+{
+    wxFAIL_MSG( _T("not implemented") );
+}
+
+bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool)

 {
 {

-       wxToolBarTool *tool = (wxToolBarTool *)t;
-       // TODO: set toggle state
+    wxToolBarToolsList::Node *node;
+    for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
+    {
+        wxToolBarToolBase *tool2 = node->GetData();
+        if ( tool2 == tool )
+        {
+            // let node point to the next node in the list
+            node = node->GetNext();
+
+            break;
+        }
+    }
+
+    wxSize sz = ((wxToolBarTool*)tool)->GetSize() ;
+
+    tool->Detach();
+
+    // and finally reposition all the controls after this one
+    
+    for ( /* node -> first after deleted */ ; node; node = node->GetNext() )
+    {
+        wxToolBarTool *tool2 = (wxToolBarTool*) node->GetData();
+        wxPoint pt = tool2->GetPosition() ;
+
+        if ( GetWindowStyleFlag() & wxTB_VERTICAL )
+        {
+            pt.y -= sz.y ;
+        }
+        else
+        {
+            pt.x -= sz.x ;
+        }
+        tool2->SetPosition( pt ) ;
+    }
+    
+    return TRUE ;

 }
 
 }
 

-bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
+void wxToolBar::OnPaint(wxPaintEvent& event)

 {
 {

-               return TRUE ;
+    wxPaintDC dc(this) ;
+    wxMacPortSetter helper(&dc) ;
+    int w, h ;
+    GetSize( &w , &h ) ;
+    
+    Rect toolbarrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , 
+        dc.YLOG2DEVMAC(h) , dc.XLOG2DEVMAC(w) } ;
+/*
+    if( toolbarrect.left < 0 )
+        toolbarrect.left = 0 ;
+    if ( toolbarrect.top < 0 )
+        toolbarrect.top = 0 ;
+*/
+    UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
+
+    event.Skip() ;

 }
 }

+
+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 ) ;
+            
+        ControlRef   control ;
+        Point       localwhere ;
+        SInt16      controlpart ;
+        WindowRef   window = (WindowRef) MacGetTopLevelWindowRef() ;
+        
+        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 ) )
+            {
+                {
+                    controlpart = ::HandleControlClick( control , localwhere , modifiers , (ControlActionUPP) -1 ) ;
+                    wxTheApp->s_lastMouseDown = 0 ;
+                    if ( control && controlpart != kControlNoPart ) // otherwise we will get the event twice
+                    {
+                        MacHandleControlClick((WXWidget)  control , controlpart , false /* not down anymore */ ) ;
+                    }
+                }
+            }
+        }
+    }
+}
+

 #endif // wxUSE_TOOLBAR
 
 #endif // wxUSE_TOOLBAR