X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fdaf613add176525ed8b6cafaf278dfd80f85074..050c9e3c90c58b05d5b3f7384d1556ca9669f13e:/src/mac/carbon/toolbar.cpp?ds=sidebyside diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp index df820b8cb9..f88f68b24f 100644 --- a/src/mac/carbon/toolbar.cpp +++ b/src/mac/carbon/toolbar.cpp @@ -19,6 +19,7 @@ #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) @@ -29,7 +30,7 @@ BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase) END_EVENT_TABLE() #endif -#include +#include "wx/mac/uma.h" // ---------------------------------------------------------------------------- // private classes @@ -160,235 +161,177 @@ wxToolBar::~wxToolBar() // 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 ) -{ - 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 -} - bool wxToolBar::Realize() { - if (m_tools.Number() == 0) - return FALSE; + if (m_tools.Number() == 0) + return FALSE; - Point localOrigin ; - Rect clipRect ; - WindowRef window ; - wxWindow *win ; - - GetParent()->MacGetPortParams( &localOrigin , &clipRect , &window , &win ) ; + 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 ; + 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() ; + controlstyle.flags = kControlUseFontMask ; + controlstyle.font = kControlFontSmallSystemFont ; + + wxNode *node = m_tools.First(); + int noButtons = 0; + int x = 0 ; + int y = 0 ; + wxSize toolSize = GetToolSize() ; int tw, th; GetSize(& tw, & th); int maxWidth = 0 ; int maxHeight = 0 ; - 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 ; - - 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" , false , 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" , false , 0 , - behaviour , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ; - } - UMAShowControl( m_macToolHandle ) ; - 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 + m_xMargin + kwxMacToolBarLeftMargin- m_x - localOrigin.h > maxWidth) - maxWidth = toolbarrect.left + x + kwxMacToolBarLeftMargin+ m_xMargin - m_x - localOrigin.h; - if (toolbarrect.top + m_yMargin + kwxMacToolBarTopMargin - m_y - localOrigin.v > maxHeight) - maxHeight = toolbarrect.top + kwxMacToolBarTopMargin + m_yMargin - m_y - localOrigin.v ; - - node = node->Next(); - } - - if ( GetWindowStyleFlag() & wxTB_HORIZONTAL ) - { - if ( m_maxRows == 0 ) + while (node) { - // if not set yet, only one row - SetRows(1); + wxToolBarTool *tool = (wxToolBarTool *)node->Data(); + wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetBitmap1().GetRefData()) ; + + if( !tool->IsSeparator() ) + { + Rect toolrect = { toolbarrect.top + y + m_yMargin + kwxMacToolBarTopMargin, + toolbarrect.left + x + m_xMargin + kwxMacToolBarLeftMargin , 0 , 0 } ; + toolrect.right = toolrect.left + toolSize.x ; + toolrect.bottom = toolrect.top + toolSize.y ; + + ControlButtonContentInfo info ; + if ( bmap ) + { + if ( bmap->m_bitmapType == kMacBitmapTypePict ) + { + info.contentType = kControlContentPictHandle ; + info.u.picture = bmap->m_hPict ; + } + else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld ) + { + if ( tool->GetBitmap1().GetMask() ) + { + info.contentType = kControlContentCIconHandle ; + info.u.cIconHandle = wxMacCreateCIcon( bmap->m_hBitmap , tool->GetBitmap1().GetMask()->GetMaskBitmap() , + 8 , 16 ) ; + } + else + { + info.contentType = kControlContentCIconHandle ; + info.u.cIconHandle = wxMacCreateCIcon( bmap->m_hBitmap , NULL , + 8 , 16 ) ; + } + } + } + + ControlHandle m_macToolHandle ; + + SInt16 behaviour = kControlBehaviorOffsetContents ; + if ( tool->CanBeToggled() ) + behaviour += kControlBehaviorToggles ; + + if ( info.u.cIconHandle ) // since it is a handle we can use one of them + { + m_macToolHandle = ::NewControl( window , &toolrect , "\p" , false , 0 , + behaviour + info.contentType , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ; + + ::SetControlData( m_macToolHandle , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ; + } + else + { + m_macToolHandle = ::NewControl( window , &toolrect , "\p" , false , 0 , + behaviour , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ; + } + UMAShowControl( m_macToolHandle ) ; + 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 ) ; + } + else + { + ::SetControlValue( m_macToolHandle , 0 ) ; + } + /* + ::SetControlFontStyle( m_macToolHandle , &controlstyle ) ; + */ + ControlHandle container = GetParent()->MacGetContainerForEmbedding() ; + wxASSERT_MSG( container != NULL , "No valid mac container control" ) ; + ::EmbedControl( m_macToolHandle , container ) ; + + if ( GetWindowStyleFlag() & wxTB_HORIZONTAL ) + { + x += (int)toolSize.x; + } + else + { + y += (int)toolSize.y; + } + noButtons ++; + } + else + { + m_macToolHandles.Add( NULL ) ; + if ( GetWindowStyleFlag() & wxTB_HORIZONTAL ) + { + x += (int)toolSize.x / 4; + } + else + { + y += (int)toolSize.y / 4; + } + } + if ( toolbarrect.left + x + m_xMargin + kwxMacToolBarLeftMargin - m_x - localOrigin.h > maxWidth) { + maxWidth = toolbarrect.left + x + m_xMargin + kwxMacToolBarLeftMargin - m_x - localOrigin.h; + } + if (toolbarrect.top + y + m_yMargin + kwxMacToolBarTopMargin - m_y - localOrigin.v > maxHeight) { + maxHeight = toolbarrect.top + y + m_yMargin + kwxMacToolBarTopMargin - m_y - localOrigin.v ; + } + node = node->Next(); } - maxWidth = tw ; - maxHeight += toolSize.y; - maxHeight += m_yMargin + kwxMacToolBarTopMargin; - m_maxHeight = maxHeight ; - } - else - { - if ( noButtons > 0 && m_maxRows == 0 ) + + if ( GetWindowStyleFlag() & wxTB_HORIZONTAL ) { - // if not set yet, have one column - SetRows(noButtons); + if ( m_maxRows == 0 ) + { + // if not set yet, only one row + SetRows(1); + } + maxWidth = tw ; + maxHeight += toolSize.y; + maxHeight += m_yMargin + kwxMacToolBarTopMargin; + m_maxHeight = maxHeight ; } - maxHeight = th ; - maxWidth += toolSize.x; - maxWidth += m_xMargin + kwxMacToolBarLeftMargin; - m_maxWidth = maxWidth ; - } - - SetSize(maxWidth, maxHeight); - - return TRUE; + else + { + if ( noButtons > 0 && m_maxRows == 0 ) + { + // if not set yet, have one column + SetRows(noButtons); + } + maxHeight = th ; + maxWidth += toolSize.x; + maxWidth += m_xMargin + kwxMacToolBarLeftMargin; + m_maxWidth = maxWidth ; + } + + SetSize(maxWidth, maxHeight); + + return TRUE; } void wxToolBar::SetToolBitmapSize(const wxSize& size) { - m_defaultWidth = size.x+2; m_defaultHeight = size.y+2; + m_defaultWidth = size.x+4; m_defaultHeight = size.y+4; } // The button size is bigger than the bitmap size @@ -458,7 +401,7 @@ void wxToolBar::MacSuperChangedPosition() { WindowRef rootwindow = GetMacRootWindow() ; wxWindow* wxrootwindow = wxFindWinFromMacWindow( rootwindow ) ; - UMASetThemeWindowBackground( rootwindow , kThemeBrushDialogBackgroundActive , false ) ; + ::SetThemeWindowBackground( rootwindow , kThemeBrushDialogBackgroundActive , false ) ; wxMacDrawingHelper focus( wxrootwindow ) ; while (node) { @@ -515,7 +458,7 @@ void wxToolBar::MacSuperChangedPosition() } else { - UMASetThemeWindowBackground( rootwindow , kThemeBrushDocumentWindowBackground , false ) ; + ::SetThemeWindowBackground( rootwindow , kThemeBrushDocumentWindowBackground , false ) ; } } @@ -647,7 +590,7 @@ void wxToolBar::OnPaint(wxPaintEvent& event) { if( parent->MacGetWindowData() ) { - UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ; + ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ; break ; } @@ -675,7 +618,7 @@ void wxToolBar::OnPaint(wxPaintEvent& event) } } } - UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ; + ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ; } } @@ -718,13 +661,13 @@ void wxToolBar::OnMouse( wxMouseEvent &event ) controlpart = FindControl( localwhere , window , &control ) ; { - if ( control && UMAIsControlActive( control ) ) + if ( control && ::IsControlActive( control ) ) { { if ( controlpart == kControlIndicatorPart && !UMAHasAppearance() ) - controlpart = UMAHandleControlClick( control , localwhere , modifiers , (ControlActionUPP) NULL ) ; + controlpart = ::HandleControlClick( control , localwhere , modifiers , (ControlActionUPP) NULL ) ; else - controlpart = UMAHandleControlClick( control , localwhere , modifiers , (ControlActionUPP) -1 ) ; + 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