X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7810c95b5de52447a5c2c8aaed06f287e02fc690..b905d6cc083a38d46ae48712f5221236247a39ce:/src/mac/carbon/toolbar.cpp diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp index b103b56042..cdefd9ccbb 100644 --- a/src/mac/carbon/toolbar.cpp +++ b/src/mac/carbon/toolbar.cpp @@ -1,35 +1,54 @@ ///////////////////////////////////////////////////////////////////////////// // Name: toolbar.cpp // Purpose: wxToolBar -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) AUTHORy +// Copyright: (c) Stefan Csomor +// Licence: The wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "toolbar.h" #endif -#include "wx/wx.h" +#include "wx/wxprec.h" #if wxUSE_TOOLBAR +#include "wx/wx.h" #include "wx/toolbar.h" #include "wx/notebook.h" #include "wx/tabctrl.h" +#include "wx/bitmap.h" #if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase) +IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase) - EVT_MOUSE_EVENTS( wxToolBar::OnMouse ) - EVT_PAINT( wxToolBar::OnPaint ) + EVT_PAINT( wxToolBar::OnPaint ) END_EVENT_TABLE() #endif -#include +#include "wx/mac/uma.h" +#include "wx/geometry.h" + +#ifdef __WXMAC_OSX__ +const short kwxMacToolBarToolDefaultWidth = 24 ; +const short kwxMacToolBarToolDefaultHeight = 24 ; +const short kwxMacToolBarTopMargin = 4 ; +const short kwxMacToolBarLeftMargin = 4 ; +const short kwxMacToolBorder = 0 ; +const short kwxMacToolSpacing = 6 ; +#else +const short kwxMacToolBarToolDefaultWidth = 24 ; +const short kwxMacToolBarToolDefaultHeight = 22 ; +const short kwxMacToolBarTopMargin = 2 ; +const short kwxMacToolBarLeftMargin = 2 ; +const short kwxMacToolBorder = 4 ; +const short kwxMacToolSpacing = 0 ; +#endif // ---------------------------------------------------------------------------- // private classes @@ -40,36 +59,143 @@ class wxToolBarTool : public wxToolBarToolBase public: wxToolBarTool(wxToolBar *tbar, int id, - const wxBitmap& bitmap1, - const wxBitmap& bitmap2, - bool toggle, + const wxString& label, + const wxBitmap& bmpNormal, + const wxBitmap& bmpDisabled, + wxItemKind kind, wxObject *clientData, - const wxString& shortHelpString, - const wxString& longHelpString) - : wxToolBarToolBase(tbar, id, bitmap1, bitmap2, toggle, - clientData, shortHelpString, longHelpString) + const wxString& shortHelp, + const wxString& longHelp) ; + + wxToolBarTool(wxToolBar *tbar, wxControl *control) + : wxToolBarToolBase(tbar, control) { - m_nSepCount = 0; - m_index = -1 ; + Init() ; } + + ~wxToolBarTool() + { + if ( m_controlHandle ) + DisposeControl( m_controlHandle ) ; + } + + WXWidget GetControlHandle() { return (WXWidget) m_controlHandle ; } + void SetControlHandle( ControlRef handle ) { m_controlHandle = handle ; } + + void SetSize(const wxSize& size) ; + void SetPosition( const wxPoint& position ) ; + + wxSize GetSize() const + { + if ( IsControl() ) + { + return GetControl()->GetSize() ; + } + else if ( IsButton() ) + { + return GetToolBar()->GetToolSize() ; + } + else + { + // separator size + wxSize sz = GetToolBar()->GetToolSize() ; + if ( GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL ) + sz.y /= 4 ; + else + sz.x /= 4 ; + return sz ; + } + } + wxPoint GetPosition() const + { + return wxPoint(m_x, m_y); + } + bool DoEnable( bool enable ) ; + + void UpdateToggleImage( bool toggle ) ; +private : + void Init() + { + m_controlHandle = NULL ; + } + ControlRef m_controlHandle ; - wxToolBarTool(wxToolBar *tbar, wxControl *control) - : wxToolBarToolBase(tbar, control) + wxCoord m_x; + wxCoord m_y; +}; + +static const EventTypeSpec eventList[] = +{ + { kEventClassControl , kEventControlHit } , +#ifdef __WXMAC_OSX__ + { kEventClassControl , kEventControlHitTest } , +#endif +} ; + +static pascal OSStatus wxMacToolBarToolControlEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) +{ + OSStatus result = eventNotHandledErr ; + + wxMacCarbonEvent cEvent( event ) ; + + ControlRef controlRef ; + + cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ; + + switch( GetEventKind( event ) ) { - m_nSepCount = 1; - m_index = -1 ; + case kEventControlHit : + { + wxToolBarTool* tbartool = (wxToolBarTool*)data ; + if ( tbartool->CanBeToggled() ) + { +#ifdef __WXMAC_OSX__ + ((wxToolBar*)tbartool->GetToolBar())->ToggleTool(tbartool->GetId(), !tbartool->IsToggled() ); +#else + ((wxToolBar*)tbartool->GetToolBar())->ToggleTool(tbartool->GetId(), GetControl32BitValue((ControlRef)tbartool->GetControlHandle())); +#endif + } + ((wxToolBar*)tbartool->GetToolBar())->OnLeftClick( tbartool->GetId() , tbartool -> IsToggled() ) ; + result = noErr; + } + break ; +#ifdef __WXMAC_OSX__ + case kEventControlHitTest : + { + HIPoint pt = cEvent.GetParameter(kEventParamMouseLocation) ; + HIRect rect ; + HIViewGetBounds( controlRef , &rect ) ; + + ControlPartCode pc = kControlNoPart ; + if ( CGRectContainsPoint( rect , pt ) ) + pc = kControlButtonPart ; + cEvent.SetParameter( kEventParamControlPart , typeControlPartCode, pc ) ; + result = noErr ; + } + break ; +#endif + default : + break ; } + return result ; +} - // set/get the number of separators which we use to cover the space used by - // a control in the toolbar - void SetSeparatorsCount(size_t count) { m_nSepCount = count; } - size_t GetSeparatorsCount() const { return m_nSepCount; } +pascal OSStatus wxMacToolBarToolEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) +{ + OSStatus result = eventNotHandledErr ; - int m_index ; -private: - size_t m_nSepCount; -}; + switch ( GetEventClass( event ) ) + { + case kEventClassControl : + result = wxMacToolBarToolControlEventHandler( handler, event, data ) ; + break ; + default : + break ; + } + return result ; +} +DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacToolBarToolEventHandler ) // ============================================================================ // implementation @@ -79,19 +205,217 @@ private: // wxToolBarTool // ---------------------------------------------------------------------------- -const short defwidth = 24 ; -const short defheight = 22 ; +bool wxToolBarTool::DoEnable(bool enable) +{ + if ( IsControl() ) + { + GetControl()->Enable( enable ) ; + } + else if ( IsButton() ) + { +#if TARGET_API_MAC_OSX + if ( enable ) + EnableControl( m_controlHandle ) ; + else + DisableControl( m_controlHandle ) ; +#else + if ( enable ) + ActivateControl( m_controlHandle ) ; + else + DeactivateControl( m_controlHandle ) ; +#endif + } + return true ; +} +void wxToolBarTool::SetSize(const wxSize& size) +{ + if ( IsControl() ) + { + GetControl()->SetSize( size ) ; + } +} + +void wxToolBarTool::SetPosition(const wxPoint& position) +{ + m_x = position.x; + m_y = position.y; + + if ( IsButton() ) + { + int x , y ; + x = y = 0 ; + int mac_x = position.x ; + int mac_y = position.y ; +#ifdef __WXMAC_OSX__ + // already correctly set up +#else + WindowRef rootwindow = (WindowRef) GetToolBar()->MacGetTopLevelWindowRef() ; + GetToolBar()->MacWindowToRootWindow( &x , &y ) ; + mac_x += x; + mac_y += y; +#endif + Rect contrlRect ; + GetControlBounds( m_controlHandle , &contrlRect ) ; + int former_mac_x = contrlRect.left ; + int former_mac_y = contrlRect.top ; + GetToolBar()->GetToolSize() ; + + if ( mac_x != former_mac_x || mac_y != former_mac_y ) + { + UMAMoveControl( m_controlHandle , mac_x , mac_y ) ; + } + } + else if ( IsControl() ) + { + GetControl()->Move( position ) ; + } + else + { + // separator +#ifdef __WXMAC_OSX__ + int x , y ; + x = y = 0 ; + int mac_x = position.x ; + int mac_y = position.y ; + + Rect contrlRect ; + GetControlBounds( m_controlHandle , &contrlRect ) ; + int former_mac_x = contrlRect.left ; + int former_mac_y = contrlRect.top ; + + if ( mac_x != former_mac_x || mac_y != former_mac_y ) + { + UMAMoveControl( m_controlHandle , mac_x , mac_y ) ; + } +#endif + } +} + +void wxToolBarTool::UpdateToggleImage( bool toggle ) +{ +#ifdef __WXMAC_OSX__ + if ( toggle ) + { + int w = m_bmpNormal.GetWidth() ; + int h = m_bmpNormal.GetHeight() ; + wxBitmap bmp( w , h ) ; + wxMemoryDC dc ; + dc.SelectObject( bmp ) ; + dc.SetPen( wxNullPen ) ; + dc.SetBackground( *wxWHITE ) ; + dc.DrawRectangle( 0 , 0 , w , h ) ; + dc.DrawBitmap( m_bmpNormal , 0 , 0 , true) ; + dc.SelectObject( wxNullBitmap ) ; + ControlButtonContentInfo info ; + wxMacCreateBitmapButton( &info , bmp ) ; + SetControlData( m_controlHandle , 0, kControlIconContentTag, sizeof( info ), + (Ptr)&info ); + wxMacReleaseBitmapButton( &info ) ; + } + else + { + ControlButtonContentInfo info ; + wxMacCreateBitmapButton( &info , m_bmpNormal ) ; + SetControlData( m_controlHandle , 0, kControlIconContentTag, sizeof( info ), + (Ptr)&info ); + wxMacReleaseBitmapButton( &info ) ; + } + + IconTransformType transform = toggle ? kTransformSelected : kTransformNone ; + SetControlData( m_controlHandle, 0, kControlIconTransformTag, sizeof( transform ), + (Ptr)&transform ); + HIViewSetNeedsDisplay( m_controlHandle , true ) ; + +#else + ::SetControl32BitValue( m_controlHandle , toggle ) ; +#endif +} + +wxToolBarTool::wxToolBarTool(wxToolBar *tbar, + int id, + const wxString& label, + const wxBitmap& bmpNormal, + const wxBitmap& bmpDisabled, + wxItemKind kind, + wxObject *clientData, + const wxString& shortHelp, + const wxString& longHelp) + : wxToolBarToolBase(tbar, id, label, bmpNormal, bmpDisabled, kind, + 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() ) ; + +#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 ) ; + } +} + wxToolBarToolBase *wxToolBar::CreateTool(int id, - const wxBitmap& bitmap1, - const wxBitmap& bitmap2, - bool toggle, + const wxString& label, + const wxBitmap& bmpNormal, + const wxBitmap& bmpDisabled, + wxItemKind kind, wxObject *clientData, - const wxString& shortHelpString, - const wxString& longHelpString) + const wxString& shortHelp, + const wxString& longHelp) { - return new wxToolBarTool(this, id, bitmap1, bitmap2, toggle, - clientData, shortHelpString, longHelpString); + return new wxToolBarTool(this, id, label, bmpNormal, bmpDisabled, kind, + clientData, shortHelp, longHelp); } wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control) @@ -101,328 +425,156 @@ wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control) void wxToolBar::Init() { - m_maxWidth = -1; - m_maxHeight = -1; - m_defaultWidth = defwidth; - m_defaultHeight = defheight; - // TODO + 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) -{ +{ - m_defaultWidth = defwidth; - m_defaultHeight = defheight; - - 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; -#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; + if ( !wxToolBarBase::Create( parent , id , pos , size , style ) ) + return FALSE ; + + return TRUE; } wxToolBar::~wxToolBar() -{ +{ // 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 ) +bool wxToolBar::Realize() { - CGrafPtr origPort ; - GDHandle origDev ; - - PicHandle pict; // this is the Picture we give back - - RGBColor gray = { 0xCCCC ,0xCCCC , 0xCCCC } ; - RGBColor white = { 0xffff ,0xffff , 0xffff } ; - RGBColor black = { 0x0000 ,0x0000 , 0x0000 } ; - - unsigned char *maskimage = NULL ; - Rect portRect ; - GetPortBounds( wp , &portRect ) ; - int width = portRect.right - portRect.left ; - int height = portRect.bottom - portRect.top ; - - LockPixels( GetGWorldPixMap( wp ) ) ; - GetGWorld( &origPort , &origDev ) ; - - if ( mask ) - { - - maskimage = (unsigned char*) malloc( width * height ) ; - SetGWorld( mask , NULL ) ; - LockPixels( GetGWorldPixMap( mask ) ) ; - for ( int y = 0 ; y < height ; ++y ) - { - for( int x = 0 ; x < width ; ++x ) - { - RGBColor col ; - - GetCPixel( x + portRect.left , y + portRect.top , &col ) ; - maskimage[y*width + x] = ( col.red == 0 ) ; // for monochrome masks - } - } - UnlockPixels( GetGWorldPixMap( mask ) ) ; - } - - SetGWorld( wp , NULL ) ; - - pict = OpenPicture(&portRect); // open a picture, this disables drawing - if(!pict) - return NULL; - - RGBBackColor( &gray ) ; - RGBForeColor( &black ) ; - EraseRect(&portRect) ; - RGBBackColor( &white ) ; - - if ( maskimage ) - { - for ( int y = 0 ; y < height ; ++y ) - { - for( int x = 0 ; x < width ; ++x ) - { - if ( maskimage[y*width + x] ) - { - RGBColor col ; - - GetCPixel( x + portRect.left , y + portRect.top , &col ) ; - SetCPixel( x + portRect.left , y + portRect.top , &col ) ; - } - } - } - free( maskimage ) ; - maskimage = NULL ; - } - else - { - CopyBits(GetPortBitMapForCopyBits(wp), // src PixMap - we copy image over itself - - GetPortBitMapForCopyBits(wp), // dst PixMap - no drawing occurs - - &portRect, // srcRect - it will be recorded and compressed - - &portRect, // dstRect - into the picture that is open - - srcCopy,NULL); // copyMode and no clip region - - } - ClosePicture(); // We are done recording the picture - UnlockPixels( GetGWorldPixMap( wp ) ) ; - SetGWorld( origPort , origDev ) ; - return pict; // return our groovy pict handle -} + if (m_tools.GetCount() == 0) + return FALSE; -const short kwxMacToolBarTopMargin = 2 ; -const short kwxMacToolBarLeftMargin = 2 ; + int x = m_xMargin + kwxMacToolBarLeftMargin ; + int y = m_yMargin + kwxMacToolBarTopMargin ; -bool wxToolBar::Realize() -{ - if (m_tools.Number() == 0) - return FALSE; - - Point localOrigin ; - Rect clipRect ; - WindowRef window ; - wxWindow *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} ; - 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); - m_maxWidth = m_maxHeight = 0 ; - while (node) - { - wxToolBarTool *tool = (wxToolBarTool *)node->Data(); - wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetBitmap1().GetRefData()) ; - - if( !tool->IsSeparator() ) - { - Rect toolrect = { toolbarrect.top + kwxMacToolBarTopMargin , toolbarrect.left + x + kwxMacToolBarLeftMargin , 0 , 0 } ; - toolrect.right = toolrect.left + toolSize.x ; - toolrect.bottom = toolrect.top + toolSize.y ; - - PicHandle icon = NULL ; - if ( bmap ) - { - if ( bmap->m_bitmapType == kMacBitmapTypePict ) - icon = bmap->m_hPict ; - else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld ) - { - if ( tool->GetBitmap1().GetMask() ) - { - icon = MakePict( bmap->m_hBitmap , tool->GetBitmap1().GetMask()->GetMaskBitmap() ) ; - } - else - { - icon = MakePict( bmap->m_hBitmap , NULL ) ; - } - } - } - - ControlHandle m_macToolHandle ; - - SInt16 behaviour = kControlBehaviorOffsetContents ; - if ( tool->CanBeToggled() ) - behaviour += kControlBehaviorToggles ; - - if ( icon ) - { - m_macToolHandle = UMANewControl( window , &toolrect , "\p" , true , 0 , - behaviour + kControlContentPictHandle , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ; - ControlButtonContentInfo info ; - - info.contentType = kControlContentPictHandle ; - info.u.picture = icon ; - - UMASetControlData( m_macToolHandle , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ; - } - else - { - m_macToolHandle = UMANewControl( window , &toolrect , "\p" , true , 0 , - behaviour , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ; - } - m_macToolHandles.Add( m_macToolHandle ) ; - tool->m_index = m_macToolHandles.Count() -1 ; - if ( !tool->IsEnabled() ) - { - UMADeactivateControl( m_macToolHandle ) ; - } - if ( tool->CanBeToggled() && tool->IsToggled() ) - { - ::SetControlValue( m_macToolHandle , 1 ) ; - } - UMASetControlFontStyle( m_macToolHandle , &controlstyle ) ; - ControlHandle container = GetParent()->MacGetContainerForEmbedding() ; - wxASSERT_MSG( container != NULL , "No valid mac container control" ) ; - UMAEmbedControl( m_macToolHandle , container ) ; - - x += (int)toolSize.x; - noButtons ++; - } - else - { - m_macToolHandles.Add( NULL ) ; - x += (int)toolSize.x / 4; - } - if ( toolbarrect.left + x + kwxMacToolBarLeftMargin - m_x - localOrigin.h > m_maxWidth) - m_maxWidth = toolbarrect.left + x + kwxMacToolBarLeftMargin - m_x - localOrigin.h; - if (toolbarrect.top + kwxMacToolBarTopMargin - m_y - localOrigin.v > m_maxHeight) - m_maxHeight = toolbarrect.top + kwxMacToolBarTopMargin - m_y - localOrigin.v ; - - node = node->Next(); - } - - if ( GetWindowStyleFlag() & wxTB_HORIZONTAL ) - { - if ( m_maxRows == 0 ) + + int maxWidth = 0 ; + int maxHeight = 0 ; + + int maxToolWidth = 0; + int maxToolHeight = 0; + + // Find the maximum tool width and height + wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst(); + while ( node ) { - // if not set yet, only one row - SetRows(1); + wxToolBarTool *tool = (wxToolBarTool *)node->GetData(); + wxSize sz = tool->GetSize() ; + + if ( sz.x > maxToolWidth ) + maxToolWidth = sz.x ; + if (sz.y> maxToolHeight) + maxToolHeight = sz.y; + + node = node->GetNext(); } - m_maxWidth = clipRect.right - m_x ; - //m_maxWidth = tw ; // +=toolSize.x; - //m_maxWidth += m_xMargin ; - m_maxHeight += toolSize.y; - m_maxHeight += m_yMargin; - } - else - { - if ( noButtons > 0 && m_maxRows == 0 ) + + bool lastWasRadio = FALSE; + node = m_tools.GetFirst(); + while (node) { - // if not set yet, have one column - SetRows(noButtons); + wxToolBarTool *tool = (wxToolBarTool *)node->GetData(); + wxSize cursize = tool->GetSize() ; + + bool isRadio = FALSE; + + if ( tool->IsButton() && tool->GetKind() == wxITEM_RADIO ) + { + if ( !lastWasRadio ) + { + if (tool->Toggle(true)) + { + DoToggleTool(tool, true); + } + } + isRadio = TRUE; + } + else + { + isRadio = FALSE; + } + lastWasRadio = isRadio; + + // for the moment we just do a single row/column alignement + if ( x + cursize.x > maxWidth ) + maxWidth = x + cursize.x ; + if ( y + cursize.y > maxHeight ) + maxHeight = y + cursize.y ; + + if ( GetWindowStyleFlag() & wxTB_VERTICAL ) + { + int x1 = x + (maxToolWidth - cursize.x)/2 ; + tool->SetPosition( wxPoint( x1 , y ) ) ; + } + else + { + int y1 = y + (maxToolHeight - cursize.y)/2 ; + tool->SetPosition( wxPoint( x , y1 ) ) ; + } + if ( GetWindowStyleFlag() & wxTB_VERTICAL ) + { + y += cursize.y ; + y += kwxMacToolSpacing ; + } + else + { + x += cursize.x ; + x += kwxMacToolSpacing ; + } + + node = node->GetNext(); } - m_maxHeight = clipRect.bottom - m_y ; - //m_maxHeight += m_yMargin ; - m_maxWidth += toolSize.x; - m_maxWidth += m_xMargin; - } - - SetSize(m_maxWidth, m_maxHeight); - - return TRUE; + + if ( GetWindowStyleFlag() & wxTB_HORIZONTAL ) + { + if ( m_maxRows == 0 ) + { + // if not set yet, only one row + SetRows(1); + } + m_minWidth = maxWidth; + maxWidth = tw ; + maxHeight += m_yMargin + kwxMacToolBarTopMargin; + m_minHeight = m_maxHeight = maxHeight ; + } + else + { + if ( GetToolsCount() > 0 && m_maxRows == 0 ) + { + // if not set yet, have one column + SetRows(GetToolsCount()); + } + m_minHeight = maxHeight; + maxHeight = th ; + maxWidth += m_xMargin + kwxMacToolBarLeftMargin; + m_minWidth = m_maxWidth = maxWidth ; + } + + SetSize( maxWidth, maxHeight ); + InvalidateBestSize(); + + return TRUE; } void wxToolBar::SetToolBitmapSize(const wxSize& size) { - m_defaultWidth = size.x; m_defaultHeight = size.y; + m_defaultWidth = size.x+kwxMacToolBorder; m_defaultHeight = size.y+kwxMacToolBorder; } // The button size is bigger than the bitmap size wxSize wxToolBar::GetToolSize() const { - return wxSize(m_defaultWidth + 4, m_defaultHeight + 4); -} - -void wxToolBar::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) -{ - int index = 0 ; - for ( index = 0 ; index < m_macToolHandles.Count() ; ++index ) - { - if ( m_macToolHandles[index] == (void*) control ) - { - wxToolBarTool *tool = (wxToolBarTool *)m_tools.Nth( index )->Data(); - if ( tool->CanBeToggled() ) - { - tool->Toggle( GetControlValue( control ) ) ; - } - OnLeftClick( tool->GetId() , tool -> IsToggled() ) ; - break ; - } - } + return wxSize(m_defaultWidth + kwxMacToolBorder, m_defaultHeight + kwxMacToolBorder); } void wxToolBar::SetRows(int nRows) @@ -436,254 +588,166 @@ void wxToolBar::SetRows(int nRows) m_maxRows = nRows; } +void wxToolBar::MacSuperChangedPosition() +{ + wxWindow::MacSuperChangedPosition() ; + Realize() ; +} + wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const { - MacClientToRootWindow( &x , &y ) ; - Point pt = { y ,x } ; - - int index = 0 ; - for ( index = 0 ; index < m_macToolHandles.Count() ; ++index ) - { - if ( m_macToolHandles[index] ) - { - Rect bounds ; - GetControlBounds((ControlHandle) m_macToolHandles[index], &bounds ) ; - if ( PtInRect( pt , &bounds ) ) - { - return (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ; - } - } - } + wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst(); + while (node) + { + wxToolBarTool *tool = (wxToolBarTool *)node->GetData() ; + wxRect2DInt r( tool->GetPosition() , tool->GetSize() ) ; + if ( r.Contains( wxPoint( x , y ) ) ) + { + return tool; + } + + node = node->GetNext(); + } return (wxToolBarToolBase *)NULL; } wxString wxToolBar::MacGetToolTipString( wxPoint &pt ) { - wxToolBarToolBase* tool = FindToolForPosition( pt.x , pt.y ) ; - if ( tool ) - { - return tool->GetShortHelp() ; - } - return "" ; + wxToolBarToolBase* tool = FindToolForPosition( pt.x , pt.y ) ; + if ( tool ) + { + return tool->GetShortHelp() ; + } + return wxEmptyString ; } void wxToolBar::DoEnableTool(wxToolBarToolBase *t, bool enable) { - wxToolBarTool *tool = (wxToolBarTool *)t; - if ( tool->m_index < 0 ) - return ; - - ControlHandle control = (ControlHandle) m_macToolHandles[ tool->m_index ] ; - - if ( enable ) - UMAActivateControl( control ) ; - else - UMADeactivateControl( control ) ; + ((wxToolBarTool*)t)->DoEnable( enable ) ; } void wxToolBar::DoToggleTool(wxToolBarToolBase *t, bool toggle) { - wxToolBarTool *tool = (wxToolBarTool *)t; - if ( tool->m_index < 0 ) - return ; - - ControlHandle control = (ControlHandle) m_macToolHandles[ tool->m_index ] ; - ::SetControlValue( control , toggle ) ; + wxToolBarTool *tool = (wxToolBarTool *)t; + if ( tool->IsButton() ) + { + tool->UpdateToggleImage( toggle ) ; + } } bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool) { - // nothing special to do here - we really create the toolbar buttons in - // Realize() later + // nothing special to do here - we relayout in Realize() later tool->Attach(this); + InvalidateBestSize(); return TRUE; } -void wxToolBar::DoSetToggle(wxToolBarToolBase *t, bool toggle) +void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(toggle)) { - wxToolBarTool *tool = (wxToolBarTool *)t; - // TODO: set toggle state + wxFAIL_MSG( _T("not implemented") ); } -bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool) +bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool) { - return TRUE ; + wxToolBarToolsList::compatibility_iterator node; + for ( node = m_tools.GetFirst(); node; node = node->GetNext() ) + { + wxToolBarToolBase *tool2 = node->GetData(); + if ( tool2 == tool ) + { + // let node point to the next node in the list + node = node->GetNext(); + + break; + } + } + + wxSize sz = ((wxToolBarTool*)tool)->GetSize() ; + + tool->Detach(); + + // and finally reposition all the controls after this one + + for ( /* node -> first after deleted */ ; node; node = node->GetNext() ) + { + wxToolBarTool *tool2 = (wxToolBarTool*) node->GetData(); + wxPoint pt = tool2->GetPosition() ; + + if ( GetWindowStyleFlag() & wxTB_VERTICAL ) + { + pt.y -= sz.y ; + } + else + { + pt.x -= sz.x ; + } + tool2->SetPosition( pt ) ; + } + + InvalidateBestSize(); + return TRUE ; } void wxToolBar::OnPaint(wxPaintEvent& event) { - Point localOrigin ; - Rect clipRect ; - WindowRef window ; - wxWindow *win ; - - GetParent()->MacGetPortParams( &localOrigin , &clipRect , &window , &win ) ; - if ( window && 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() ; - } - int w = m_width ; - int h = m_height ; - - if ( GetWindowStyleFlag() & wxTB_HORIZONTAL ) - { - w = clipRect.right - m_x ; - } - else - { - h = clipRect.bottom - m_y ; - } - - Rect toolbarrect = { m_y + localOrigin.v , m_x + localOrigin.h , - m_y + localOrigin.v + h , m_x + localOrigin.h + w } ; - - 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() ; - } - /* - 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 ) -{ - - if (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK ) - { - - int x = event.m_x ; - int y = event.m_y ; - - MacClientToRootWindow( &x , &y ) ; - - ControlHandle control ; - Point localwhere ; - GrafPtr port ; - SInt16 controlpart ; - WindowRef window = GetMacRootWindow() ; - - localwhere.h = x ; - localwhere.v = y ; - - short modifiers = 0; - - if ( !event.m_leftDown && !event.m_rightDown ) - modifiers |= btnState ; - - if ( event.m_shiftDown ) - modifiers |= shiftKey ; - - if ( event.m_controlDown ) - modifiers |= controlKey ; - - if ( event.m_altDown ) - modifiers |= optionKey ; - - if ( event.m_metaDown ) - modifiers |= cmdKey ; - - controlpart = FindControl( localwhere , window , &control ) ; - { - if ( AcceptsFocus() && FindFocus() != this ) - { - SetFocus() ; - } - if ( control && UMAIsControlActive( control ) ) - { - { - if ( controlpart == kControlIndicatorPart && !UMAHasAppearance() ) - controlpart = UMAHandleControlClick( control , localwhere , modifiers , (ControlActionUPP) NULL ) ; - else - controlpart = UMAHandleControlClick( control , localwhere , modifiers , (ControlActionUPP) -1 ) ; - wxTheApp->s_lastMouseDown = 0 ; - if ( controlpart && ! ( ( UMAHasAppearance() || (controlpart != kControlIndicatorPart) ) - && (IsKindOf( CLASSINFO( wxScrollBar ) ) ) ) ) // otherwise we will get the event twice - { - MacHandleControlClick( control , controlpart ) ; - } - } - } - } - } + wxPaintDC dc(this) ; +#if wxMAC_USE_CORE_GRAPHICS + // leave the background as it is (striped or metal) +#else + wxMacPortSetter helper(&dc) ; + int w, h ; + GetSize( &w , &h ) ; + + Rect toolbarrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , + dc.YLOG2DEVMAC(h) , dc.XLOG2DEVMAC(w) } ; +/* + if( toolbarrect.left < 0 ) + toolbarrect.left = 0 ; + if ( toolbarrect.top < 0 ) + toolbarrect.top = 0 ; +*/ + if ( !MacGetTopLevelWindow()->MacGetMetalAppearance() ) + { + UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; + } + else + { +#if TARGET_API_MAC_OSX +#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2 + if ( UMAGetSystemVersion() >= 0x1030 ) + { + HIRect hiToolbarrect = CGRectMake( dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , + dc.YLOG2DEVREL(h) , dc.XLOG2DEVREL(w) ); + CGContextRef cgContext ; + Rect bounds ; + GetPortBounds( (CGrafPtr) dc.m_macPort , &bounds ) ; + QDBeginCGContext( (CGrafPtr) dc.m_macPort , &cgContext ) ; + CGContextTranslateCTM( cgContext , 0 , bounds.bottom - bounds.top ) ; + CGContextScaleCTM( cgContext , 1 , -1 ) ; + + { + HIThemeBackgroundDrawInfo drawInfo ; + drawInfo.version = 0 ; + drawInfo.state = kThemeStateActive ; + drawInfo.kind = kThemeBackgroundMetal ; + HIThemeApplyBackground( &hiToolbarrect, &drawInfo , cgContext,kHIThemeOrientationNormal) ; + } + QDEndCGContext( (CGrafPtr) dc.m_macPort , &cgContext ) ; + } + else +#endif + { + UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; + } +#endif + } +#endif + + event.Skip() ; } #endif // wxUSE_TOOLBAR