X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fdaf613add176525ed8b6cafaf278dfd80f85074..7ad3e9390ff6a3731acfde50938e6b36e051709c:/src/mac/toolbar.cpp

diff --git a/src/mac/toolbar.cpp b/src/mac/toolbar.cpp
index df820b8cb9..f9e68cbd21 100644
--- a/src/mac/toolbar.cpp
+++ b/src/mac/toolbar.cpp
@@ -19,17 +19,18 @@
 #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 ) 
+    EVT_MOUSE_EVENTS( wxToolBar::OnMouse ) 
+    EVT_PAINT( wxToolBar::OnPaint ) 
 END_EVENT_TABLE()
 #endif
 
-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"
 
 // ----------------------------------------------------------------------------
 // private classes
@@ -40,14 +41,15 @@ class wxToolBarTool : public wxToolBarToolBase
 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,
-                  const wxString& shortHelpString,
-                  const wxString& longHelpString)
-        : wxToolBarToolBase(tbar, id, bitmap1, bitmap2, toggle,
-                            clientData, shortHelpString, longHelpString)
+                  const wxString& shortHelp,
+                  const wxString& longHelp)
+        : wxToolBarToolBase(tbar, id, label, bmpNormal, bmpDisabled, kind,
+                            clientData, shortHelp, longHelp)
     {
         m_nSepCount = 0;
         m_index = -1 ;
@@ -65,7 +67,7 @@ public:
     void SetSeparatorsCount(size_t count) { m_nSepCount = count; }
     size_t GetSeparatorsCount() const { return m_nSepCount; }
 
-    int		m_index ;
+    int     m_index ;
 private:
     size_t m_nSepCount;
 };
@@ -86,15 +88,16 @@ const short kwxMacToolBarLeftMargin = 2 ;
 
 
 wxToolBarToolBase *wxToolBar::CreateTool(int id,
-                                         const wxBitmap& bitmap1,
-                                         const wxBitmap& bitmap2,
-                                         bool toggle,
+                                         const wxString& label,
+                                         const wxBitmap& bmpNormal,
+                                         const wxBitmap& bmpDisabled,
+                                         wxItemKind kind,
                                          wxObject *clientData,
-                                         const wxString& shortHelpString,
-                                         const wxString& longHelpString)
+                                         const wxString& shortHelp,
+                                         const wxString& longHelp)
 {
-    return new wxToolBarTool(this, id, bitmap1, bitmap2, toggle,
-                             clientData, shortHelpString, longHelpString);
+    return new wxToolBarTool(this, id, label, bmpNormal, bmpDisabled, kind,
+                             clientData, shortHelp, longHelp);
 }
 
 wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
@@ -142,13 +145,13 @@ bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
       m_windowId = id;
 
   {
-	m_width = size.x ;
-	m_height = size.y ;
-	int x = pos.x ;
-	int y = pos.y ;
-	AdjustForParentClientOrigin(x, y, wxSIZE_USE_EXISTING);
-	m_x = x ;
-	m_y = y ;
+    m_width = size.x ;
+    m_height = size.y ;
+    int x = pos.x ;
+    int y = pos.y ;
+    AdjustForParentClientOrigin(x, y, wxSIZE_USE_EXISTING);
+    m_x = x ;
+    m_y = y ;
   }
   
   return TRUE;
@@ -160,235 +163,160 @@ wxToolBar::~wxToolBar()
     // is not - otherwise toolbar leaves a hole in the place it used to occupy
 }
 
