activate new xpm handler under Classic Mac OS after xpm handler fixes

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

diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp
index 9e69e73a60320e429879cf581052926858de5857..0fa951bdf2be487bb25c82ca1fa69134cf0a7278 100644 (file)
--- a/src/mac/carbon/toolbar.cpp
+++ b/src/mac/carbon/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,18 +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_maxWidth = m_maxHeight = 0;
-
-  m_defaultWidth = defwidth;
-  m_defaultHeight = defheight;

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


@@ -129,45 +127,36 @@ 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
-  return TRUE;
+  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()
 {

-    // 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 ) ;
 }
 
 PicHandle MakePict(GWorldPtr wp, GWorldPtr mask ) ;


@@ -254,9 +243,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)


@@ -267,7 +253,7 @@ bool wxToolBar::Realize()
        WindowRef window ;
        wxWindow *win ;
        
        WindowRef window ;
        wxWindow *win ;
        

-       MacGetPortParams( &localOrigin , &clipRect , &window , &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} ;
 
        Rect toolbarrect = { m_y + localOrigin.v , m_x  + localOrigin.h , 
                m_y + m_height + localOrigin.v  , m_x + m_width + localOrigin.h} ;


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

+    
+    int maxWidth = 0 ;
+    int maxHeight = 0 ;
+    

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


@@ -289,7 +279,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 ;
                        


@@ -356,28 +346,40 @@ 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_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 )
   {
 
                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
   {
   }
   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;
 }
 
   return TRUE;
 }


@@ -506,7 +508,7 @@ void wxToolBar::OnPaint(wxPaintEvent& event)
        WindowRef window ;
        wxWindow *win ;
        
        WindowRef window ;
        wxWindow *win ;
        

-       MacGetPortParams( &localOrigin , &clipRect , &window , &win ) ;
+       GetParent()->MacGetPortParams( &localOrigin , &clipRect , &window , &win ) ;

        if ( window && win )
        {
                wxMacDrawingHelper help( win ) ;
        if ( window && win )
        {
                wxMacDrawingHelper help( win ) ;


@@ -532,6 +534,7 @@ void wxToolBar::OnPaint(wxPaintEvent& event)
                        
                        parent = parent->GetParent() ;
                } 
                        
                        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 } ;
 
                Rect toolbarrect = { m_y + localOrigin.v , m_x + localOrigin.h , 
                        m_y  + localOrigin.v + m_height , m_x + localOrigin.h + m_width } ;
 


@@ -547,57 +550,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 ) 
 {
                


@@ -637,10 +592,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 ) )
                        {
                                {