X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8208e181cb576ec6cda37624923f95a59af43072..947ea04d016852aa293291069d5c91ce4c6dde60:/src/mac/carbon/toolbar.cpp

diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp
index e4bd0aff79..738c7fcd91 100644
--- a/src/mac/carbon/toolbar.cpp
+++ b/src/mac/carbon/toolbar.cpp
@@ -5,8 +5,7 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Copyright:   (c) AUTHORy
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -18,11 +17,17 @@
 #if wxUSE_TOOLBAR
 
 #include "wx/toolbar.h"
+#include "wx/notebook.h"
+#include "wx/tabctrl.h"
 
+#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
+	EVT_MOUSE_EVENTS( wxToolBar::OnMouse ) 
+	EVT_PAINT( wxToolBar::OnPaint ) 
 END_EVENT_TABLE()
+#endif
 
 #include <wx/mac/uma.h>
 
@@ -45,14 +50,14 @@ public:
                             clientData, shortHelpString, longHelpString)
     {
         m_nSepCount = 0;
-        m_index = 0 ;
+        m_index = -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
@@ -74,6 +79,12 @@ private:
 // 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,
@@ -91,26 +102,17 @@ wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
     return new wxToolBarTool(this, control);
 }
 
-// ----------------------------------------------------------------------------
-// wxToolBar construction
-// ----------------------------------------------------------------------------
-
 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)
 {
-  m_maxWidth = m_maxHeight = 0;
-
-  m_defaultWidth = 24;
-  m_defaultHeight = 22;
   
   int x = pos.x;
   int y = pos.y;
@@ -126,24 +128,39 @@ bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
   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);
+
+  m_backgroundColour = parent->GetBackgroundColour() ;
+  m_foregroundColour = parent->GetForegroundColour() ;
+
+  if (id == -1)
+      m_windowId = NewControlId();
+  else
+      m_windowId = id;
+
+  {
+	m_width = size.x ;
+	m_height = size.y ;
+	int x = pos.x ;
+	int y = pos.y ;
+	AdjustForParentClientOrigin(x, y, wxSIZE_USE_EXISTING);
+	m_x = x ;
+	m_y = y ;
+  }
 
-  return TRUE;
 }
 
 wxToolBar::~wxToolBar()
 {
-    // TODO
+    // 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
 }
 
-PicHandle MakePict(GWorldPtr wp)
+PicHandle MakePict(GWorldPtr wp, GWorldPtr mask ) ;
+PicHandle MakePict(GWorldPtr wp, GWorldPtr mask ) 
 {
 	CGrafPtr		origPort ;
 	GDHandle		origDev ;
@@ -151,67 +168,97 @@ PicHandle MakePict(GWorldPtr wp)
 	PicHandle		pict;				// this is the Picture we give back
 
 	RGBColor		gray = { 0xCCCC ,0xCCCC , 0xCCCC } ;
+	RGBColor		white = { 0xffff ,0xffff , 0xffff } ;
+	RGBColor		black = { 0x0000 ,0x0000 , 0x0000 } ;
 	
-	GetGWorld( &origPort , &origDev ) ;
-	SetGWorld( wp , NULL ) ;
+	unsigned char *maskimage = NULL ;
+	Rect portRect ;
+	GetPortBounds( wp , &portRect ) ;
+	int width = portRect.right - portRect.left ;
+	int height = portRect.bottom - portRect.top ;
 	
-	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
-}
-
-PicHandle MakePictWhite(GWorldPtr wp)
-{
-	CGrafPtr		origPort ;
-	GDHandle		origDev ;
-	
-	PicHandle		pict;				// this is the Picture we give back
+	LockPixels( GetGWorldPixMap( wp ) ) ;
+	GetGWorld( &origPort , &origDev ) ;
 
-	RGBColor		white = { 0xFFFF ,0xFFFF  , 0xFFFF  } ;
+	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 ) ) ;
+	}
 	
-	GetGWorld( &origPort , &origDev ) ;
 	SetGWorld( wp , NULL ) ;
 	
-	pict = OpenPicture(&wp->portRect);	// open a picture, this disables drawing
+	pict = OpenPicture(&portRect);	// open a picture, this disables drawing
 	if(!pict)	
 		return NULL;
