X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/488b2c29c0cf468f96f148003b21952611325dbf..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/mac/carbon/toolbar.cpp

diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp
index 5f03590f8f..2f4ac0c6a3 100644
--- a/src/mac/carbon/toolbar.cpp
+++ b/src/mac/carbon/toolbar.cpp
@@ -23,20 +23,18 @@
 #include "wx/tabctrl.h"
 #include "wx/bitmap.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
     EVT_PAINT( wxToolBar::OnPaint ) 
 END_EVENT_TABLE()
-#endif
 
 #include "wx/mac/uma.h"
 #include "wx/geometry.h"
 
 #ifdef __WXMAC_OSX__
-const short kwxMacToolBarToolDefaultWidth = 24 ;
-const short kwxMacToolBarToolDefaultHeight = 24 ;
+const short kwxMacToolBarToolDefaultWidth = 16 ;
+const short kwxMacToolBarToolDefaultHeight = 16 ;
 const short kwxMacToolBarTopMargin = 4 ;
 const short kwxMacToolBarLeftMargin = 4 ;
 const short kwxMacToolBorder = 0 ;
@@ -85,6 +83,8 @@ public:
     void SetSize(const wxSize& size) ;
     void SetPosition( const wxPoint& position ) ;
     
+    void ClearControl() { m_control = NULL ; }
+    
     wxSize GetSize() const
     {
         if ( IsControl() )
@@ -168,7 +168,7 @@ static pascal OSStatus wxMacToolBarToolControlEventHandler( EventHandlerCallRef
                 
                 ControlPartCode pc = kControlNoPart ;
                 if ( CGRectContainsPoint( rect , pt ) )
-                    pc = kControlButtonPart ;
+                    pc = kControlIconPart ;
                 cEvent.SetParameter( kEventParamControlPart , typeControlPartCode, pc ) ;
                 result = noErr ;
             }
@@ -180,7 +180,7 @@ static pascal OSStatus wxMacToolBarToolControlEventHandler( EventHandlerCallRef
     return result ;
 }
 
-pascal OSStatus wxMacToolBarToolEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+static pascal OSStatus wxMacToolBarToolEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
     OSStatus result = eventNotHandledErr ;
 
@@ -339,64 +339,6 @@ wxToolBarTool::wxToolBarTool(wxToolBar *tbar,
                             clientData, shortHelp, longHelp)
 {
     Init();
-    
-    WindowRef window = (WindowRef) tbar->MacGetTopLevelWindowRef() ;    
-    wxSize toolSize = tbar->GetToolSize() ;    
-    Rect toolrect = { 0, 0 , toolSize.y , toolSize.x } ;
- 
-    if ( id == wxID_SEPARATOR )
-    {
-        toolSize.x /= 4 ;
-        toolSize.y /= 4 ;
-        if ( GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL )
-        {
-            toolrect.bottom = toolSize.y ;
-        }
-        else
-        {
-            toolrect.right = toolSize.x ;
-        }
-#ifdef __WXMAC_OSX__
-        // in flat style we need a visual separator
-        CreateSeparatorControl( window , &toolrect , &m_controlHandle ) ;
-#endif
-    }
-    else
-    {
-        ControlButtonContentInfo info ;
-        wxMacCreateBitmapButton( &info , GetNormalBitmap()  , kControlContentIconRef ) ;
-        
-#ifdef __WXMAC_OSX__
-        CreateIconControl( window , &toolrect , &info , false , &m_controlHandle ) ;
-#else        
-        SInt16 behaviour = kControlBehaviorOffsetContents ;
-        if ( CanBeToggled() )
-            behaviour += kControlBehaviorToggles ;
-        CreateBevelButtonControl( window , &toolrect , CFSTR("") , kControlBevelButtonNormalBevel , behaviour , &info , 
-            0 , 0 , 0 , &m_controlHandle ) ;
-#endif
-            
-        wxMacReleaseBitmapButton( &info ) ;
-        /*
-        SetBevelButtonTextPlacement( m_controlHandle , kControlBevelButtonPlaceBelowGraphic ) ;
-        UMASetControlTitle(  m_controlHandle , label , wxFont::GetDefaultEncoding() ) ;
-        */
-        
-        InstallControlEventHandler( (ControlRef) m_controlHandle, GetwxMacToolBarToolEventHandlerUPP(),
-            GetEventTypeCount(eventList), eventList, this,NULL);          
-
-    }
-    ControlRef container = (ControlRef) tbar->GetHandle() ;
-    wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
-    if ( m_controlHandle )
-    {
-        UMAShowControl( m_controlHandle ) ;
-        ::EmbedControl( m_controlHandle , container ) ;
-    }
-    if ( CanBeToggled() && IsToggled() )
-    {
-        UpdateToggleImage( true ) ;
-    }
 }
 
 
@@ -492,6 +434,21 @@ bool wxToolBar::Realize()
                     DoToggleTool(tool, true);
                 }
             }
