X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1673e527f08395de6864b09540162ca409a3c28..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/mac/carbon/toolbar.cpp

diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp
index 867715e67d..168d343213 100644
--- a/src/mac/carbon/toolbar.cpp
+++ b/src/mac/carbon/toolbar.cpp
@@ -108,9 +108,8 @@ public:
                 DisposeControl( m_controlHandle );
             else
             {
-                // the embedded control is not under the responsibility of the tool, it will be disposed of in the
+                // the embedded control is not under the responsibility of the tool, it gets disposed of in the
                 // proper wxControl destructor
-                wxASSERT( IsValidControlHandle(GetControl()->GetPeer()->GetControlRef() )) ;
             }
             m_controlHandle = NULL ;
         }
@@ -411,7 +410,7 @@ void wxToolBarTool::SetPosition( const wxPoint& position )
 
         if ( mac_x != former_mac_x || mac_y != former_mac_y )
         {
-            UMAMoveControl( m_controlHandle, mac_x, mac_y );
+            ::MoveControl( m_controlHandle, mac_x, mac_y );
         }
     }
     else if ( IsControl() )
@@ -433,7 +432,7 @@ void wxToolBarTool::SetPosition( const wxPoint& position )
         int former_mac_y = contrlRect.top;
 
         if ( mac_x != former_mac_x || mac_y != former_mac_y )
-            UMAMoveControl( m_controlHandle, mac_x, mac_y );
+            ::MoveControl( m_controlHandle, mac_x, mac_y );
     }
 }
 
@@ -1543,7 +1542,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
 
 #if 0
                 SetBevelButtonTextPlacement( m_controlHandle, kControlBevelButtonPlaceBelowGraphic );
-                UMASetControlTitle( m_controlHandle, label, wxFont::GetDefaultEncoding() );
+                SetControlTitleWithCFString( m_controlHandle , wxMacCFStringHolder( label, wxFont::GetDefaultEncoding() );
 #endif
 
                 InstallControlEventHandler(
@@ -1593,7 +1592,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
             ControlRef container = (ControlRef) GetHandle();
             wxASSERT_MSG( container != NULL, wxT("No valid Mac container control") );
 
-            UMAShowControl( controlHandle );
+            SetControlVisibility( controlHandle, true, true );
             ::EmbedControl( controlHandle, container );
         }