applied patch for compilation with gcc 3.0

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

diff --git a/src/mac/toolbar.cpp b/src/mac/toolbar.cpp
index b103b560420a98c83325863ff707796370b0506a..df820b8cb904144ff294af1948f63dd600741069 100644 (file)
--- a/src/mac/toolbar.cpp
+++ b/src/mac/toolbar.cpp
@@ -79,8 +79,11 @@ private:
 // wxToolBarTool
 // ----------------------------------------------------------------------------
 
 // 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,
 
 wxToolBarToolBase *wxToolBar::CreateTool(int id,
                                          const wxBitmap& bitmap1,


@@ -103,17 +106,13 @@ void wxToolBar::Init()
 {
   m_maxWidth = -1;
   m_maxHeight = -1;
 {
   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)
 {
 }
 
 bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
             long style, const wxString& name)
 {

-
-  m_defaultWidth = defwidth;
-  m_defaultHeight = defheight;

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


@@ -128,39 +127,30 @@ bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
     x = 0;
   if (y < 0)
     y = 0;
     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;
 }
 
   return TRUE;
 }
 


@@ -254,9 +244,6 @@ PicHandle MakePict(GWorldPtr wp, GWorldPtr mask )
        return pict;                                            // return our groovy pict handle
 }
 
        return pict;                                            // return our groovy pict handle
 }
 

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

 bool wxToolBar::Realize()
 {
   if (m_tools.Number() == 0)
 bool wxToolBar::Realize()
 {
   if (m_tools.Number() == 0)


@@ -282,7 +269,10 @@ bool wxToolBar::Realize()
        wxSize toolSize = GetToolSize() ;
     int tw, th;
     GetSize(& tw, & th);
        wxSize toolSize = GetToolSize() ;
     int tw, th;
     GetSize(& tw, & th);

-    m_maxWidth = m_maxHeight = 0 ;
+    
+    int maxWidth = 0 ;
+    int maxHeight = 0 ;
+    

        while (node)
        {
                wxToolBarTool *tool = (wxToolBarTool *)node->Data();
        while (node)
        {
                wxToolBarTool *tool = (wxToolBarTool *)node->Data();


@@ -290,7 +280,7 @@ bool wxToolBar::Realize()
                
                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 ;
                        
                        toolrect.right = toolrect.left + toolSize.x ;
                        toolrect.bottom = toolrect.top + toolSize.y ;
                        


@@ -320,7 +310,7 @@ bool wxToolBar::Realize()
                                
                        if ( icon )
                        {
                                
                        if ( icon )
                        {

-                               m_macToolHandle = UMANewControl( window , &toolrect , "\p" , true , 0 , 
+                               m_macToolHandle = UMANewControl( window , &toolrect , "\p" , false , 0 , 

                                        behaviour + kControlContentPictHandle , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;
                                ControlButtonContentInfo info ;
                                
                                        behaviour + kControlContentPictHandle , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;
                                ControlButtonContentInfo info ;
                                


@@ -331,9 +321,10 @@ bool wxToolBar::Realize()
                        }
                        else
                        {
                        }
                        else
                        {

-                                               m_macToolHandle = UMANewControl( window , &toolrect , "\p" , true , 0 , 
+                                               m_macToolHandle = UMANewControl( window , &toolrect , "\p" , false , 0 , 

                                                behaviour  , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;
                        }
                                                behaviour  , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;
                        }

+                       UMAShowControl( m_macToolHandle ) ;

                        m_macToolHandles.Add( m_macToolHandle ) ;
                        tool->m_index = m_macToolHandles.Count() -1 ;
                        if ( !tool->IsEnabled() )
                        m_macToolHandles.Add( m_macToolHandle ) ;
                        tool->m_index = m_macToolHandles.Count() -1 ;
                        if ( !tool->IsEnabled() )


@@ -357,10 +348,10 @@ bool wxToolBar::Realize()
                        m_macToolHandles.Add( NULL ) ;
                        x += (int)toolSize.x / 4;
                }
                        m_macToolHandles.Add( NULL ) ;
                        x += (int)toolSize.x / 4;
                }

-           if ( toolbarrect.left + x + kwxMacToolBarLeftMargin - m_x - localOrigin.h > m_maxWidth)
-               m_maxWidth = toolbarrect.left + x + kwxMacToolBarLeftMargin - m_x - localOrigin.h;
-       if (toolbarrect.top + kwxMacToolBarTopMargin  - m_y - localOrigin.v > m_maxHeight)
-               m_maxHeight = toolbarrect.top + kwxMacToolBarTopMargin - m_y - localOrigin.v ;
+           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();
        }
 
                node = node->Next();
        }


@@ -372,11 +363,10 @@ bool wxToolBar::Realize()
         // if not set yet, only one row
         SetRows(1);
     }
         // if not set yet, only one row
         SetRows(1);
     }

-    m_maxWidth = clipRect.right - m_x ;
-       //m_maxWidth = tw ; // +=toolSize.x;
-       //m_maxWidth += m_xMargin ;
-    m_maxHeight += toolSize.y;
-       m_maxHeight += m_yMargin;
+       maxWidth = tw ; 
+    maxHeight += toolSize.y;
+       maxHeight += m_yMargin + kwxMacToolBarTopMargin;
+       m_maxHeight = maxHeight ;

   }
   else
   {
   }
   else
   {


@@ -385,20 +375,20 @@ bool wxToolBar::Realize()
         // if not set yet, have one column
         SetRows(noButtons);
     }
         // if not set yet, have one column
         SetRows(noButtons);
     }

