merged 2 overloaded functions into a single membersections

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

diff --git a/src/mac/toolbar.cpp b/src/mac/toolbar.cpp
index 0ed2cc6b55202ed103124056a2a6c3997f4249a2..42dfe72bab829d4b0bd015bac5bcae495408138c 100644 (file)
--- a/src/mac/toolbar.cpp
+++ b/src/mac/toolbar.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        toolbar.cpp
 // Purpose:     wxToolBar
 /////////////////////////////////////////////////////////////////////////////
 // Name:        toolbar.cpp
 // Purpose:     wxToolBar

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHORy
+// Copyright:   (c) Stefan Csomory

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


@@ -107,65 +107,71 @@ wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
 
 void wxToolBar::Init()
 {
 
 void wxToolBar::Init()
 {

-  m_maxWidth = -1;
-  m_maxHeight = -1;
-  m_defaultWidth = kwxMacToolBarToolDefaultWidth;
-  m_defaultHeight = kwxMacToolBarToolDefaultHeight;
+    m_maxWidth = -1;
+    m_maxHeight = -1;
+    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)

-{
-  
-  int x = pos.x;
-  int y = pos.y;
-  int width = size.x;
-  int height = size.y;
-
-  if (width <= 0)
-    width = 100;
-  if (height <= 0)
-    height = 30;
-  if (x < 0)
-    x = 0;
-  if (y < 0)
-    y = 0;
-
-  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;
+{  
+    int x = pos.x;
+    int y = pos.y;
+    int width = size.x;
+    int height = size.y;
+    
+    if (width <= 0)
+        width = 100;
+    if (height <= 0)
+        height = 30;
+    if (x < 0)
+        x = 0;
+    if (y < 0)
+        y = 0;
+    
+    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()
 {
 }
 
 wxToolBar::~wxToolBar()
 {

+    size_t index = 0 ;
+    for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
+    {
+        // Delete the control as we get ghosts otherwise
+        ::DisposeControl( (ControlHandle) m_macToolHandles[index] );
+    }
+    

     // 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
 }
 
 bool wxToolBar::Realize()
 {
     // 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
 }
 
 bool wxToolBar::Realize()
 {

-    if (m_tools.Number() == 0)
+    if (m_tools.GetCount() == 0)

         return FALSE;
 
     Point localOrigin ;
         return FALSE;
 
     Point localOrigin ;


@@ -188,7 +194,7 @@ bool wxToolBar::Realize()
     controlstyle.flags = kControlUseFontMask ;
     controlstyle.font = kControlFontSmallSystemFont ;
     
     controlstyle.flags = kControlUseFontMask ;
     controlstyle.font = kControlFontSmallSystemFont ;
     

-    wxNode *node = m_tools.First();
+    wxToolBarToolsList::Node *node = m_tools.GetFirst();

     int noButtons = 0;
     int x = 0 ;
     int y = 0 ;
     int noButtons = 0;
     int x = 0 ;
     int y = 0 ;


@@ -201,7 +207,7 @@ bool wxToolBar::Realize()
     
     while (node)
     {
     
     while (node)
     {

-        wxToolBarTool *tool = (wxToolBarTool *)node->Data();
+        wxToolBarTool *tool = (wxToolBarTool *)node->GetData();

         
         if(  !tool->IsSeparator()  )
         {
         
         if(  !tool->IsSeparator()  )
         {


@@ -249,7 +255,7 @@ bool wxToolBar::Realize()
               ::SetControlFontStyle( m_macToolHandle , &controlstyle ) ;
             */
             ControlHandle container = (ControlHandle) GetParent()->MacGetContainerForEmbedding() ;
               ::SetControlFontStyle( m_macToolHandle , &controlstyle ) ;
             */
             ControlHandle container = (ControlHandle) GetParent()->MacGetContainerForEmbedding() ;

-            wxASSERT_MSG( container != NULL , "No valid mac container control" ) ;
+            wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;

             ::EmbedControl( m_macToolHandle , container ) ;
             
             if ( GetWindowStyleFlag() & wxTB_VERTICAL )
             ::EmbedControl( m_macToolHandle , container ) ;
             
             if ( GetWindowStyleFlag() & wxTB_VERTICAL )


@@ -281,7 +287,7 @@ bool wxToolBar::Realize()
         if (toolbarrect.top + y + m_yMargin + kwxMacToolBarTopMargin - m_y - localOrigin.v > maxHeight) {
             maxHeight = toolbarrect.top + y + m_yMargin + kwxMacToolBarTopMargin - m_y - localOrigin.v ;
         }
         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();
+        node = node->GetNext();

     }
     
     if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
     }
     
     if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )


@@ -332,7 +338,7 @@ void wxToolBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart )
     {
         if ( m_macToolHandles[index] == (void*) control )
         {
     {
         if ( m_macToolHandles[index] == (void*) control )
         {

-            wxToolBarTool *tool = (wxToolBarTool *)m_tools.Nth( index )->Data();
+            wxToolBarTool *tool = (wxToolBarTool *)m_tools.Item( index )->GetData();

             if ( tool->CanBeToggled() )
             {
                 tool->Toggle( GetControl32BitValue( (ControlHandle) control ) ) ;
             if ( tool->CanBeToggled() )
             {
                 tool->Toggle( GetControl32BitValue( (ControlHandle) control ) ) ;


@@ -356,119 +362,119 @@ void wxToolBar::SetRows(int nRows)
 
 void wxToolBar::MacSuperChangedPosition() 
 {
 
 void wxToolBar::MacSuperChangedPosition() 
 {

-  if (m_tools.Number() > 0)
-  {
-
-    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 = { 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() ;
-    int tw, th;
-    GetSize(& tw, & th);
-    
-    int maxWidth = 0 ;
-    int maxHeight = 0 ;
-    int toolcount = 0 ;
+    if (m_tools.GetCount() > 0)

     {
     {

-      WindowRef rootwindow = (WindowRef) MacGetRootWindow() ;
-        while (node)
+        
+        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 = { localOrigin.v ,localOrigin.h , 
+            m_height + localOrigin.v  , m_width + localOrigin.h} ;
+        ControlFontStyleRec     controlstyle ;
+        
+        controlstyle.flags = kControlUseFontMask ;
+        controlstyle.font = kControlFontSmallSystemFont ;
+        
+        wxToolBarToolsList::Node *node = m_tools.GetFirst();
+        int noButtons = 0;
+        int x = 0 ;
+        wxSize toolSize = GetToolSize() ;
+        int tw, th;
+        GetSize(& tw, & th);
+        
+        int maxWidth = 0 ;
+        int maxHeight = 0 ;
+        int toolcount = 0 ;

         {
         {

-            wxToolBarTool *tool = (wxToolBarTool *)node->Data();
-            
-            if(  !tool->IsSeparator()  )
+            WindowRef rootwindow = (WindowRef) MacGetRootWindow() ;
+            while (node)

             {
             {

-                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++] ;
+                wxToolBarTool *tool = (wxToolBarTool *)node->GetData();

                 
                 

+                if(  !tool->IsSeparator()  )

                 {
                 {

-                    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 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 ) ;
+                            {
+                                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 ;

                 
                 

-                x += (int)toolSize.x;
-                noButtons ++;
+                node = node->GetNext();

             }
             }

-            else
+        }
+        
+        if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
+        {
+            if ( m_maxRows == 0 )

             {
             {

-                toolcount++ ;
-                x += (int)toolSize.x / 4;
+                // if not set yet, only one row
+                SetRows(1);

             }
             }

-            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();
+            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);

     }
     }

-
-     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() ;
 }
 
     wxWindow::MacSuperChangedPosition() ;
 }
 


@@ -486,7 +492,7 @@ wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
             GetControlBounds((ControlHandle) m_macToolHandles[index], &bounds ) ;
             if ( PtInRect( pt , &bounds ) )
             {
             GetControlBounds((ControlHandle) m_macToolHandles[index], &bounds ) ;
             if ( PtInRect( pt , &bounds ) )
             {

-                return  (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ;
+                return  (wxToolBarTool*) (m_tools.Item( index )->GetData() ) ;

             }
         }
     }
             }
         }
     }


@@ -501,7 +507,7 @@ wxString wxToolBar::MacGetToolTipString( wxPoint &pt )
     {
         return tool->GetShortHelp() ;
     }
     {
         return tool->GetShortHelp() ;
     }

-    return "" ;
+    return wxEmptyString ;

 }
 
 void wxToolBar::DoEnableTool(wxToolBarToolBase *t, bool enable)
 }
 
 void wxToolBar::DoEnableTool(wxToolBarToolBase *t, bool enable)


@@ -557,9 +563,9 @@ bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *WXUNUSED(t
 
 void wxToolBar::OnPaint(wxPaintEvent& event)
 {
 
 void wxToolBar::OnPaint(wxPaintEvent& event)
 {

-  wxPaintDC dc(this) ;
-  wxMacPortSetter helper(&dc) ;
-  
+    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) ;
     Rect toolbarrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , 
         dc.YLOG2DEVMAC(m_height) , dc.XLOG2DEVMAC(m_width) } ;
     UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;