-PicHandle MakePict(GWorldPtr wp, GWorldPtr mask ) ;
-PicHandle MakePict(GWorldPtr wp, GWorldPtr mask ) 
-{
-	CGrafPtr		origPort ;
-	GDHandle		origDev ;
-	
-	PicHandle		pict;				// this is the Picture we give back
-
-	RGBColor		gray = { 0xCCCC ,0xCCCC , 0xCCCC } ;
-	RGBColor		white = { 0xffff ,0xffff , 0xffff } ;
-	RGBColor		black = { 0x0000 ,0x0000 , 0x0000 } ;
-	
-	unsigned char *maskimage = NULL ;
-	Rect portRect ;
-	GetPortBounds( wp , &portRect ) ;
-	int width = portRect.right - portRect.left ;
-	int height = portRect.bottom - portRect.top ;
-	
-	LockPixels( GetGWorldPixMap( wp ) ) ;
-	GetGWorld( &origPort , &origDev ) ;
-
-	if ( mask )
-	{
-		
-		maskimage = (unsigned char*) malloc( width * height ) ;
-		SetGWorld( mask , NULL ) ;
-		LockPixels( GetGWorldPixMap( mask ) ) ;
-		for ( int y = 0 ; y < height ; ++y )
-		{
-			for( int x = 0 ; x < width ; ++x )
-			{
-				RGBColor col ;
-				
-				GetCPixel( x + portRect.left , y + portRect.top , &col ) ;
-				maskimage[y*width + x] = ( col.red == 0 ) ; // for monochrome masks
-			}
-		}
-		UnlockPixels( GetGWorldPixMap( mask ) ) ;
-	}
-	
-	SetGWorld( wp , NULL ) ;
-	
-	pict = OpenPicture(&portRect);	// open a picture, this disables drawing
-	if(!pict)	
-		return NULL;
-
-	RGBBackColor( &gray ) ;
-	RGBForeColor( &black ) ;
-	EraseRect(&portRect) ;
-	RGBBackColor( &white ) ;
-
-	if ( maskimage )
-	{
-		for ( int y = 0 ; y < height ; ++y )
-		{
-			for( int x = 0 ; x < width ; ++x )
-			{
-				if ( maskimage[y*width + x] )
-				{
-					RGBColor col ;
-				
-					GetCPixel( x + portRect.left , y + portRect.top , &col ) ;
-					SetCPixel( x + portRect.left , y + portRect.top , &col ) ;
-				}
-			}
-		}
-		free( maskimage ) ;
-		maskimage = NULL ;
-	}
-	else
-	{
-		CopyBits(GetPortBitMapForCopyBits(wp),			// src PixMap	- we copy image over itself -
-				GetPortBitMapForCopyBits(wp),		// dst PixMap	- no drawing occurs -
-				&portRect,			// srcRect		- it will be recorded and compressed -
-				&portRect,			// dstRect		- into the picture that is open -
-				srcCopy,NULL);			// copyMode and no clip region
-
-	}
-	ClosePicture();						// We are done recording the picture
-	UnlockPixels( GetGWorldPixMap( wp ) ) ;
-	SetGWorld( origPort , origDev ) ;
-	return pict;						// return our groovy pict handle
-}
-
 bool wxToolBar::Realize()
 {
-  if (m_tools.Number() == 0)
-      return FALSE;
+    if (m_tools.Number() == 0)
+        return FALSE;
 
-	Point localOrigin ;
-	Rect clipRect ;
-	WindowRef window ;
-	wxWindow *win ;
-	
-	GetParent()->MacGetPortParams( &localOrigin , &clipRect , &window , &win ) ;
+    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 = { m_y + localOrigin.v , m_x  + localOrigin.h , 
-		m_y + m_height + localOrigin.v  , m_x + m_width + localOrigin.h} ;
-	ControlFontStyleRec		controlstyle ;
+    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() ;
+    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 + m_yMargin + kwxMacToolBarTopMargin, toolbarrect.left + x + m_xMargin + 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 )
-				{
-					if ( tool->GetBitmap1().GetMask() )
-					{
-						icon = MakePict( bmap->m_hBitmap , tool->GetBitmap1().GetMask()->GetMaskBitmap() ) ;
-					}
-					else
-					{
-						icon = MakePict( bmap->m_hBitmap , NULL ) ;
-					}
-				}
-			}
-			
-			ControlHandle m_macToolHandle ;
-			
-			SInt16 behaviour = kControlBehaviorOffsetContents ;
-			if ( tool->CanBeToggled() )
-				behaviour += kControlBehaviorToggles ;
-				
-			if ( icon )
-			{
-				m_macToolHandle = UMANewControl( window , &toolrect , "\p" , false , 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" , 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 ) ;
-			}
-			UMASetControlFontStyle( m_macToolHandle , &controlstyle ) ;
-			ControlHandle container = GetParent()->MacGetContainerForEmbedding() ;
-			wxASSERT_MSG( container != NULL , "No valid mac container control" ) ;
-			UMAEmbedControl( m_macToolHandle , container ) ;
-			
-			x += (int)toolSize.x;
-			noButtons ++;
-		}
-		else
-		{
-			m_macToolHandles.Add( NULL ) ;
-			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 )
+    while (node)
     {
-        // if not set yet, only one row
-        SetRows(1);
+        wxToolBarTool *tool = (wxToolBarTool *)node->Data();
+        wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().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 ;
+            wxMacCreateBitmapButton( &info , tool->GetNormalBitmap() ) ;
+            ControlHandle m_macToolHandle ;
+            
+            SInt16 behaviour = kControlBehaviorOffsetContents ;
+            if ( tool->CanBeToggled() )
+                behaviour += kControlBehaviorToggles ;
+            
+            if ( info.contentType != kControlNoContent ) 
+            {
+                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();
     }
-   	maxWidth = tw ; 
-    maxHeight += toolSize.y;
-  	maxHeight += m_yMargin + kwxMacToolBarTopMargin;
-  	m_maxHeight = maxHeight ;
-  }
-  else
-  {
-    if ( noButtons > 0 && m_maxRows == 0 )
+    
+    if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
     {
-        // if not set yet, have one column
-        SetRows(noButtons);
+        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 ;
     }
-    maxHeight = th ;
-    maxWidth += toolSize.x;
-  	maxWidth += m_xMargin + kwxMacToolBarLeftMargin;
-  	m_maxWidth = maxWidth ;
-  }
-
-  SetSize(maxWidth, maxHeight);
-
-  return TRUE;
+    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+2; m_defaultHeight = size.y+2;
+    m_defaultWidth = size.x+4; m_defaultHeight = size.y+4;
 }
 
 // The button size is bigger than the bitmap size
