X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12ed316d02733e7111a6967f6ae41e2c0ceaa57a..622be94c78deeae8490d9783c11a24c599ae1464:/src/mac/toolbar.cpp

diff --git a/src/mac/toolbar.cpp b/src/mac/toolbar.cpp
index 23dd7761b5..3c9b8da316 100644
--- a/src/mac/toolbar.cpp
+++ b/src/mac/toolbar.cpp
@@ -79,8 +79,11 @@ private:
 // wxToolBarTool
 // ----------------------------------------------------------------------------
 
-const short defwidth = 24 ;
-const short defheight = 22 ;
+const short kwxMacToolBarToolDefaultWidth = 24 ;
+const short kwxMacToolBarToolDefaultHeight = 22 ;
+const short kwxMacToolBarTopMargin = 2 ;
+const short kwxMacToolBarLeftMargin = 2 ;
+
 
 wxToolBarToolBase *wxToolBar::CreateTool(int id,
                                          const wxBitmap& bitmap1,
@@ -103,18 +106,13 @@ void wxToolBar::Init()
 {
   m_maxWidth = -1;
   m_maxHeight = -1;
-  m_defaultWidth = defwidth;
-  m_defaultHeight = defheight;
-  // 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 = defwidth;
-  m_defaultHeight = defheight;
   
   int x = pos.x;
   int y = pos.y;
@@ -129,45 +127,37 @@ bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
     x = 0;
   if (y < 0)
     y = 0;
-#if 1
-	{
-	  SetName(name);
-
-	  m_windowStyle = style;
-	  parent->AddChild(this);
-
-	  m_backgroundColour = parent->GetBackgroundColour() ;
-	  m_foregroundColour = parent->GetForegroundColour() ;
-
-	  if (id == -1)
-	      m_windowId = NewControlId();
-	  else
-	      m_windowId = id;
-
-		m_width = size.x ;
-		m_height = size.y ;
-		int x = pos.x ;
-		int y = pos.y ;
-		AdjustForParentClientOrigin(x, y, wxSIZE_USE_EXISTING);
-		m_x = x ;
-		m_y = y ;
-	}
-#else
-	Rect bounds ;
-	Str255 title ;
-	
-	MacPreControlCreate( parent , id ,  "" , wxPoint( x , y ) , wxSize( width , height ) ,style, wxDefaultValidator , name , &bounds , title ) ;
 
-	m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , "\p" , true , 0 , 0 , 1, 
-	  	kControlPlacardProc , (long) this ) ;
-	MacPostControlCreate() ;
-#endif
+  SetName(name);
+
+  m_windowStyle = style;
+  parent->AddChild(this);
+
+  m_backgroundColour = parent->GetBackgroundColour() ;
+  m_foregroundColour = parent->GetForegroundColour() ;
+
+  if (id == -1)
+      m_windowId = NewControlId();
+  else
+      m_windowId = id;
+
+  {
+	m_width = size.x ;
+	m_height = size.y ;
+	int x = pos.x ;
+	int y = pos.y ;
+	AdjustForParentClientOrigin(x, y, wxSIZE_USE_EXISTING);
+	m_x = x ;
+	m_y = y ;
+  }
+  
   return TRUE;
 }
 
 wxToolBar::~wxToolBar()
 {
-    // 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, GWorldPtr mask ) ;
@@ -254,17 +244,22 @@ PicHandle MakePict(GWorldPtr wp, GWorldPtr mask )
 	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 ;
 	
@@ -274,6 +269,10 @@ 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();
@@ -281,7 +280,7 @@ bool wxToolBar::Realize()
 		
 		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 ;
 			
@@ -348,35 +347,47 @@ 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;
 }
 
 void wxToolBar::SetToolBitmapSize(const wxSize& size)
 {
-    m_defaultWidth = size.x; m_defaultHeight = size.y;
+    m_defaultWidth = size.x+2; m_defaultHeight = size.y+2;
 }
 
 // The button size is bigger than the bitmap size
@@ -493,52 +504,56 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
 
 void wxToolBar::OnPaint(wxPaintEvent& event)
 {
-	WindowRef window = GetMacRootWindow() ;
-	if ( window )
+	Point localOrigin ;
+	Rect clipRect ;
+	WindowRef window ;
+	wxWindow *win ;
+	
+	GetParent()->MacGetPortParams( &localOrigin , &clipRect , &window , &win ) ;
+	if ( window && win )
 	{
-		wxWindow* win = wxFindWinFromMacWindow( window ) ;
-		if ( 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 )
 		{
-			wxMacDrawingHelper help( win ) ;
-			// the mac control manager always assumes to have the origin at 0,0
-			SetOrigin( 0 , 0 ) ;
+			if( parent->MacGetWindowData() )
+			{
+				UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
+				break ;
+			}
 			
-			bool			hasTabBehind = false ;
-			wxWindow* parent = GetParent() ;
-			while ( parent )
+			if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) ||  parent->IsKindOf( CLASSINFO( wxTabCtrl ) ))
 			{
-				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 , m_x , m_y + m_height , m_x + m_width } ;
+				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) ;
+		UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
+		{
+			int index = 0 ;
+			for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
 			{
-				int index = 0 ;
-				for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
+				if ( m_macToolHandles[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 ) ;
 		}
+		UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
 	}
 }
+
 void  wxToolBar::OnMouse( wxMouseEvent &event ) 
 {
 		
@@ -578,10 +593,6 @@ void  wxToolBar::OnMouse( wxMouseEvent &event )
 	
 		controlpart = FindControl( localwhere , window , &control ) ;
 		{
-			if ( AcceptsFocus() && FindFocus() != this )
-			{
-				SetFocus() ;
-			}
 			if ( control && UMAIsControlActive( control ) )
 			{
 				{