blind fix for wxGIFDecoder::ReadGIF

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

diff --git a/src/mac/toolbar.cpp b/src/mac/toolbar.cpp
index e4bd0aff79ff5484358c1a55fa5c1f4925745315..f88f68b24f753f6bbef9ce9dcd71462972c2b411 100644 (file)
--- a/src/mac/toolbar.cpp
+++ b/src/mac/toolbar.cpp
@@ -5,8 +5,7 @@
 // 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) AUTHORy

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


@@ -18,13 +17,20 @@
 #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"

 
 

+#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
 IMPLEMENT_DYNAMIC_CLASS(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"

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


@@ -45,14 +51,14 @@ public:
                             clientData, shortHelpString, longHelpString)
     {
         m_nSepCount = 0;
                             clientData, shortHelpString, longHelpString)
     {
         m_nSepCount = 0;

-        m_index = 0 ;
+        m_index = -1 ;

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

-        m_index = 0 ;
+        m_index = -1 ;

     }
 
     // set/get the number of separators which we use to cover the space used by
     }
 
     // set/get the number of separators which we use to cover the space used by


@@ -74,6 +80,12 @@ private:
 // wxToolBarTool
 // ----------------------------------------------------------------------------
 
 // 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,
 wxToolBarToolBase *wxToolBar::CreateTool(int id,
                                          const wxBitmap& bitmap1,
                                          const wxBitmap& bitmap2,


@@ -91,26 +103,17 @@ wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
     return new wxToolBarTool(this, control);
 }
 
     return new wxToolBarTool(this, control);
 }
 

-// ----------------------------------------------------------------------------
-// wxToolBar construction
-// ----------------------------------------------------------------------------
-

 void wxToolBar::Init()
 {
   m_maxWidth = -1;
   m_maxHeight = -1;
 void wxToolBar::Init()
 {
   m_maxWidth = -1;
   m_maxHeight = -1;

-  m_defaultWidth = 24;
-  m_defaultHeight = 22;
-  // TODO
+  m_defaultWidth = kwxMacToolBarToolDefaultWidth;
+  m_defaultHeight = kwxMacToolBarToolDefaultHeight;

 }
 
 bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
             long style, const wxString& name)
 {
 }
 
 bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
             long style, const wxString& name)
 {

-  m_maxWidth = m_maxHeight = 0;
-
-  m_defaultWidth = 24;
-  m_defaultHeight = 22;

   
   int x = pos.x;
   int y = pos.y;
   
   int x = pos.x;
   int y = pos.y;


@@ -126,192 +129,215 @@ bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
   if (y < 0)
     y = 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 ) ;
+  SetName(name);

 
 

-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , "\p" , true , 0 , 0 , 1, 
-               kControlPlacardProc , (long) this ) ;
-       MacPostControlCreate() ;
+  m_windowStyle = style;
+  parent->AddChild(this);

 
 

-  return TRUE;
-}
-
-wxToolBar::~wxToolBar()
-{
-    // TODO
-}
+  m_backgroundColour = parent->GetBackgroundColour() ;
+  m_foregroundColour = parent->GetForegroundColour() ;

 
 

-PicHandle MakePict(GWorldPtr wp)
-{
-       CGrafPtr                origPort ;
-       GDHandle                origDev ;
-       
-       PicHandle               pict;                           // this is the Picture we give back
+  if (id == -1)
+      m_windowId = NewControlId();
+  else
+      m_windowId = id;

 
 

-       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_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;

 }
 
 }
 

-PicHandle MakePictWhite(GWorldPtr wp)
+wxToolBar::~wxToolBar()

 {
 {

-       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
+    // 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

 }
 
 }
 

-const short kwxMacToolBarTopMargin = 2 ;
-const short kwxMacToolBarLeftMargin = 2 ;
-

 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.Number() == 0)