@@ -397,22 +325,22 @@ wxSize wxToolBar::GetToolSize() const
     return wxSize(m_defaultWidth + 4, m_defaultHeight + 4);
 }
 
-void wxToolBar::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+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( control ) ) ;
-    		}
-			OnLeftClick( tool->GetId() , tool -> IsToggled() ) ;
-			break ;
-		}
-	}
+    int index = 0 ;
+    for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
+    {
+        if ( m_macToolHandles[index] == (void*) control )
+        {
+            wxToolBarTool *tool = (wxToolBarTool *)m_tools.Nth( index )->Data();
+            if ( tool->CanBeToggled() )
+            {
+                tool->Toggle( GetControlValue( (ControlHandle) control ) ) ;
+            }
+            OnLeftClick( tool->GetId() , tool -> IsToggled() ) ;
+            break ;
+        }
+    }
 }
 
 void wxToolBar::SetRows(int nRows)
@@ -431,24 +359,29 @@ void wxToolBar::MacSuperChangedPosition()
   if (m_tools.Number() > 0)
   {
 
-	Point localOrigin ;
-	Rect clipRect ;
-	WindowRef window ;
-	wxWindow *win ;
-	
-	GetParent()->MacGetPortParams( &localOrigin , &clipRect , &window , &win ) ;
+    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 = { m_y + localOrigin.v , m_x  + localOrigin.h , 
-		m_y + m_height + localOrigin.v  , m_x + m_width + localOrigin.h} ;
-	ControlFontStyleRec		controlstyle ;
+    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() ;
+    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);
     
@@ -456,14 +389,11 @@ void wxToolBar::MacSuperChangedPosition()
     int maxHeight = 0 ;
     int toolcount = 0 ;
     {
-   		WindowRef rootwindow = GetMacRootWindow() ;
-   		wxWindow* wxrootwindow = wxFindWinFromMacWindow( rootwindow ) ;
-   		UMASetThemeWindowBackground( rootwindow , kThemeBrushDialogBackgroundActive , false ) ;
-   		wxMacDrawingHelper focus( wxrootwindow ) ;
+      WindowRef rootwindow = (WindowRef) MacGetRootWindow() ;
     	while (node)
     	{
     		wxToolBarTool *tool = (wxToolBarTool *)node->Data();
-    		wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetBitmap1().GetRefData()) ;
+    		wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().GetRefData()) ;
     		
     		if(  !tool->IsSeparator()  )
     		{
@@ -501,22 +431,15 @@ void wxToolBar::MacSuperChangedPosition()
     		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
-  		{
-  			UMASetThemeWindowBackground( rootwindow , kThemeBrushDocumentWindowBackground , false ) ;
-  		}
+                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 )
@@ -526,10 +449,10 @@ void wxToolBar::MacSuperChangedPosition()
            // if not set yet, only one row
            SetRows(1);
        }
-      	maxWidth = tw ; 
+        maxWidth = tw ; 
        maxHeight += toolSize.y;
-     	maxHeight += m_yMargin + kwxMacToolBarTopMargin;
-     	m_maxHeight = maxHeight ;
+        maxHeight += m_yMargin + kwxMacToolBarTopMargin;
+        m_maxHeight = maxHeight ;
      }
      else
      {
@@ -540,8 +463,8 @@ void wxToolBar::MacSuperChangedPosition()
        }
        maxHeight = th ;
        maxWidth += toolSize.x;
-     	maxWidth += m_xMargin + kwxMacToolBarLeftMargin;
-     	m_maxWidth = maxWidth ;
+        maxWidth += m_xMargin + kwxMacToolBarLeftMargin;
+        m_maxWidth = maxWidth ;
      }
 
      SetSize(maxWidth, maxHeight);