-    m_maxHeight = clipRect.bottom - m_y ;
-    //m_maxHeight += m_yMargin ;
-    m_maxWidth += toolSize.x;
-       m_maxWidth += m_xMargin;
+    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)
 {
 
   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
 }
 
 // The button size is bigger than the bitmap size


@@ -436,6 +426,130 @@ 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 ) ;
+               UMASetThemeWindowBackground( 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
+               {
+                       UMASetThemeWindowBackground( 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 ) ;


@@ -546,20 +660,9 @@ void wxToolBar::OnPaint(wxPaintEvent& event)
                        
                        parent = parent->GetParent() ;
                } 
                        
                        parent = parent->GetParent() ;
                } 

-               int w = m_width ;
-               int h = m_height ;
-               
-               if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
-               {
-               w = clipRect.right - m_x ;
-               }
-               else
-               {
-               h = clipRect.bottom - m_y ;
-               }
-               
+

                Rect toolbarrect = { m_y + localOrigin.v , m_x + localOrigin.h , 
                Rect toolbarrect = { m_y + localOrigin.v , m_x + localOrigin.h , 

-                       m_y  + localOrigin.v + h , m_x + localOrigin.h + w } ;
+                       m_y  + localOrigin.v + m_height , m_x + localOrigin.h + m_width } ;

 
                UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
                {
 
                UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
                {


@@ -573,57 +676,9 @@ void wxToolBar::OnPaint(wxPaintEvent& event)
                        }
                }
                UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
                        }
                }
                UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;

-               wxDC::MacInvalidateSetup() ;

        }
        }

-       /*
-       WindowRef window = GetMacRootWindow() ;
-       if ( window )
-       {
-               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 )
-                       {
-                               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 } ;
-
-                       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 ) 
 {
                
 void  wxToolBar::OnMouse( wxMouseEvent &event ) 
 {
                


@@ -663,10 +718,6 @@ void  wxToolBar::OnMouse( wxMouseEvent &event )
        
                controlpart = FindControl( localwhere , window , &control ) ;
                {
        
                controlpart = FindControl( localwhere , window , &control ) ;
                {

-                       if ( AcceptsFocus() && FindFocus() != this )
-                       {
-                               SetFocus() ;
-                       }

                        if ( control && UMAIsControlActive( control ) )
                        {
                                {
                        if ( control && UMAIsControlActive( control ) )
                        {
                                {