+        return FALSE;
+
+    Point localOrigin ;
+    Rect clipRect ;
+    WindowRef window ;
+    wxWindow *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 ;
+
+    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 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 ;
-                               
-                       SInt16 behaviour = kControlBehaviorOffsetContents ;
-                       if ( tool->CanBeToggled() )
-                               behaviour += kControlBehaviorToggles ;
-                               
-                       if ( icon )
-                       {
-                               m_macToolHandle = UMANewControl( window , &toolrect , "\p" , true , 0 , 
-                                       behaviour + 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 , 
-                                               behaviour  , 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 ;
+    
+    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 = bmap->m_hPict ;
+                }
+                else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
+                {
+                    if ( tool->GetBitmap1().GetMask() )
+                    {
+                        info.contentType = kControlContentCIconHandle ;
+                        info.u.cIconHandle = wxMacCreateCIcon( bmap->m_hBitmap , tool->GetBitmap1().GetMask()->GetMaskBitmap() ,
+                                                               8 , 16 ) ;
+                    }
+                    else
+                    {
+                        info.contentType = kControlContentCIconHandle ;
+                        info.u.cIconHandle = wxMacCreateCIcon( 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 = 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)
 {
 }
 
 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( ControlHandle control , SInt16 controlpart ) 


@@ -321,7 +347,13 @@ void wxToolBar::MacHandleControlClick( ControlHandle control , SInt16 controlpar
        {
                if ( m_macToolHandles[index] == (void*) control )
                {
        {
                if ( m_macToolHandles[index] == (void*) control )
                {

-                       OnLeftClick( ( (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ) ->m_index , ( (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ) ->IsToggled() ) ;
+                       wxToolBarTool *tool = (wxToolBarTool *)m_tools.Nth( index )->Data();
+                       if ( tool->CanBeToggled() )
+               {
+                       tool->Toggle( GetControlValue( control ) ) ;
+               }
+                       OnLeftClick( tool->GetId() , tool -> IsToggled() ) ;
+                       break ;

                }
        }
 }
                }
        }
 }


@@ -337,46 +369,181 @@ void wxToolBar::SetRows(int nRows)
     m_maxRows = nRows;
 }
 
     m_maxRows = nRows;
 }
 

+void wxToolBar::MacSuperChangedPosition() 
+{
+  if (m_tools.Number() > 0)
+  {
+
+       Point localOrigin ;
+       Rect clipRect ;
+       WindowRef window ;
+       wxWindow *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 ;
+
+       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 = 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 ;
+                                               
+                       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 ( wxrootwindow->IsKindOf( CLASSINFO( wxDialog ) ) )
+               {
+               }
+               else
+               {
+                       ::SetThemeWindowBackground( rootwindow , kThemeBrushDocumentWindowBackground , false ) ;
+               }
+    }
+
+     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 ) ;
 wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
 {
     MacClientToRootWindow( &x , &y ) ;

-    Point pt = { x ,y } ;
+    Point pt = { y ,x } ;

 
        int index = 0 ;
        for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
        {
 
        int index = 0 ;
        for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
        {

-               if ( PtInRect( pt , &(**(ControlHandle)(m_macToolHandles[index])).contrlRect) )
+               if ( m_macToolHandles[index] )

                {
                {

-                       return  (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ;
+                       Rect bounds ;
+                       GetControlBounds((ControlHandle) m_macToolHandles[index], &bounds ) ;
+                       if ( PtInRect( pt , &bounds ) )
+                       {
+                               return  (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ;
+                       }

                }
        }
 
     return (wxToolBarToolBase *)NULL;
 }
 
                }
        }
 
     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)
 {
         wxToolBarTool *tool = (wxToolBarTool *)t;
 void wxToolBar::DoEnableTool(wxToolBarToolBase *t, bool enable)
 {
         wxToolBarTool *tool = (wxToolBarTool *)t;

+        if ( tool->m_index < 0 )
+               return ;
+               

         ControlHandle control = (ControlHandle) m_macToolHandles[ tool->m_index ] ;
         ControlHandle control = (ControlHandle) m_macToolHandles[ tool->m_index ] ;

-               if ( UMAHasAppearance() )
-               {
-                       if ( enable )
-                               ::ActivateControl( control ) ;
-                       else
-                               ::DeactivateControl( control ) ;
-               }
+
+               if ( enable )
+                       UMAActivateControl( control ) ;

                else
                else

-               {
-                       if ( enable )
-                               ::HiliteControl( control , 0 ) ;
-                       else
-                               ::HiliteControl( control , 255 ) ;
-               }
+                       UMADeactivateControl( control ) ;

 }
 
 void wxToolBar::DoToggleTool(wxToolBarToolBase *t, bool toggle)
 {
        wxToolBarTool *tool = (wxToolBarTool *)t;
 }
 
 void wxToolBar::DoToggleTool(wxToolBarToolBase *t, bool toggle)
 {
        wxToolBarTool *tool = (wxToolBarTool *)t;

+        if ( tool->m_index < 0 )
+               return ;

         
        ControlHandle control = (ControlHandle) m_macToolHandles[ tool->m_index ] ;
                ::SetControlValue( control , toggle ) ;
         
        ControlHandle control = (ControlHandle) m_macToolHandles[ tool->m_index ] ;
                ::SetControlValue( control , toggle ) ;


@@ -402,5 +569,116 @@ 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 ;
+       
+       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 ;
+                       }
+                       
+                       if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) ||  parent->IsKindOf( CLASSINFO( wxTabCtrl ) ))
+                       {
+                               if ( ((wxControl*)parent)->GetMacControl() )
+                                       SetUpControlBackground( ((wxControl*)parent)->GetMacControl() , -1 , true ) ;
+                               break ;
+                       }
+                       
+                       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 } ;
+
+               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 )
+       {
+                       
+               int x = event.m_x ;
+               int y = event.m_y ;
+               
+               MacClientToRootWindow( &x , &y ) ;
+                       
+               ControlHandle   control ;
+               Point           localwhere ;
+               GrafPtr         port ;
+               SInt16          controlpart ;
+               WindowRef       window = GetMacRootWindow() ;
+               
+               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
 
 #endif // wxUSE_TOOLBAR