@@ -555,55 +478,61 @@ wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
     MacClientToRootWindow( &x , &y ) ;
     Point pt = { y ,x } ;
 
-	int index = 0 ;
-	for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
-	{
-		if ( m_macToolHandles[index] )
-		{
-			Rect bounds ;
-			GetControlBounds((ControlHandle) m_macToolHandles[index], &bounds ) ;
-			if ( PtInRect( pt , &bounds ) )
-			{
-				return  (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ;
-			}
-		}
-	}
+    int index = 0 ;
+    for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
+    {
+        if ( m_macToolHandles[index] )
+        {
+            Rect bounds ;
+            GetControlBounds((ControlHandle) m_macToolHandles[index], &bounds ) ;
+            if ( PtInRect( pt , &bounds ) )
+            {
+                return  (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ;
+            }
+        }
+    }
 
     return (wxToolBarToolBase *)NULL;
 }
 
 wxString wxToolBar::MacGetToolTipString( wxPoint &pt )
 {
-	wxToolBarToolBase* tool = FindToolForPosition( pt.x , pt.y ) ;
-	if ( tool )
-	{
-		return tool->GetShortHelp() ;
-	}
-	return "" ;
+    wxToolBarToolBase* tool = FindToolForPosition( pt.x , pt.y ) ;
+    if ( tool )
+    {
+        return tool->GetShortHelp() ;
+    }
+    return "" ;
 }
 
 void wxToolBar::DoEnableTool(wxToolBarToolBase *t, bool enable)
 {
-        wxToolBarTool *tool = (wxToolBarTool *)t;
-        if ( tool->m_index < 0 )
-        	return ;
-        	
-        ControlHandle control = (ControlHandle) m_macToolHandles[ tool->m_index ] ;
-
-		if ( enable )
-			UMAActivateControl( control ) ;
-		else
-			UMADeactivateControl( control ) ;
+    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)
 {
-       wxToolBarTool *tool = (wxToolBarTool *)t;
-        if ( tool->m_index < 0 )
-        	return ;
+    if (!IsShown())
+        return ;
+
+    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 ) ;
 }
 
 bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
@@ -624,64 +553,31 @@ void wxToolBar::DoSetToggle(wxToolBarToolBase *t, bool toggle)
 
 bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
 {
-		return TRUE ;
+        return TRUE ;
 }
 
 void wxToolBar::OnPaint(wxPaintEvent& event)
 {
-	Point localOrigin ;
-	Rect clipRect ;
-	WindowRef window ;
-	wxWindow *win ;
-	
-	GetParent()->MacGetPortParams( &localOrigin , &clipRect , &window , &win ) ;
-	if ( window && win )
+  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) ;
 	{
-		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 )
+		int index = 0 ;
+		for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
 		{
-			if( parent->MacGetWindowData() )
-			{
-				UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
-				break ;
-			}
-			
-			if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) ||  parent->IsKindOf( CLASSINFO( wxTabCtrl ) ))
+			if ( m_macToolHandles[index] )
 			{
-				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] ) ;
-				}
+				UMADrawControl( (ControlHandle) m_macToolHandles[index] ) ;
 			}
 		}
-		UMASetThemeWindowBackground( 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 )
 	{
 			
@@ -694,7 +590,7 @@ void  wxToolBar::OnMouse( wxMouseEvent &event )
 		Point		localwhere ;
 		GrafPtr		port ;
 		SInt16		controlpart ;
-		WindowRef	window = GetMacRootWindow() ;
+		WindowRef	window = (WindowRef) MacGetRootWindow() ;
 		
 		localwhere.h = x ;
 		localwhere.v = y ;
@@ -716,15 +612,15 @@ void  wxToolBar::OnMouse( wxMouseEvent &event )
 		if ( event.m_metaDown )
 			modifiers |= cmdKey ;
 	
-		controlpart = FindControl( localwhere , window , &control ) ;
+		controlpart = ::FindControl( localwhere , window , &control ) ;
 		{
-			if ( control && UMAIsControlActive( control ) )
+			if ( control && ::IsControlActive( control ) )
 			{
 				{
 					if ( controlpart == kControlIndicatorPart && !UMAHasAppearance() )
-						controlpart = UMAHandleControlClick( control , localwhere , modifiers , (ControlActionUPP) NULL ) ;
+						controlpart = ::HandleControlClick( control , localwhere , modifiers , (ControlActionUPP) NULL ) ;
 					else
-						controlpart = UMAHandleControlClick( control , localwhere , modifiers , (ControlActionUPP) -1 ) ;
+						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