src/mac/carbon/toolbar.cpp

   1 /////////////////////////////////////////////////////////////////////////////
   2 // Name:        toolbar.cpp
   3 // Purpose:     wxToolBar
   4 // Author:      Stefan Csomor
   5 // Modified by:
   6 // Created:     04/01/98
   7 // RCS-ID:      $Id$
   8 // Copyright:   (c) Stefan Csomor
   9 // Licence:     The wxWindows licence
  10 /////////////////////////////////////////////////////////////////////////////
  11
  12 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
  13 #pragma implementation "toolbar.h"
  14 #endif
  15
  16 #include "wx/wxprec.h"
  17
  18 #if wxUSE_TOOLBAR
  19
  20 #include "wx/wx.h"
  21 #include "wx/bitmap.h"
  22 #include "wx/toolbar.h"
  23
  24 IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
  25
  26 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
  27     EVT_PAINT( wxToolBar::OnPaint )
  28 END_EVENT_TABLE()
  29
  30 #include "wx/mac/uma.h"
  31 #include "wx/geometry.h"
  32
  33 #ifdef __WXMAC_OSX__
  34 const short kwxMacToolBarToolDefaultWidth = 16 ;
  35 const short kwxMacToolBarToolDefaultHeight = 16 ;
  36 const short kwxMacToolBarTopMargin = 4 ; // 1 ;      // used to be 4
  37 const short kwxMacToolBarLeftMargin =  4 ; //1 ;     // used to be 4
  38 const short kwxMacToolBorder = 0 ;                // used to be 0
  39 const short kwxMacToolSpacing = 6 ; // 2 ;               // used to be 6
  40 #else
  41 const short kwxMacToolBarToolDefaultWidth = 24 ;
  42 const short kwxMacToolBarToolDefaultHeight = 22 ;
  43 const short kwxMacToolBarTopMargin = 2 ;
  44 const short kwxMacToolBarLeftMargin = 2 ;
  45 const short kwxMacToolBorder = 4 ;
  46 const short kwxMacToolSpacing = 0 ;
  47 #endif
  48
  49 #pragma mark -
  50 #pragma mark Tool Implementation
  51
  52
  53 // ----------------------------------------------------------------------------
  54 // private classes
  55 // ----------------------------------------------------------------------------
  56
  57 // We have a dual implementation for each tool, ControlRef and HIToolbarItemRef
  58
  59 class wxToolBarTool : public wxToolBarToolBase
  60 {
  61 public:
  62     wxToolBarTool(wxToolBar *tbar,
  63                   int id,
  64                   const wxString& label,
  65                   const wxBitmap& bmpNormal,
  66                   const wxBitmap& bmpDisabled,
  67                   wxItemKind kind,
  68                   wxObject *clientData,
  69                   const wxString& shortHelp,
  70                   const wxString& longHelp) ;
  71
  72     wxToolBarTool(wxToolBar *tbar, wxControl *control)
  73         : wxToolBarToolBase(tbar, control)
  74     {
  75         Init() ;
  76         if (control != NULL)
  77             SetControlHandle( (ControlRef) control->GetHandle() ) ;
  78     }
  79
  80     ~wxToolBarTool()
  81     {
  82         ClearControl() ;
  83         if ( m_controlHandle )
  84             DisposeControl( m_controlHandle ) ;
  85 #if wxMAC_USE_NATIVE_TOOLBAR
  86         if ( m_toolbarItemRef )
  87             CFRelease( m_toolbarItemRef ) ;
  88 #endif
  89     }
  90
  91     WXWidget GetControlHandle()
  92     {
  93         return (WXWidget) m_controlHandle ;
  94     }
  95
  96     void SetControlHandle( ControlRef handle )
  97     {
  98         m_controlHandle = handle ;
  99     }
 100
 101     void SetPosition( const wxPoint& position ) ;
 102
 103     void ClearControl()
 104     {
 105         m_control = NULL ;
 106 #if wxMAC_USE_NATIVE_TOOLBAR
 107         m_toolbarItemRef = NULL ;
 108 #endif
 109     }
 110
 111     wxSize GetSize() const
 112     {
 113         if ( IsControl() )
 114         {
 115             return GetControl()->GetSize() ;
 116         }
 117         else if ( IsButton() )
 118         {
 119             return GetToolBar()->GetToolSize() ;
 120         }
 121         else
 122         {
 123             // separator size
 124             wxSize sz = GetToolBar()->GetToolSize() ;
 125             if ( GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL )
 126                 sz.y /= 4 ;
 127             else
 128                 sz.x /= 4 ;
 129             return sz ;
 130         }
 131     }
 132     wxPoint GetPosition() const
 133     {
 134         return wxPoint(m_x, m_y);
 135     }
 136     bool DoEnable( bool enable ) ;
 137
 138     void UpdateToggleImage( bool toggle ) ;
 139
 140 #if wxMAC_USE_NATIVE_TOOLBAR
 141     void SetToolbarItemRef( HIToolbarItemRef ref )
 142     {
 143         if ( m_controlHandle )
 144             HideControl( m_controlHandle ) ;
 145         if ( m_toolbarItemRef )
 146             CFRelease( m_toolbarItemRef ) ;
 147         m_toolbarItemRef = ref ;
 148         if ( m_toolbarItemRef )
 149         {
 150             HIToolbarItemSetHelpText(
 151                 m_toolbarItemRef, wxMacCFStringHolder( GetShortHelp() , GetToolBar()->GetFont().GetEncoding() ) ,
 152                 wxMacCFStringHolder( GetLongHelp() , GetToolBar()->GetFont().GetEncoding() ) ) ;
 153         }
 154     }
 155     HIToolbarItemRef GetToolbarItemRef() const
 156     {
 157         return m_toolbarItemRef ;
 158     }
 159 #endif
 160
 161 private :
 162     void Init()
 163     {
 164         m_controlHandle = NULL ;
 165 #if wxMAC_USE_NATIVE_TOOLBAR
 166         m_toolbarItemRef = NULL ;
 167 #endif
 168     }
 169     ControlRef m_controlHandle ;
 170 #if wxMAC_USE_NATIVE_TOOLBAR
 171     HIToolbarItemRef m_toolbarItemRef ;
 172 #endif
 173     wxCoord     m_x;
 174     wxCoord     m_y;
 175 };
 176
 177 static const EventTypeSpec eventList[] =
 178 {
 179         { kEventClassControl , kEventControlHit } ,
 180 #ifdef __WXMAC_OSX__
 181         { kEventClassControl , kEventControlHitTest } ,
 182 #endif
 183 } ;
 184
 185 static pascal OSStatus wxMacToolBarToolControlEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 186 {
 187     OSStatus result = eventNotHandledErr ;
 188
 189     wxMacCarbonEvent cEvent( event ) ;
 190
 191     ControlRef controlRef ;
 192
 193     cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ;
 194
 195     switch( GetEventKind( event ) )
 196     {
 197         case kEventControlHit :
 198             {
 199                 wxToolBarTool* tbartool = (wxToolBarTool*)data ;
 200                 wxToolBar   *tbar = tbartool != NULL ? ( wxToolBar * ) ( tbartool->GetToolBar() ) : NULL ;
 201                 if ((tbartool != NULL) && tbartool->CanBeToggled() )
 202                 {
 203                     bool    shouldToggle;
 204 #ifdef __WXMAC_OSX__
 205                     shouldToggle = !tbartool->IsToggled();
 206 #else
 207                     shouldToggle = ( GetControl32BitValue((ControlRef) tbartool->GetControlHandle()) != 0 );
 208 #endif
 209                     tbar->ToggleTool( tbartool->GetId(), shouldToggle );
 210                 }
 211                 if (tbartool != NULL)
 212                     tbar->OnLeftClick( tbartool->GetId(), tbartool->IsToggled() );
 213                 result = noErr;
 214             }
 215             break ;
 216
 217 #ifdef __WXMAC_OSX__
 218         case kEventControlHitTest :
 219             {
 220                 HIPoint pt = cEvent.GetParameter<HIPoint>(kEventParamMouseLocation) ;
 221                 HIRect rect ;
 222                 HIViewGetBounds( controlRef , &rect ) ;
 223
 224                 ControlPartCode pc = kControlNoPart ;
 225                 if ( CGRectContainsPoint( rect , pt ) )
 226                     pc = kControlIconPart ;
 227                 cEvent.SetParameter( kEventParamControlPart , typeControlPartCode, pc ) ;
 228                 result = noErr ;
 229             }
 230             break ;
 231 #endif
 232
 233         default :
 234             break ;
 235     }
 236     return result ;
 237 }
 238
 239 static pascal OSStatus wxMacToolBarToolEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 240 {
 241     OSStatus result = eventNotHandledErr ;
 242
 243     switch ( GetEventClass( event ) )
 244     {
 245         case kEventClassControl :
 246             result = wxMacToolBarToolControlEventHandler( handler, event, data ) ;
 247             break ;
 248
 249         default :
 250             break ;
 251     }
 252     return result ;
 253 }
 254
 255 DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacToolBarToolEventHandler )
 256
 257 #if wxMAC_USE_NATIVE_TOOLBAR
 258
 259 //
 260 // native toolbar
 261 //
 262
 263 static const EventTypeSpec toolBarEventList[] =
 264 {
 265         { kEventClassToolbarItem , kEventToolbarItemPerformAction } ,
 266 } ;
 267
 268 static pascal OSStatus wxMacToolBarCommandEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 269 {
 270     OSStatus result = eventNotHandledErr ;
 271
 272     switch( GetEventKind( event ) )
 273     {
 274         case kEventToolbarItemPerformAction :
 275             {
 276                 wxToolBarTool* tbartool = (wxToolBarTool*) data ;
 277                 if ( tbartool != NULL )
 278                 {
 279                     int         toolID = tbartool->GetId();
 280                     wxToolBar   *tbar = ( wxToolBar * ) ( tbartool->GetToolBar() );
 281                     if ( tbartool->CanBeToggled() )
 282                     {
 283                         tbar->ToggleTool(toolID, !tbartool->IsToggled() );
 284                     }
 285                     tbar->OnLeftClick( toolID , tbartool -> IsToggled() ) ;
 286                     result = noErr;
 287                 }
 288             }
 289             break ;
 290
 291         default :
 292             break ;
 293     }
 294     return result ;
 295 }
 296
 297 static pascal OSStatus wxMacToolBarEventHandler( EventHandlerCallRef handler, EventRef event, void *data )
 298 {
 299     OSStatus result = eventNotHandledErr ;
 300     switch( GetEventClass( event ) )
 301     {
 302         case kEventClassToolbarItem :
 303             result = wxMacToolBarCommandEventHandler( handler, event, data ) ;
 304             break ;
 305
 306         default :
 307             break ;
 308     }
 309     return result ;
 310 }
 311
 312 DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacToolBarEventHandler )
 313
 314 #endif
 315
 316 // ============================================================================
 317 // implementation
 318 // ============================================================================
 319
 320 // ----------------------------------------------------------------------------
 321 // wxToolBarTool
 322 // ----------------------------------------------------------------------------
 323
 324 bool wxToolBarTool::DoEnable(bool enable)
 325 {
 326     if ( IsControl() )
 327     {
 328         GetControl()->Enable( enable ) ;
 329     }
 330     else if ( IsButton() )
 331     {
 332 #if wxMAC_USE_NATIVE_TOOLBAR
 333         if ( m_toolbarItemRef )
 334             HIToolbarItemSetEnabled( m_toolbarItemRef , enable ) ;
 335 #endif
 336
 337         if ( m_controlHandle )
 338         {
 339 #if TARGET_API_MAC_OSX
 340             if ( enable )
 341                 EnableControl( m_controlHandle ) ;
 342             else
 343                 DisableControl( m_controlHandle ) ;
 344 #else
 345             if ( enable )
 346                 ActivateControl( m_controlHandle ) ;
 347             else
 348                 DeactivateControl( m_controlHandle ) ;
 349 #endif
 350         }
 351     }
 352     return true ;
 353 }
 354
 355 void wxToolBarTool::SetPosition(const wxPoint& position)
 356 {
 357     m_x = position.x;
 358     m_y = position.y;
 359
 360     int x , y ;
 361     x = y = 0 ;
 362     int mac_x = position.x ;
 363     int mac_y = position.y ;
 364
 365     if ( ! GetToolBar()->MacGetTopLevelWindow()->MacUsesCompositing() )
 366     {
 367         GetToolBar()->MacWindowToRootWindow( &x , &y ) ;
 368         mac_x += x;
 369         mac_y += y;
 370     }
 371
 372     if ( IsButton() )
 373     {
 374         Rect contrlRect ;
 375         GetControlBounds( m_controlHandle , &contrlRect ) ;
 376         int former_mac_x = contrlRect.left ;
 377         int former_mac_y = contrlRect.top ;
 378         GetToolBar()->GetToolSize() ;
 379
 380         if ( mac_x != former_mac_x || mac_y != former_mac_y )
 381         {
 382             UMAMoveControl( m_controlHandle , mac_x , mac_y ) ;
 383         }
 384     }
 385     else if ( IsControl() )
 386     {
 387         GetControl()->Move( position ) ;
 388     }
 389     else
 390     {
 391         // separator
 392 #ifdef __WXMAC_OSX__
 393         Rect contrlRect ;
 394         GetControlBounds( m_controlHandle , &contrlRect ) ;
 395         int former_mac_x = contrlRect.left ;
 396         int former_mac_y = contrlRect.top ;
 397
 398         if ( mac_x != former_mac_x || mac_y != former_mac_y )
 399         {
 400             UMAMoveControl( m_controlHandle , mac_x , mac_y ) ;
 401         }
 402 #endif
 403     }
 404 }
 405
 406 void wxToolBarTool::UpdateToggleImage( bool toggle )
 407 {
 408 #if wxMAC_USE_NATIVE_TOOLBAR
 409
 410 #if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4
 411 #define kHIToolbarItemSelected   (1 << 7)
 412 #endif
 413
 414     // FIXME: this should be a OSX v10.4 runtime check
 415     if (m_toolbarItemRef != NULL)
 416     {
 417         OptionBits addAttrs, removeAttrs;
 418         OSStatus result;
 419
 420         if (toggle)
 421         {
 422             addAttrs = kHIToolbarItemSelected;
 423             removeAttrs = kHIToolbarItemNoAttributes;
 424         }
 425         else
 426         {
 427             addAttrs = kHIToolbarItemNoAttributes;
 428             removeAttrs = kHIToolbarItemSelected;
 429         }
 430
 431         result = HIToolbarItemChangeAttributes( m_toolbarItemRef, addAttrs, removeAttrs );
 432     }
 433 #endif
 434
 435 #ifdef __WXMAC_OSX__
 436     if ( toggle )
 437     {
 438         int w = m_bmpNormal.GetWidth() ;
 439         int h = m_bmpNormal.GetHeight() ;
 440         wxBitmap bmp( w , h ) ;
 441         wxMemoryDC dc ;
 442         dc.SelectObject( bmp ) ;
 443         dc.SetPen( wxNullPen ) ;
 444         dc.SetBackground( *wxWHITE ) ;
 445         dc.DrawRectangle( 0 , 0 , w , h ) ;
 446         dc.DrawBitmap( m_bmpNormal , 0 , 0 , true) ;
 447         dc.SelectObject( wxNullBitmap ) ;
 448         ControlButtonContentInfo info ;
 449         wxMacCreateBitmapButton( &info , bmp ) ;
 450         SetControlData( m_controlHandle , 0, kControlIconContentTag, sizeof( info ),
 451                         (Ptr)&info );
 452         wxMacReleaseBitmapButton( &info ) ;
 453     }
 454     else
 455     {
 456         ControlButtonContentInfo info ;
 457         wxMacCreateBitmapButton( &info , m_bmpNormal ) ;
 458         SetControlData( m_controlHandle , 0, kControlIconContentTag, sizeof( info ),
 459                         (Ptr)&info );
 460         wxMacReleaseBitmapButton( &info ) ;
 461     }
 462
 463     IconTransformType transform = toggle ? kTransformSelected : kTransformNone ;
 464         SetControlData( m_controlHandle, 0, kControlIconTransformTag, sizeof( transform ),
 465                         (Ptr)&transform );
 466     HIViewSetNeedsDisplay( m_controlHandle , true ) ;
 467
 468 #else
 469     ::SetControl32BitValue( m_controlHandle , toggle ) ;
 470 #endif
 471 }
 472
 473 wxToolBarTool::wxToolBarTool(wxToolBar *tbar,
 474   int id,
 475   const wxString& label,
 476   const wxBitmap& bmpNormal,
 477   const wxBitmap& bmpDisabled,
 478   wxItemKind kind,
 479   wxObject *clientData,
 480   const wxString& shortHelp,
 481   const wxString& longHelp)
 482         : wxToolBarToolBase(tbar, id, label, bmpNormal, bmpDisabled, kind,
 483                             clientData, shortHelp, longHelp)
 484 {
 485     Init();
 486 }
 487
 488 #pragma mark -
 489 #pragma mark Toolbar Implementation
 490
 491 wxToolBarToolBase *wxToolBar::CreateTool(int id,
 492                                          const wxString& label,
 493                                          const wxBitmap& bmpNormal,
 494                                          const wxBitmap& bmpDisabled,
 495                                          wxItemKind kind,
 496                                          wxObject *clientData,
 497                                          const wxString& shortHelp,
 498                                          const wxString& longHelp)
 499 {
 500     return new wxToolBarTool(this, id, label, bmpNormal, bmpDisabled, kind,
 501                              clientData, shortHelp, longHelp);
 502 }
 503
 504 wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
 505 {
 506     return new wxToolBarTool(this, control);
 507 }
 508
 509 void wxToolBar::Init()
 510 {
 511     m_maxWidth = -1;
 512     m_maxHeight = -1;
 513     m_defaultWidth = kwxMacToolBarToolDefaultWidth;
 514     m_defaultHeight = kwxMacToolBarToolDefaultHeight;
 515 #if wxMAC_USE_NATIVE_TOOLBAR
 516     m_macHIToolbarRef = NULL ;
 517     m_macUsesNativeToolbar = false ;
 518 #endif
 519 }
 520
 521 // also for the toolbar we have the dual implementation:
 522 // only when MacInstallNativeToolbar is called is the native toolbar set as the window toolbar
 523 //
 524 bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
 525             long style, const wxString& name)
 526 {
 527     if ( !wxToolBarBase::Create( parent , id , pos , size , style ) )
 528         return false ;
 529
 530     OSStatus err = 0;
 531
 532 #if wxMAC_USE_NATIVE_TOOLBAR
 533     wxString labelStr;
 534     labelStr.Format(wxT("%xd"), (int)this);
 535     err = HIToolbarCreate( wxMacCFStringHolder(labelStr, wxFont::GetDefaultEncoding() ) , 0 ,
 536                     (HIToolbarRef*) &m_macHIToolbarRef  );
 537
 538     if (m_macHIToolbarRef != NULL)
 539     {
 540         HIToolbarDisplayMode mode = kHIToolbarDisplayModeDefault ;
 541         HIToolbarDisplaySize displaySize = kHIToolbarDisplaySizeSmall ;
 542
 543         if ( style & wxTB_NOICONS )
 544             mode = kHIToolbarDisplayModeLabelOnly ;
 545         else if ( style & wxTB_TEXT )
 546             mode = kHIToolbarDisplayModeIconAndLabel ;
 547         else
 548             mode = kHIToolbarDisplayModeIconOnly ;
 549
 550         HIToolbarSetDisplayMode( (HIToolbarRef) m_macHIToolbarRef , mode ) ;
 551         HIToolbarSetDisplaySize( (HIToolbarRef) m_macHIToolbarRef , displaySize ) ;
 552     }
 553 #endif
 554
 555     return (err == 0);
 556 }
 557
 558 wxToolBar::~wxToolBar()
 559 {
 560 #if wxMAC_USE_NATIVE_TOOLBAR
 561     if ( m_macHIToolbarRef )
 562     {
 563         // if this is the installed toolbar, then deinstall it
 564         if (m_macUsesNativeToolbar)
 565             MacInstallNativeToolbar( false );
 566
 567         CFRelease( (HIToolbarRef) m_macHIToolbarRef );
 568         m_macHIToolbarRef = NULL;
 569     }
 570 #endif
 571 }
 572
 573 bool wxToolBar::Show( bool show )
 574 {
 575     bool bResult;
 576     WindowRef tlw = MAC_WXHWND(MacGetTopLevelWindowRef());
 577
 578     bResult = (tlw != NULL);
 579     if (bResult)
 580     {
 581 #if wxMAC_USE_NATIVE_TOOLBAR
 582         bool ownToolbarInstalled = false;
 583         MacTopLevelHasNativeToolbar( &ownToolbarInstalled );
 584         if (ownToolbarInstalled)
 585         {
 586             bResult = (HIViewIsVisible( (HIViewRef)m_macHIToolbarRef ) != show);
 587             ShowHideWindowToolbar( tlw, show, false );
 588         }
 589         else
 590 #endif
 591             bResult = wxToolBarBase::Show( show );
 592     }
 593
 594     return bResult;
 595 }
 596
 597 bool wxToolBar::IsShown() const
 598 {
 599     bool bResult;
 600
 601 #if wxMAC_USE_NATIVE_TOOLBAR
 602     bool ownToolbarInstalled ;
 603     MacTopLevelHasNativeToolbar( &ownToolbarInstalled );
 604     if (ownToolbarInstalled)
 605         bResult = HIViewIsVisible( (HIViewRef)m_macHIToolbarRef );
 606     else
 607 #endif
 608         bResult = wxToolBarBase::IsShown();
 609
 610     return bResult;
 611 }
 612
 613 void wxToolBar::DoGetSize( int *width, int *height ) const
 614 {
 615 #if wxMAC_USE_NATIVE_TOOLBAR
 616     Rect    boundsR;
 617     bool    ownToolbarInstalled;
 618
 619     MacTopLevelHasNativeToolbar( &ownToolbarInstalled );
 620     if ( ownToolbarInstalled )
 621     {
 622         // TODO is this really a control ?
 623         GetControlBounds( (ControlRef) m_macHIToolbarRef, &boundsR );
 624         if ( width != NULL )
 625             *width = boundsR.right - boundsR.left;
 626         if ( height != NULL )
 627             *height = boundsR.bottom - boundsR.top;
 628     }
 629     else
 630 #endif
 631         wxToolBarBase::DoGetSize( width, height );
 632 }
 633
 634 void wxToolBar::SetWindowStyleFlag( long style )
 635 {
 636     wxToolBarBase::SetWindowStyleFlag( style );
 637 #if wxMAC_USE_NATIVE_TOOLBAR
 638     if (m_macHIToolbarRef != NULL)
 639     {
 640         HIToolbarDisplayMode mode = kHIToolbarDisplayModeDefault;
 641
 642         if ( style & wxTB_NOICONS )
 643             mode = kHIToolbarDisplayModeLabelOnly;
 644         else if ( style & wxTB_TEXT )
 645             mode = kHIToolbarDisplayModeIconAndLabel;
 646         else
 647             mode = kHIToolbarDisplayModeIconOnly;
 648
 649        HIToolbarSetDisplayMode( (HIToolbarRef) m_macHIToolbarRef, mode );
 650     }
 651 #endif
 652 }
 653
 654 #if wxMAC_USE_NATIVE_TOOLBAR
 655 bool wxToolBar::MacWantsNativeToolbar()
 656 {
 657     return m_macUsesNativeToolbar;
 658 }
 659
 660 bool wxToolBar::MacTopLevelHasNativeToolbar(bool *ownToolbarInstalled) const
 661 {
 662     bool bResultV = false;
 663
 664     if (ownToolbarInstalled != NULL)
 665         *ownToolbarInstalled = false;
 666
 667     WindowRef tlw = MAC_WXHWND(MacGetTopLevelWindowRef());
 668     if (tlw != NULL)
 669     {
 670         HIToolbarRef curToolbarRef = NULL;
 671         OSStatus err = GetWindowToolbar( tlw, &curToolbarRef );
 672         bResultV = ((err == 0) && (curToolbarRef != NULL));
 673         if (bResultV && (ownToolbarInstalled != NULL))
 674             *ownToolbarInstalled = (curToolbarRef == m_macHIToolbarRef);
 675     }
 676
 677     return bResultV;
 678 }
 679
 680 bool wxToolBar::MacInstallNativeToolbar(bool usesNative)
 681 {
 682     bool        bResult = false;
 683
 684     WindowRef tlw = MAC_WXHWND(MacGetTopLevelWindowRef());
 685     if (tlw == NULL)
 686         return bResult;
 687
 688     if (usesNative && (m_macHIToolbarRef == NULL))
 689         return bResult;
 690
 691     if (usesNative && ((GetWindowStyleFlag() & wxTB_VERTICAL) != 0))
 692         return bResult;
 693
 694     // check the existing toolbar
 695     HIToolbarRef curToolbarRef = NULL;
 696     OSStatus err = GetWindowToolbar( tlw, &curToolbarRef );
 697     if (err != 0)
 698         curToolbarRef = NULL;
 699
 700     m_macUsesNativeToolbar = usesNative;
 701
 702     if (m_macUsesNativeToolbar)
 703     {
 704         // only install toolbar if there isn't one installed already
 705         if (curToolbarRef == NULL)
 706         {
 707             bResult = true;
 708
 709             SetWindowToolbar( tlw, (HIToolbarRef) m_macHIToolbarRef );
 710             ShowHideWindowToolbar( tlw, true, false );
 711             ChangeWindowAttributes( tlw, kWindowToolbarButtonAttribute, 0 );
 712             SetAutomaticControlDragTrackingEnabledForWindow( tlw, true );
 713
 714             // FIXME: which is best, which is necessary?
 715             //
 716             // m_peer->SetVisibility( false, true );
 717             //
 718             //
 719             Rect r = { 0 , 0 , 0 , 0 };
 720             //
 721             //
 722             m_peer->SetRect( &r );
 723             //
 724             // FIXME: which is best, which is necessary?
 725             //
 726             SetSize( wxSIZE_AUTO_WIDTH, 0 );
 727             //
 728             m_peer->SetVisibility( false, true );
 729             wxToolBarBase::Show( false );
 730         }
 731     }
 732     else
 733     {
 734         // only deinstall toolbar if this is the installed one
 735         if (m_macHIToolbarRef == curToolbarRef)
 736         {
 737             bResult = true;
 738
 739             ShowHideWindowToolbar( tlw, false, false );
 740             ChangeWindowAttributes( tlw, 0 , kWindowToolbarButtonAttribute );
 741             SetWindowToolbar( tlw, NULL );
 742
 743             // FIXME: which is best, which is necessary?
 744             m_peer->SetVisibility( true, true );
 745
 746             //
 747             // wxToolBarBase::Show( true );
 748             //
 749         }
 750     }
 751
 752     if (bResult)
 753         InvalidateBestSize();
 754
 755 // wxLogDebug( wxT("    --> [%lx] - result [%s]"), (long)this, bResult ? wxT("T") : wxT("F") );
 756     return bResult;
 757 }
 758 #endif
 759
 760 bool wxToolBar::Realize()
 761 {
 762     if (m_tools.GetCount() == 0)
 763         return false;
 764
 765     int x = m_xMargin + kwxMacToolBarLeftMargin;
 766     int y = m_yMargin + kwxMacToolBarTopMargin;
 767
 768     int tw, th;
 769     GetSize( &tw, &th );
 770
 771     int maxWidth = 0;
 772     int maxHeight = 0;
 773
 774     int maxToolWidth = 0;
 775     int maxToolHeight = 0;
 776
 777     // find the maximum tool width and height
 778     wxToolBarToolsList::compatibility_iterator  node = m_tools.GetFirst();
 779     while ( node != NULL )
 780     {
 781         wxToolBarTool   *tool = (wxToolBarTool *) node->GetData();
 782
 783         if ( tool != NULL )
 784         {
 785             wxSize  sz = tool->GetSize();
 786
 787             if ( sz.x > maxToolWidth )
 788                 maxToolWidth = sz.x;
 789             if ( sz.y > maxToolHeight )
 790                 maxToolHeight = sz.y;
 791         }
 792
 793         node = node->GetNext();
 794     }
 795
 796     bool    lastIsRadio = false;
 797     bool    curIsRadio = false;
 798     bool    setChoiceInGroup = false;
 799
 800     node = m_tools.GetFirst();
 801     while ( node != NULL )
 802     {
 803         wxToolBarTool   *tool = (wxToolBarTool *) node->GetData();
 804
 805         if ( tool == NULL )
 806         {
 807             node = node->GetNext();
 808             continue;
 809         }
 810
 811         // set tool position
 812         // for the moment just perform a single row/column alignment
 813         wxSize  cursize = tool->GetSize();
 814         if ( x + cursize.x > maxWidth )
 815             maxWidth = x + cursize.x;
 816         if ( y + cursize.y > maxHeight )
 817             maxHeight = y + cursize.y;
 818
 819         if ( GetWindowStyleFlag() & wxTB_VERTICAL )
 820         {
 821             int x1 = x + ( maxToolWidth - cursize.x ) / 2;
 822             tool->SetPosition( wxPoint(x1, y) );
 823         }
 824         else
 825         {
 826             int y1 = y + ( maxToolHeight - cursize.y ) / 2;
 827             tool->SetPosition( wxPoint(x, y1) );
 828         }
 829
 830         // update the item positioning state
 831         if ( GetWindowStyleFlag() & wxTB_VERTICAL )
 832             y += cursize.y + kwxMacToolSpacing;
 833         else
 834             x += cursize.x + kwxMacToolSpacing;
 835
 836 #if wxMAC_USE_NATIVE_TOOLBAR
 837         // install in native HIToolbar
 838         if ( m_macHIToolbarRef != NULL )
 839         {
 840             HIToolbarItemRef    hiItemRef = tool->GetToolbarItemRef();
 841             if ( hiItemRef != NULL )
 842             {
 843                 OSStatus    result = HIToolbarAppendItem( (HIToolbarRef) m_macHIToolbarRef, hiItemRef );
 844                 if ( result == 0 )
 845                 {
 846                     InstallEventHandler( HIObjectGetEventTarget(hiItemRef), GetwxMacToolBarEventHandlerUPP(),
 847                                          GetEventTypeCount(toolBarEventList), toolBarEventList, tool, NULL );
 848                 }
 849             }
 850         }
 851 #endif
 852
 853         // update radio button (and group) state
 854         lastIsRadio = curIsRadio;
 855         curIsRadio = ( tool->IsButton() && (tool->GetKind() == wxITEM_RADIO) );
 856
 857         if ( !curIsRadio )
 858         {
 859             if ( tool->IsToggled() )
 860                 DoToggleTool( tool, true );
 861
 862             setChoiceInGroup = false;
 863         }
 864         else
 865         {
 866             if ( !lastIsRadio )
 867             {
 868                 if ( tool->Toggle(true) )
 869                 {
 870                     DoToggleTool( tool, true );
 871                     setChoiceInGroup = true;
 872                 }
 873             }
 874             else if ( tool->IsToggled() )
 875             {
 876                 if ( tool->IsToggled() )
 877                     DoToggleTool( tool, true );
 878
 879                 wxToolBarToolsList::compatibility_iterator  nodePrev = node->GetPrevious();
 880                 while ( nodePrev != NULL )
 881                 {
 882                     wxToolBarToolBase   *toggleTool = nodePrev->GetData();
 883                     if ( (toggleTool == NULL) || !toggleTool->IsButton() || (toggleTool->GetKind() != wxITEM_RADIO) )
 884                         break;
 885
 886                     if ( toggleTool->Toggle(false) )
 887                         DoToggleTool( toggleTool, false );
 888
 889                     nodePrev = nodePrev->GetPrevious();
 890                 }
 891             }
 892         }
 893
 894         node = node->GetNext();
 895     }
 896
 897     if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
 898     {
 899         // if not set yet, only one row
 900         if ( m_maxRows <= 0 )
 901             SetRows( 1 );
 902
 903         m_minWidth = maxWidth;
 904         maxWidth = tw;
 905         maxHeight += m_yMargin + kwxMacToolBarTopMargin;
 906         m_minHeight = m_maxHeight = maxHeight;
 907     }
 908     else
 909     {
 910         // if not set yet, have one column
 911         if ( (GetToolsCount() > 0) && (m_maxRows <= 0) )
 912             SetRows( GetToolsCount() );
 913
 914         m_minHeight = maxHeight;
 915         maxHeight = th;
 916         maxWidth += m_xMargin + kwxMacToolBarLeftMargin;
 917         m_minWidth = m_maxWidth = maxWidth;
 918     }
 919
 920 #if 0
 921     // FIXME: should this be OSX-only?
 922     {
 923         bool wantNativeToolbar, ownToolbarInstalled;
 924
 925         // attempt to install the native toolbar
 926         wantNativeToolbar = ((GetWindowStyleFlag() & wxTB_VERTICAL) == 0);
 927         MacInstallNativeToolbar( wantNativeToolbar );
 928         (void)MacTopLevelHasNativeToolbar( &ownToolbarInstalled );
 929         if (!ownToolbarInstalled)
 930         {
 931            SetSize( maxWidth, maxHeight );
 932            InvalidateBestSize();
 933         }
 934     }
 935 #else
 936     SetSize( maxWidth, maxHeight );
 937     InvalidateBestSize();
 938 #endif
 939     return true;
 940 }
 941
 942 void wxToolBar::SetToolBitmapSize(const wxSize& size)
 943 {
 944     m_defaultWidth = size.x + kwxMacToolBorder;
 945     m_defaultHeight = size.y + kwxMacToolBorder;
 946
 947 #if wxMAC_USE_NATIVE_TOOLBAR
 948     if (m_macHIToolbarRef != NULL)
 949     {
 950         int maxs = wxMax( size.x, size.y );
 951         HIToolbarDisplaySize sizeSpec ;
 952         if ( maxs > 32 )
 953             sizeSpec = kHIToolbarDisplaySizeNormal ;
 954         else if ( maxs > 24 )
 955             sizeSpec = kHIToolbarDisplaySizeDefault ;
 956         else
 957             sizeSpec = kHIToolbarDisplaySizeSmall ;
 958
 959         HIToolbarSetDisplaySize( (HIToolbarRef) m_macHIToolbarRef, sizeSpec );
 960     }
 961 #endif
 962 }
 963
 964 // The button size is bigger than the bitmap size
 965 wxSize wxToolBar::GetToolSize() const
 966 {
 967     return wxSize(m_defaultWidth + kwxMacToolBorder, m_defaultHeight + kwxMacToolBorder);
 968 }
 969
 970 void wxToolBar::SetRows(int nRows)
 971 {
 972     // avoid resizing the frame uselessly
 973     if ( nRows != m_maxRows )
 974     {
 975         m_maxRows = nRows;
 976     }
 977 }
 978
 979 void wxToolBar::MacSuperChangedPosition()
 980 {
 981     wxWindow::MacSuperChangedPosition();
 982 #if wxMAC_USE_NATIVE_TOOLBAR
 983     if (! m_macUsesNativeToolbar )
 984 #endif
 985     {
 986         Realize();
 987     }
 988 }
 989
 990 wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
 991 {
 992     wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
 993     while ( node != NULL )
 994     {
 995         wxToolBarTool *tool = (wxToolBarTool *)node->GetData() ;
 996
 997         if (tool != NULL)
 998         {
 999             wxRect2DInt r( tool->GetPosition(), tool->GetSize() );
1000             if ( r.Contains( wxPoint( x, y ) ) )
1001                 return tool;
1002         }
1003
1004         node = node->GetNext();
1005     }
1006
1007     return (wxToolBarToolBase *)NULL;
1008 }
1009
1010 wxString wxToolBar::MacGetToolTipString( wxPoint &pt )
1011 {
1012     wxToolBarToolBase* tool = FindToolForPosition( pt.x , pt.y ) ;
1013     if ( tool != NULL )
1014         return tool->GetShortHelp() ;
1015
1016     return wxEmptyString ;
1017 }
1018
1019 void wxToolBar::DoEnableTool(wxToolBarToolBase *t, bool enable)
1020 {
1021     if ( t != NULL )
1022         ((wxToolBarTool*)t)->DoEnable( enable ) ;
1023 }
1024
1025 void wxToolBar::DoToggleTool(wxToolBarToolBase *t, bool toggle)
1026 {
1027     wxToolBarTool *tool = (wxToolBarTool *)t;
1028     if ( ( tool != NULL ) && tool->IsButton() )
1029         tool->UpdateToggleImage( toggle );
1030 }
1031
1032 bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
1033                              wxToolBarToolBase *toolBase)
1034 {
1035     wxToolBarTool* tool = wx_static_cast( wxToolBarTool* , toolBase );
1036     if (tool == NULL)
1037         return false;
1038
1039     WindowRef window = (WindowRef) MacGetTopLevelWindowRef();
1040     wxSize toolSize = GetToolSize();
1041     Rect toolrect = { 0, 0 , toolSize.y , toolSize.x };
1042     ControlRef controlHandle = NULL;
1043     OSStatus err = 0;
1044
1045     switch (tool->GetStyle())
1046     {
1047         case wxTOOL_STYLE_SEPARATOR :
1048             {
1049                 wxASSERT( tool->GetControlHandle() == NULL );
1050                 toolSize.x /= 4;
1051                 toolSize.y /= 4;
1052                 if ( GetWindowStyleFlag() & wxTB_VERTICAL )
1053                     toolrect.bottom = toolSize.y;
1054                 else
1055                     toolrect.right = toolSize.x;
1056
1057         #ifdef __WXMAC_OSX__
1058                 // in flat style we need a visual separator
1059                 #if wxMAC_USE_NATIVE_TOOLBAR
1060                 HIToolbarItemRef item;
1061                 err = HIToolbarItemCreate( kHIToolbarSeparatorIdentifier, kHIToolbarItemCantBeRemoved | kHIToolbarItemIsSeparator | kHIToolbarItemAllowDuplicates, &item );
1062                 if (err == noErr)
1063                     tool->SetToolbarItemRef( item );
1064                 #endif
1065                 CreateSeparatorControl( window, &toolrect, &controlHandle );
1066                 tool->SetControlHandle( controlHandle );
1067         #endif
1068             }
1069             break;
1070
1071         case wxTOOL_STYLE_BUTTON :
1072             {
1073                 wxASSERT( tool->GetControlHandle() == NULL ) ;
1074                 ControlButtonContentInfo info ;
1075                 wxMacCreateBitmapButton( &info , tool->GetNormalBitmap()  , kControlContentIconRef ) ;
1076
1077                         if ( UMAGetSystemVersion() >= 0x1000)
1078                         CreateIconControl( window , &toolrect , &info , false , &controlHandle ) ;
1079                         else
1080                         {
1081                                 SInt16 behaviour = kControlBehaviorOffsetContents ;
1082                                 if ( tool->CanBeToggled() )
1083                                     behaviour += kControlBehaviorToggles ;
1084                                 CreateBevelButtonControl( window , &toolrect , CFSTR("") , kControlBevelButtonNormalBevel , behaviour , &info ,
1085                                     0 , 0 , 0 , &controlHandle ) ;
1086                         }
1087
1088 #if wxMAC_USE_NATIVE_TOOLBAR
1089                 HIToolbarItemRef item ;
1090                 wxString        labelStr;
1091                 labelStr.Format(wxT("%xd"), (int)tool);
1092                 err = HIToolbarItemCreate(
1093                     wxMacCFStringHolder(labelStr, wxFont::GetDefaultEncoding()),
1094                     kHIToolbarItemCantBeRemoved | kHIToolbarItemAnchoredLeft | kHIToolbarItemAllowDuplicates, &item );
1095                 if (err  == noErr)
1096                 {
1097                     HIToolbarItemSetLabel( item, wxMacCFStringHolder(tool->GetLabel(), m_font.GetEncoding()) );
1098                     HIToolbarItemSetIconRef( item, info.u.iconRef );
1099                     HIToolbarItemSetCommandID( item, tool->GetId() );
1100                     tool->SetToolbarItemRef( item );
1101                 }
1102 #endif
1103
1104                 wxMacReleaseBitmapButton( &info ) ;
1105                 /*
1106                 SetBevelButtonTextPlacement( m_controlHandle , kControlBevelButtonPlaceBelowGraphic ) ;
1107                 UMASetControlTitle(  m_controlHandle , label , wxFont::GetDefaultEncoding() ) ;
1108                 */
1109
1110                 InstallControlEventHandler( (ControlRef) controlHandle, GetwxMacToolBarToolEventHandlerUPP(),
1111                     GetEventTypeCount(eventList), eventList, tool, NULL );
1112
1113                 tool->SetControlHandle( controlHandle );
1114             }
1115             break;
1116
1117         case wxTOOL_STYLE_CONTROL :
1118             wxASSERT( tool->GetControl() != NULL );
1119 #if 0 // wxMAC_USE_NATIVE_TOOLBAR
1120             // FIXME: doesn't work yet...
1121             {
1122                 HIToolbarItemRef    item;
1123                 wxString            labelStr;
1124                 labelStr.Format( wxT("%xd"), (int) tool );
1125                 result = HIToolbarItemCreate( wxMacCFStringHolder(labelStr, wxFont::GetDefaultEncoding()),
1126                                               kHIToolbarItemCantBeRemoved | kHIToolbarItemAnchoredLeft | kHIToolbarItemAllowDuplicates,
1127                                               &item );
1128                 if ( result == 0 )
1129                 {
1130                     HIToolbarItemSetLabel( item, wxMacCFStringHolder(tool->GetLabel(), m_font.GetEncoding()) );
1131                     HIToolbarItemSetCommandID( item, tool->GetId() );
1132                     tool->SetToolbarItemRef( item );
1133
1134                     controlHandle = ( ControlRef ) tool->GetControlHandle();
1135                     wxASSERT_MSG( controlHandle != NULL, wxT("NULL tool control") );
1136
1137                     // FIXME: is this necessary ??
1138                     ::GetControlBounds( controlHandle, &toolrect );
1139                     UMAMoveControl( controlHandle, -toolrect.left, -toolrect.top );
1140
1141                     // FIXME: is this necessary ??
1142                     InstallControlEventHandler( controlHandle, GetwxMacToolBarToolEventHandlerUPP(),
1143                                                 GetEventTypeCount(eventList), eventList, tool, NULL );
1144                 }
1145             }
1146
1147 #else
1148                 // FIXME: right now there's nothing to do here
1149 #endif
1150                 break;
1151
1152         default :
1153             break;
1154     }
1155
1156     if ( err == 0 )
1157     {
1158         if ( controlHandle )
1159         {
1160             ControlRef container = (ControlRef) GetHandle();
1161             wxASSERT_MSG( container != NULL, wxT("No valid mac container control") );
1162
1163             UMAShowControl( controlHandle );
1164             ::EmbedControl( controlHandle, container );
1165         }
1166
1167         if ( tool->CanBeToggled() && tool->IsToggled() )
1168             tool->UpdateToggleImage( true );
1169
1170         // nothing special to do here - we relayout in Realize() later
1171         tool->Attach(this);
1172         InvalidateBestSize();
1173     }
1174     else
1175     {
1176         wxString    errMsg;
1177         errMsg.Format( wxT("wxToolBar::DoInsertTool - failure [%ld]"), (long) err );
1178         wxASSERT_MSG( false, errMsg.c_str() );
1179     }
1180
1181     return( err == 0 );
1182 }
1183
1184 void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(toggle))
1185 {
1186     wxFAIL_MSG( _T("not implemented") );
1187 }
1188
1189 bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolbase)
1190 {
1191     wxToolBarTool* tool = wx_static_cast( wxToolBarTool* , toolbase ) ;
1192     wxToolBarToolsList::compatibility_iterator node;
1193     for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
1194     {
1195         wxToolBarToolBase *tool2 = node->GetData();
1196         if ( tool2 == tool )
1197         {
1198             // let node point to the next node in the list
1199             node = node->GetNext();
1200
1201             break;
1202         }
1203     }
1204
1205     wxSize sz = ((wxToolBarTool*)tool)->GetSize() ;
1206
1207     tool->Detach();
1208
1209     switch ( tool->GetStyle() )
1210     {
1211         case wxTOOL_STYLE_CONTROL:
1212             {
1213                 tool->GetControl()->Destroy();
1214                 tool->ClearControl() ;
1215             }
1216             break;
1217
1218         case wxTOOL_STYLE_BUTTON:
1219         case wxTOOL_STYLE_SEPARATOR:
1220             if ( tool->GetControlHandle() )
1221             {
1222                 DisposeControl( (ControlRef) tool->GetControlHandle() ) ;
1223 #if wxMAC_USE_NATIVE_TOOLBAR
1224                                 if ( tool->GetToolbarItemRef() )
1225                         CFRelease( tool->GetToolbarItemRef() ) ;
1226 #endif
1227                 tool->ClearControl() ;
1228             }
1229             break;
1230
1231         default:
1232             break;
1233     }
1234
1235     // and finally reposition all the controls after this one
1236
1237     for ( /* node -> first after deleted */ ; node; node = node->GetNext() )
1238     {
1239         wxToolBarTool *tool2 = (wxToolBarTool*) node->GetData();
1240         wxPoint pt = tool2->GetPosition() ;
1241
1242         if ( GetWindowStyleFlag() & wxTB_VERTICAL )
1243             pt.y -= sz.y ;
1244         else
1245             pt.x -= sz.x ;
1246
1247         tool2->SetPosition( pt ) ;
1248     }
1249
1250     InvalidateBestSize();
1251     return true ;
1252 }
1253
1254 void wxToolBar::OnPaint(wxPaintEvent& event)
1255 {
1256 #if wxMAC_USE_NATIVE_TOOLBAR
1257     if ( m_macUsesNativeToolbar )
1258     {
1259         event.Skip(true) ;
1260         return ;
1261     }
1262 #endif
1263
1264     wxPaintDC dc(this) ;
1265
1266     int w, h ;
1267     GetSize( &w , &h ) ;
1268 #if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
1269     if ( !MacGetTopLevelWindow()->MacGetMetalAppearance() )
1270     {
1271         if ( UMAGetSystemVersion() >= 0x1030 )
1272         {
1273             HIThemePlacardDrawInfo info ;
1274             memset( &info, 0 , sizeof( info ) ) ;
1275             info.version = 0 ;
1276             info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ;
1277
1278             CGContextRef cgContext = (CGContextRef) MacGetCGContextRef() ;
1279             HIRect rect = CGRectMake( 0 , 0 , w , h ) ;
1280             HIThemeDrawPlacard( &rect , & info , cgContext, kHIThemeOrientationNormal) ;
1281         }
1282     }
1283     else
1284     {
1285         // leave the background as it is (striped or metal)
1286     }
1287 #else
1288     wxMacPortSetter helper(&dc) ;
1289
1290     Rect toolbarrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) ,
1291         dc.YLOG2DEVMAC(h) , dc.XLOG2DEVMAC(w) } ;
1292 /*
1293     if( toolbarrect.left < 0 )
1294         toolbarrect.left = 0 ;
1295     if ( toolbarrect.top < 0 )
1296         toolbarrect.top = 0 ;
1297 */
1298     if ( !MacGetTopLevelWindow()->MacGetMetalAppearance() )
1299     {
1300         UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
1301     }
1302     else
1303     {
1304 #if TARGET_API_MAC_OSX
1305 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
1306         if ( UMAGetSystemVersion() >= 0x1030 )
1307         {
1308             HIRect hiToolbarrect = CGRectMake( dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) ,
1309             dc.YLOG2DEVREL(h) , dc.XLOG2DEVREL(w) );
1310             CGContextRef cgContext ;
1311             Rect bounds ;
1312             GetPortBounds( (CGrafPtr) dc.m_macPort , &bounds ) ;
1313             QDBeginCGContext( (CGrafPtr) dc.m_macPort , &cgContext ) ;
1314             CGContextTranslateCTM( cgContext , 0 , bounds.bottom - bounds.top ) ;
1315             CGContextScaleCTM( cgContext , 1 , -1 ) ;
1316
1317             {
1318                 HIThemeBackgroundDrawInfo drawInfo ;
1319                 drawInfo.version = 0 ;
1320                 drawInfo.state = kThemeStateActive ;
1321                 drawInfo.kind = kThemeBackgroundMetal ;
1322                 HIThemeApplyBackground( &hiToolbarrect, &drawInfo , cgContext,kHIThemeOrientationNormal) ;
1323             }
1324
1325             QDEndCGContext( (CGrafPtr) dc.m_macPort , &cgContext ) ;
1326         }
1327         else
1328 #endif
1329         {
1330             UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
1331         }
1332 #endif
1333     }
1334 #endif
1335
1336     event.Skip() ;
1337 }
1338
1339 #endif // wxUSE_TOOLBAR
1340