+            else if (tool->IsToggled())
+            {
+                wxToolBarToolsList::compatibility_iterator nodePrev = node->GetPrevious();
+                while ( nodePrev )
+                {
+                    wxToolBarToolBase *tool = nodePrev->GetData();
+                    if ( !tool->IsButton() || (tool->GetKind() != wxITEM_RADIO) )
+                        break;
+                    if ( tool->Toggle(false) )
+                    {
+                        DoToggleTool(tool, false);
+                    }
+                    nodePrev = nodePrev->GetPrevious();
+                }
+            }
             isRadio = TRUE;
         }
         else
@@ -632,8 +589,85 @@ void wxToolBar::DoToggleTool(wxToolBarToolBase *t, bool toggle)
 }
 
 bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
-                             wxToolBarToolBase *tool)
+                             wxToolBarToolBase *toolBase)
 {
+    wxToolBarTool* tool = wx_static_cast( wxToolBarTool* , toolBase ) ;
+    
+    WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;    
+    wxSize toolSize = GetToolSize() ;    
+    Rect toolrect = { 0, 0 , toolSize.y , toolSize.x } ;
+    ControlRef controlHandle = NULL ;
+
+    switch( tool->GetStyle() )
+    {
+        case wxTOOL_STYLE_SEPARATOR :
+            {
+                wxASSERT( tool->GetControlHandle() == NULL ) ;
+                toolSize.x /= 4 ;
+                toolSize.y /= 4 ;
+                if ( GetWindowStyleFlag() & wxTB_VERTICAL )
+                {
+                    toolrect.bottom = toolSize.y ;
+                }
+                else
+                {
+                    toolrect.right = toolSize.x ;
+                }
+        #ifdef __WXMAC_OSX__
+                // in flat style we need a visual separator
+                CreateSeparatorControl( window , &toolrect , &controlHandle ) ;
+                tool->SetControlHandle( controlHandle ) ;
+        #endif
+            }
+            break ;
+        case wxTOOL_STYLE_BUTTON :
+            {
+                wxASSERT( tool->GetControlHandle() == NULL ) ;
+                ControlButtonContentInfo info ;
+                wxMacCreateBitmapButton( &info , tool->GetNormalBitmap()  , kControlContentIconRef ) ;
+                
+        #ifdef __WXMAC_OSX__
+                CreateIconControl( window , &toolrect , &info , false , &controlHandle ) ;
+        #else        
+                SInt16 behaviour = kControlBehaviorOffsetContents ;
+                if ( tool->CanBeToggled() )
+                    behaviour += kControlBehaviorToggles ;
+                CreateBevelButtonControl( window , &toolrect , CFSTR("") , kControlBevelButtonNormalBevel , behaviour , &info , 
+                    0 , 0 , 0 , &controlHandle ) ;
+        #endif
+                    
+                wxMacReleaseBitmapButton( &info ) ;
+                /*
+                SetBevelButtonTextPlacement( m_controlHandle , kControlBevelButtonPlaceBelowGraphic ) ;
+                UMASetControlTitle(  m_controlHandle , label , wxFont::GetDefaultEncoding() ) ;
+                */
+                
+                InstallControlEventHandler( (ControlRef) controlHandle, GetwxMacToolBarToolEventHandlerUPP(),
+                    GetEventTypeCount(eventList), eventList, tool,NULL);          
+
+                tool->SetControlHandle( controlHandle ) ;
+            }
+            break ;
+        case wxTOOL_STYLE_CONTROL :
+            wxASSERT( tool->GetControl() != NULL ) ;
+            // right now there's nothing to do here
+            break ;
+    }
+ 
+    if ( controlHandle )
+    {
+        ControlRef container = (ControlRef) GetHandle() ;
+        wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
+
+        UMAShowControl( controlHandle ) ;
+        ::EmbedControl( controlHandle , container ) ;
+    }
+
+    if ( tool->CanBeToggled() && tool->IsToggled() )
+    {
+        tool->UpdateToggleImage( true ) ;
+    }
+
     // nothing special to do here - we relayout in Realize() later
     tool->Attach(this);
     InvalidateBestSize();
@@ -646,8 +680,9 @@ void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(tog
     wxFAIL_MSG( _T("not implemented") );
 }
 
-bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool)
+bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolbase)
 {
+    wxToolBarTool* tool = wx_static_cast( wxToolBarTool* , toolbase ) ;
     wxToolBarToolsList::compatibility_iterator node;
     for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
     {
@@ -665,19 +700,21 @@ bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool)
 
     tool->Detach();
 
-    wxToolBarTool* tl = wx_static_cast( wxToolBarTool* , tool ) ;
     switch ( tool->GetStyle() )
     {
         case wxTOOL_STYLE_CONTROL:
-            tool->GetControl()->Destroy();
+            {
+                tool->GetControl()->Destroy();
+                tool->ClearControl() ; 
+            }
             break;
 
         case wxTOOL_STYLE_BUTTON:
         case wxTOOL_STYLE_SEPARATOR:
-            if ( tl->GetControlHandle() )
+            if ( tool->GetControlHandle() )
             {
-                DisposeControl( (ControlRef) tl->GetControlHandle() ) ;
-                tl->SetControlHandle( (ControlRef) NULL ) ;
+                DisposeControl( (ControlRef) tool->GetControlHandle() ) ;
+                tool->SetControlHandle( (ControlRef) NULL ) ;
             }
             break;
     }