X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be2958285a158420c7268554b9ad587952926199..b6f5f27a330a5f3f05ee4824270e7dc692441d42:/src/mac/carbon/toolbar.cpp diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp index c7dd11d195..7c6fa528d5 100644 --- a/src/mac/carbon/toolbar.cpp +++ b/src/mac/carbon/toolbar.cpp @@ -41,14 +41,15 @@ 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) + : wxToolBarToolBase(tbar, id, label, bmpNormal, bmpDisabled, kind, + clientData, shortHelp, longHelp) { m_nSepCount = 0; m_index = -1 ; @@ -87,15 +88,16 @@ const short kwxMacToolBarLeftMargin = 2 ; 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) @@ -167,9 +169,9 @@ bool wxToolBar::Realize() return FALSE; Point localOrigin ; - Rect clipRect ; + // Rect clipRect ; WindowRef window = (WindowRef) MacGetRootWindow() ; - wxWindow *win ; + // wxWindow *win ; int lx , ly ; lx = ly = 0 ; @@ -200,7 +202,7 @@ bool wxToolBar::Realize() while (node) { wxToolBarTool *tool = (wxToolBarTool *)node->Data(); - wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetBitmap1().GetRefData()) ; + wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().GetRefData()) ; if( !tool->IsSeparator() ) { @@ -210,7 +212,7 @@ bool wxToolBar::Realize() toolrect.bottom = toolrect.top + toolSize.y ; ControlButtonContentInfo info ; - wxMacCreateBitmapButton( &info , tool->GetBitmap1() ) ; + wxMacCreateBitmapButton( &info , tool->GetNormalBitmap() ) ; ControlHandle m_macToolHandle ; SInt16 behaviour = kControlBehaviorOffsetContents ; @@ -251,26 +253,27 @@ bool wxToolBar::Realize() wxASSERT_MSG( container != NULL , "No valid mac container control" ) ; ::EmbedControl( m_macToolHandle , container ) ; - if ( GetWindowStyleFlag() & wxTB_HORIZONTAL ) + if ( GetWindowStyleFlag() & wxTB_VERTICAL ) { - x += (int)toolSize.x; + y += (int)toolSize.y; } else { - y += (int)toolSize.y; + x += (int)toolSize.x; } noButtons ++; } else { m_macToolHandles.Add( NULL ) ; - if ( GetWindowStyleFlag() & wxTB_HORIZONTAL ) + + if ( GetWindowStyleFlag() & wxTB_VERTICAL ) { - x += (int)toolSize.x / 4; + y += (int)toolSize.y / 4; } else { - y += (int)toolSize.y / 4; + x += (int)toolSize.x / 4; } } if ( toolbarrect.left + x + m_xMargin + kwxMacToolBarLeftMargin - m_x - localOrigin.h > maxWidth) { @@ -358,9 +361,9 @@ void wxToolBar::MacSuperChangedPosition() { Point localOrigin ; - Rect clipRect ; - WindowRef window ; - wxWindow *win ; + // Rect clipRect ; + // WindowRef window ; + // wxWindow *win ; int lx , ly ; lx = ly = 0 ; MacWindowToRootWindow( &lx , &ly ) ; @@ -388,46 +391,46 @@ void wxToolBar::MacSuperChangedPosition() int toolcount = 0 ; { WindowRef rootwindow = (WindowRef) MacGetRootWindow() ; - while (node) - { - wxToolBarTool *tool = (wxToolBarTool *)node->Data(); - wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetBitmap1().GetRefData()) ; - - if( !tool->IsSeparator() ) - { - 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 ; - - ControlHandle m_macToolHandle = (ControlHandle) m_macToolHandles[toolcount++] ; - - { - Rect contrlRect ; - GetControlBounds( m_macToolHandle , &contrlRect ) ; - int former_mac_x = contrlRect.left ; - int former_mac_y = contrlRect.top ; - int mac_x = toolrect.left ; - int mac_y = toolrect.top ; - - if ( mac_x != former_mac_x || mac_y != former_mac_y ) - { - { - Rect inval = { former_mac_y , former_mac_x , former_mac_y + toolSize.y , former_mac_x + toolSize.y } ; - InvalWindowRect( rootwindow , &inval ) ; - } - UMAMoveControl( m_macToolHandle , mac_x , mac_y ) ; - { - Rect inval = { mac_y , mac_x , mac_y + toolSize.y , mac_x + toolSize.y } ; - InvalWindowRect( rootwindow , &inval ) ; - } - } - } - - x += (int)toolSize.x; - noButtons ++; - } - else - { + while (node) + { + wxToolBarTool *tool = (wxToolBarTool *)node->Data(); + wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().GetRefData()) ; + + if( !tool->IsSeparator() ) + { + 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 ; + + ControlHandle m_macToolHandle = (ControlHandle) m_macToolHandles[toolcount++] ; + + { + Rect contrlRect ; + GetControlBounds( m_macToolHandle , &contrlRect ) ; + int former_mac_x = contrlRect.left ; + int former_mac_y = contrlRect.top ; + int mac_x = toolrect.left ; + int mac_y = toolrect.top ; + + if ( mac_x != former_mac_x || mac_y != former_mac_y ) + { + { + Rect inval = { former_mac_y , former_mac_x , former_mac_y + toolSize.y , former_mac_x + toolSize.y } ; + InvalWindowRect( rootwindow , &inval ) ; + } + UMAMoveControl( m_macToolHandle , mac_x , mac_y ) ; + { + Rect inval = { mac_y , mac_x , mac_y + toolSize.y , mac_x + toolSize.y } ; + InvalWindowRect( rootwindow , &inval ) ; + } + } + } + + x += (int)toolSize.x; + noButtons ++; + } + else + { toolcount++ ; x += (int)toolSize.x / 4; } @@ -559,76 +562,75 @@ void wxToolBar::OnPaint(wxPaintEvent& event) wxPaintDC dc(this) ; wxMacPortSetter helper(&dc) ; - Rect toolbarrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , - dc.YLOG2DEVMAC(m_height) , dc.XLOG2DEVMAC(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] ) ; - } - } - } + Rect toolbarrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , + dc.YLOG2DEVMAC(m_height) , dc.XLOG2DEVMAC(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] ) ; + } + } + } } 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 = (WindowRef) MacGetRootWindow() ; - - 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 ( control && ::IsControlActive( control ) ) - { - { - if ( controlpart == kControlIndicatorPart && !UMAHasAppearance() ) - controlpart = ::HandleControlClick( control , localwhere , modifiers , (ControlActionUPP) NULL ) ; - else - controlpart = ::HandleControlClick( 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 ) ; - } - } - } - } - } + 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 ; + SInt16 controlpart ; + WindowRef window = (WindowRef) MacGetRootWindow() ; + + 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 ( control && ::IsControlActive( control ) ) + { + { + if ( controlpart == kControlIndicatorPart && !UMAHasAppearance() ) + controlpart = ::HandleControlClick( control , localwhere , modifiers , (ControlActionUPP) NULL ) ; + else + controlpart = ::HandleControlClick( 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 ) ; + } + } + } + } + } } #endif // wxUSE_TOOLBAR