-	
+
+	RGBBackColor( &gray ) ;
+	RGBForeColor( &black ) ;
+	EraseRect(&portRect) ;
 	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 -
+
+	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
 }
 
-const short kwxMacToolBarTopMargin = 2 ;
-const short kwxMacToolBarLeftMargin = 2 ;
-
 bool wxToolBar::Realize()
 {
   if (m_tools.Number() == 0)
       return FALSE;
 
-	Rect toolbarrect = { m_y , m_x , m_y + m_height , m_x + m_width } ;
+	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 ;
-	WindowPtr				window = GetMacRootWindow() ;
+
 	controlstyle.flags = kControlUseFontMask ;
 	controlstyle.font = kControlFontSmallSystemFont ;
 	
@@ -221,14 +268,18 @@ bool wxToolBar::Realize()
 	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() )
+		if(  !tool->IsSeparator()  )
 		{
-			Rect toolrect = { toolbarrect.top + kwxMacToolBarTopMargin , toolbarrect.left + x + kwxMacToolBarLeftMargin , 0 , 0 } ;
+			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 ;
 			
@@ -239,12 +290,19 @@ bool wxToolBar::Realize()
 					icon = bmap->m_hPict ;
 				else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
 				{
-					icon = MakePict( bmap->m_hBitmap ) ;
+					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 ;
@@ -266,8 +324,19 @@ bool wxToolBar::Realize()
 						behaviour  , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;
 			}
 			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 ) ;
-			UMAEmbedControl( m_macToolHandle , m_macControl ) ;
+			ControlHandle container = GetParent()->MacGetContainerForEmbedding() ;
+			wxASSERT_MSG( container != NULL , "No valid mac container control" ) ;
+			UMAEmbedControl( m_macToolHandle , container ) ;
 			
 			x += (int)toolSize.x;
 			noButtons ++;
@@ -277,28 +346,40 @@ bool wxToolBar::Realize()
 			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 ;
+	    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 )
   {
-    m_maxWidth = tw ; // +=toolSize.x;
-    m_maxHeight += toolSize.y;
-  	m_maxHeight += m_yMargin;
+    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
   {
-    m_maxHeight = th ;// += toolSize.y;
-    m_maxWidth += toolSize.x;
-  	m_maxWidth += m_xMargin;
+    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(m_maxWidth, m_maxHeight);
+  SetSize(maxWidth, maxHeight);
 
   return TRUE;
 }
@@ -311,7 +392,7 @@ void wxToolBar::SetToolBitmapSize(const wxSize& size)
 // 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 ) 
@@ -321,7 +402,13 @@ void wxToolBar::MacHandleControlClick( ControlHandle control , SInt16 controlpar
 	{
 		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 ;
 		}
 	}
 }
@@ -340,43 +427,54 @@ void wxToolBar::SetRows(int nRows)
 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 )
 	{
-		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;
 }
 
+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;
+        if ( tool->m_index < 0 )
+        	return ;
+        	
         ControlHandle control = (ControlHandle) m_macToolHandles[ tool->m_index ] ;
-		if ( UMAHasAppearance() )
-		{
-			if ( enable )
-				::ActivateControl( control ) ;
-			else
-				::DeactivateControl( control ) ;
-		}
+
+		if ( enable )
+			UMAActivateControl( control ) ;
 		else
-		{
-			if ( enable )
-				::HiliteControl( control , 0 ) ;
-			else
-				::HiliteControl( control , 255 ) ;
-		}
+			UMADeactivateControl( control ) ;
 }
 
 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 ) ;
@@ -402,5 +500,117 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
 {
 		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() )
+			{
+				UMASetThemeWindowBackground( 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] ) ;
+				}
+			}
+		}
+		UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
+		wxDC::MacInvalidateSetup() ;
+	}
+}
+
+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 && UMAIsControlActive( control ) )
+			{
+				{
+					if ( controlpart == kControlIndicatorPart && !UMAHasAppearance() )
+						controlpart = UMAHandleControlClick( control , localwhere , modifiers , (ControlActionUPP) NULL ) ;
+					else
+						controlpart = UMAHandleControlClick( 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