Applied Blit system options optimization to StretchBlit

[wxWidgets.git] / src / osx / cocoa / button.mm

diff --git a/src/osx/cocoa/button.mm b/src/osx/cocoa/button.mm
index 9efc79667e75c0326f85764f91126737b88ea5f2..3e4288ba8e4debc5134e0aa92857aa3b6e273cb5 100644 (file)
--- a/src/osx/cocoa/button.mm
+++ b/src/osx/cocoa/button.mm
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01

-// RCS-ID:      $Id: button.cpp 54845 2008-07-30 14:52:41Z SC $
+// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -14,119 +14,21 @@
 #include "wx/button.h"
 
 #ifndef WX_PRECOMP
 #include "wx/button.h"
 
 #ifndef WX_PRECOMP

-    #include "wx/panel.h"
-    #include "wx/toplevel.h"
-    #include "wx/dcclient.h"

 #endif
 
 #endif
 

-#include "wx/stockitem.h"
-

 #include "wx/osx/private.h"
 
 #include "wx/osx/private.h"
 

-wxSize wxButton::DoGetBestSize() const
-{
-    if ( GetId() == wxID_HELP )
-        return wxSize( 23 , 23 ) ;
-
-    wxSize sz = GetDefaultSize() ;
-
-    switch (GetWindowVariant())
-    {
-        case wxWINDOW_VARIANT_NORMAL:
-        case wxWINDOW_VARIANT_LARGE:
-            sz.y = 23 ;
-            break;
-
-        case wxWINDOW_VARIANT_SMALL:
-            sz.y = 17 ;
-            break;
-
-        case wxWINDOW_VARIANT_MINI:
-            sz.y = 15 ;
-            break;
-
-        default:
-            break;
-    }
-
-    wxRect r ;
-        
-    m_peer->GetBestRect(&r);
-
-    if ( r.GetWidth() == 0 && r.GetHeight() == 0 )
-    {
-    }
-    sz.x = r.GetWidth();
-    sz.y = r.GetHeight();
-
-    int wBtn = 96;
-    
-    if ((wBtn > sz.x) || ( GetWindowStyle() & wxBU_EXACTFIT))
-        sz.x = wBtn;
-
-#if wxOSX_USE_CARBON
-    Rect    bestsize = { 0 , 0 , 0 , 0 } ;
-    m_peer->GetBestRect( &bestsize ) ;
-
-    int wBtn;
-    if ( EmptyRect( &bestsize ) || ( GetWindowStyle() & wxBU_EXACTFIT) )
-    {
-        Point bounds;
-
-        ControlFontStyleRec controlFont;
-        OSStatus err = m_peer->GetData<ControlFontStyleRec>( kControlEntireControl, kControlFontStyleTag, &controlFont );
-        verify_noerr( err );
-
-        wxCFStringRef str( m_label,  GetFont().GetEncoding() );
-
-#if wxOSX_USE_ATSU_TEXT
-        SInt16 baseline;
-        if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont )
-        {
-            err = GetThemeTextDimensions(
-                (!m_label.empty() ? (CFStringRef)str : CFSTR(" ")),
-                m_font.MacGetThemeFontID(), kThemeStateActive, false, &bounds, &baseline );
-            verify_noerr( err );
-        }
-        else
-#endif
-        {
-            wxClientDC dc(const_cast<wxButton*>(this));
-            wxCoord width, height ;
-            dc.GetTextExtent( m_label , &width, &height);
-            bounds.h = width;
-            bounds.v = height;
-        }
-
-        wBtn = bounds.h + sz.y;
-    }
-    else
-    {
-        wBtn = bestsize.right - bestsize.left ;
-        // non 'normal' window variants don't return the correct height
-        // sz.y = bestsize.bottom - bestsize.top ;
-    }
-    if ((wBtn > sz.x) || ( GetWindowStyle() & wxBU_EXACTFIT))
-        sz.x = wBtn;
-#endif
-
-    return sz ;
-}
+#if wxUSE_MARKUP
+    #include "wx/osx/cocoa/private/markuptoattr.h"
+#endif // wxUSE_MARKUP

 
 

-wxSize wxButton::GetDefaultSize()
-{
-    int wBtn = 70 ;
-    int hBtn = 20 ;
-
-    return wxSize(wBtn, hBtn);
-}

 
 @implementation wxNSButton
 
 + (void)initialize
 {
     static BOOL initialized = NO;
 
 @implementation wxNSButton
 
 + (void)initialize
 {
     static BOOL initialized = NO;

-    if (!initialized) 
+    if (!initialized)

     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );
     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );


@@ -162,96 +64,253 @@ wxSize wxButton::GetDefaultSize()
     }
 }
 
     }
 }
 

+- (void) setTrackingTag: (NSTrackingRectTag)tag
+{
+    rectTag = tag;
+}
+
+- (NSTrackingRectTag) trackingTag
+{
+    return rectTag;
+}
+

 @end
 
 @end
 

+@interface NSView(PossibleSizeMethods)
+- (NSControlSize)controlSize;
+@end

 
 

-wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer, 
-                                    wxWindowMac* WXUNUSED(parent), 
-                                    wxWindowID id, 
-                                    const wxString& WXUNUSED(label),
-                                    const wxPoint& pos, 
-                                    const wxSize& size,
-                                    long WXUNUSED(style), 
-                                    long WXUNUSED(extraStyle)) 
+namespace

 {
 {

-    NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
-    wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
-    
-    if ( id == wxID_HELP )
+
+class wxButtonCocoaImpl : public wxWidgetCocoaImpl, public wxButtonImpl
+{
+public:
+    wxButtonCocoaImpl(wxWindowMac *wxpeer, wxNSButton *v)
+        : wxWidgetCocoaImpl(wxpeer, v)

     {
     {

-        [v setBezelStyle:NSHelpButtonBezelStyle];
+        SetNeedsFrame(false);

     }
     }

-    else
+
+    virtual void SetBitmap(const wxBitmap& bitmap)

     {
     {

-        [v setBezelStyle:NSRoundedBezelStyle];
+        // switch bezel style for plain pushbuttons
+        if ( bitmap.IsOk() )
+        {
+            if ([GetNSButton() bezelStyle] == NSRoundedBezelStyle)
+                [GetNSButton() setBezelStyle:NSRegularSquareBezelStyle];
+        }
+        else
+        {
+            [GetNSButton() setBezelStyle:NSRoundedBezelStyle];
+        }
+        
+        wxWidgetCocoaImpl::SetBitmap(bitmap);

     }
     }

-    
-    [v setButtonType:NSMomentaryPushInButton];
-    wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
-    return c;
-/*
-    OSStatus err;
-    Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
-    wxMacControl* peer = new wxMacControl(wxpeer) ;
-    if ( id == wxID_HELP )
+
+#if wxUSE_MARKUP
+    virtual void SetLabelMarkup(const wxString& markup)

     {
     {

-        ControlButtonContentInfo info ;
-        info.contentType = kControlContentIconRef ;
-        GetIconRef(kOnSystemDisk, kSystemIconsCreator, kHelpIcon, &info.u.iconRef);
-        err = CreateRoundButtonControl(
-            MAC_WXHWND(parent->MacGetTopLevelWindowRef()),
-            &bounds, kControlRoundButtonNormalSize,
-            &info, peer->GetControlRefAddr() );
+        wxMarkupToAttrString toAttr(GetWXPeer(), markup);
+        NSMutableAttributedString *attrString = toAttr.GetNSAttributedString();
+
+        // Button text is always centered.
+        NSMutableParagraphStyle *
+            paragraphStyle = [[NSMutableParagraphStyle alloc] init];
+        [paragraphStyle setAlignment: NSCenterTextAlignment];
+        [attrString addAttribute:NSParagraphStyleAttributeName
+                    value:paragraphStyle
+                    range:NSMakeRange(0, [attrString length])];
+        [paragraphStyle release];
+
+        [GetNSButton() setAttributedTitle:attrString];

     }
     }

-    else if ( label.Find('\n' ) == wxNOT_FOUND && label.Find('\r' ) == wxNOT_FOUND)
+#endif // wxUSE_MARKUP
+
+    void SetPressedBitmap( const wxBitmap& bitmap )

     {
     {

-        // Button height is static in Mac, can't be changed, so we need to force it here
-        int maxHeight;
-        switch (wxpeer->GetWindowVariant() ) 
+        NSButton* button = GetNSButton();
+        [button setAlternateImage: bitmap.GetNSImage()];
+        [button setButtonType:NSMomentaryChangeButton];
+    }
+
+    void GetLayoutInset(int &left , int &top , int &right, int &bottom) const
+    {
+        left = top = right = bottom = 0;
+        NSControlSize size = NSRegularControlSize;
+        if ( [m_osxView respondsToSelector:@selector(controlSize)] )
+            size = [m_osxView controlSize];
+        else if ([m_osxView respondsToSelector:@selector(cell)])
+        {
+            id cell = [(id)m_osxView cell];
+            if ([cell respondsToSelector:@selector(controlSize)])
+                size = [cell controlSize];
+        }
+        
+        if ( [GetNSButton() bezelStyle] == NSRoundedBezelStyle )

         {
         {

-            case wxWINDOW_VARIANT_NORMAL:
-            case wxWINDOW_VARIANT_LARGE:
-                maxHeight = 20 ;
-                break;
-            case wxWINDOW_VARIANT_SMALL:
-                maxHeight = 17;
-            case wxWINDOW_VARIANT_MINI:
-                maxHeight = 15;
-            default:
-                break;
+            switch( size )
+            {
+                case NSRegularControlSize:
+                    left = right = 6;
+                    top = 4;
+                    bottom = 8;
+                    break;
+                case NSSmallControlSize:
+                    left = right = 5;
+                    top = 4;
+                    bottom = 7;
+                    break;
+                case NSMiniControlSize:
+                    left = right = 1;
+                    top = 0;
+                    bottom = 2;
+                    break;
+            }

         }
         }

-        bounds.bottom = bounds.top + maxHeight ;
-        wxpeer->SetMaxSize( wxSize( wxpeer->GetMaxWidth() , maxHeight ));
-        err = CreatePushButtonControl(
-            MAC_WXHWND(parent->MacGetTopLevelWindowRef()),
-            &bounds, CFSTR(""), peer->GetControlRefAddr() );
+    }
+    
+    
+private:
+    NSButton *GetNSButton() const
+    {
+        wxASSERT( [m_osxView isKindOfClass:[NSButton class]] );
+
+        return static_cast<NSButton *>(m_osxView);
+    }
+};
+
+} // anonymous namespace
+
+extern "C" void SetBezelStyleFromBorderFlags(NSButton *v, long style);
+    
+// set bezel style depending on the wxBORDER_XXX flags specified by the style
+void SetBezelStyleFromBorderFlags(NSButton *v, long style)
+{
+    if ( style & wxBORDER_NONE )
+    {
+        [v setBezelStyle:NSShadowlessSquareBezelStyle];
+        [v setBordered:NO];
+    }
+    else // we do have a border
+    {
+        // see trac #11128 for a thorough discussion
+        if ( (style & wxBORDER_MASK) == wxBORDER_RAISED )
+            [v setBezelStyle:NSRegularSquareBezelStyle];
+        else if ( (style & wxBORDER_MASK) == wxBORDER_SUNKEN )
+            [v setBezelStyle:NSSmallSquareBezelStyle];
+        else if ( (style & wxBORDER_MASK) == wxBORDER_SIMPLE )
+            [v setBezelStyle:NSShadowlessSquareBezelStyle];
+        else
+            [v setBezelStyle:NSRegularSquareBezelStyle];
+    }
+}
+
+
+wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer,
+                                    wxWindowMac* WXUNUSED(parent),
+                                    wxWindowID id,
+                                    const wxString& label,
+                                    const wxPoint& pos,
+                                    const wxSize& size,
+                                    long style,
+                                    long WXUNUSED(extraStyle))
+{
+    NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
+    wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
+
+    // We can't display a custom label inside a button with help bezel style so
+    // we only use it if we are using the default label. wxButton itself checks
+    // if the label is just "Help" in which case it discards it and passes us
+    // an empty string.
+    if ( id == wxID_HELP && label.empty() )
+    {
+        [v setBezelStyle:NSHelpButtonBezelStyle];

     }
     else
     {
     }
     else
     {

-        ControlButtonContentInfo info ;
-        info.contentType = kControlNoContent ;
-        err = CreateBevelButtonControl(
-            MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds, CFSTR(""),
-            kControlBevelButtonLargeBevel, kControlBehaviorPushbutton,
-            &info, 0, 0, 0, peer->GetControlRefAddr() );
+        if ( style & wxBORDER_NONE )
+        {
+            [v setBezelStyle:NSShadowlessSquareBezelStyle];
+            [v setBordered:NO];
+        }
+        else 
+        {
+            // the following styles only exist for certain sizes, so avoid them for
+            // multi-line
+            if ( label.Find('\n' ) == wxNOT_FOUND && label.Find('\r' ) == wxNOT_FOUND)
+            {
+                if ( (style & wxBORDER_MASK) == wxBORDER_RAISED )
+                    [v setBezelStyle:NSRoundedBezelStyle];
+                else if ( (style & wxBORDER_MASK) == wxBORDER_SUNKEN )
+                    [v setBezelStyle:NSTexturedRoundedBezelStyle];
+                else if ( (style & wxBORDER_MASK) == wxBORDER_SIMPLE )
+                    [v setBezelStyle:NSShadowlessSquareBezelStyle];
+                else
+                    [v setBezelStyle:NSRoundedBezelStyle];
+            }
+            else 
+            {
+                if ( (style & wxBORDER_MASK) == wxBORDER_RAISED )
+                    [v setBezelStyle:NSRegularSquareBezelStyle];
+                else if ( (style & wxBORDER_MASK) == wxBORDER_SUNKEN )
+                    [v setBezelStyle:NSSmallSquareBezelStyle];
+                else if ( (style & wxBORDER_MASK) == wxBORDER_SIMPLE )
+                    [v setBezelStyle:NSShadowlessSquareBezelStyle];
+                else
+                    [v setBezelStyle:NSRegularSquareBezelStyle];
+            }
+
+        }

     }
     }

-    verify_noerr( err );
-    return peer;
-    */
+    
+    [v setButtonType:NSMomentaryPushInButton];
+    return new wxButtonCocoaImpl( wxpeer, v );

 }
 
 void wxWidgetCocoaImpl::SetDefaultButton( bool isDefault )
 }
 
 void wxWidgetCocoaImpl::SetDefaultButton( bool isDefault )

-{ 
-    if ( isDefault && [m_osxView isKindOfClass:[NSButton class]] )
-        // NOTE: setKeyEquivalent: nil will trigger an assert
-        // instead do not call in that case.
-        [(NSButton*)m_osxView setKeyEquivalent: @"\r" ];
+{
+    if ( [m_osxView isKindOfClass:[NSButton class]] )
+    {
+        if ( isDefault )
+            [(NSButton*)m_osxView setKeyEquivalent: @"\r" ];
+        else
+            [(NSButton*)m_osxView setKeyEquivalent: @"" ];
+    }
+}
+
+void wxWidgetCocoaImpl::PerformClick()
+{
+    if ([m_osxView isKindOfClass:[NSControl class]])
+        [(NSControl*)m_osxView performClick:nil];

 }
 
 }
 

-void wxWidgetCocoaImpl::PerformClick() 
+#if wxUSE_BMPBUTTON
+
+wxWidgetImplType* wxWidgetImpl::CreateBitmapButton( wxWindowMac* wxpeer,
+                                                   wxWindowMac* WXUNUSED(parent),
+                                                   wxWindowID WXUNUSED(id),
+                                                   const wxBitmap& bitmap,
+                                                   const wxPoint& pos,
+                                                   const wxSize& size,
+                                                   long style,
+                                                   long WXUNUSED(extraStyle))

 {
 {

+    NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
+    wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
+
+    SetBezelStyleFromBorderFlags(v, style);
+
+    if (bitmap.IsOk())
+        [v setImage:bitmap.GetNSImage() ];
+
+    [v setButtonType:NSMomentaryPushInButton];
+    wxWidgetCocoaImpl* c = new wxButtonCocoaImpl( wxpeer, v );
+    return c;

 }
 
 }
 

+#endif // wxUSE_BMPBUTTON
+

 //
 // wxDisclosureButton implementation
 //
 //
 // wxDisclosureButton implementation
 //


@@ -292,7 +351,7 @@ static const char * disc_triangle_xpm[] = {
 + (void)initialize
 {
     static BOOL initialized = NO;
 + (void)initialize
 {
     static BOOL initialized = NO;

-    if (!initialized) 
+    if (!initialized)

     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );
     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );


@@ -302,7 +361,6 @@ static const char * disc_triangle_xpm[] = {
 - (id) initWithFrame:(NSRect) frame
 {
     self = [super initWithFrame:frame];
 - (id) initWithFrame:(NSRect) frame
 {
     self = [super initWithFrame:frame];

-    [self setBezelStyle:NSSmallSquareBezelStyle];

     isOpen = NO;
     [self setImagePosition:NSImageLeft];
     [self updateImage];
     isOpen = NO;
     [self setImagePosition:NSImageLeft];
     [self updateImage];


@@ -333,9 +391,9 @@ wxCFRef<NSImage*> downArray ;
     static wxBitmap trianglebm(disc_triangle_xpm);
     if ( downArray.get() == NULL )
     {
     static wxBitmap trianglebm(disc_triangle_xpm);
     if ( downArray.get() == NULL )
     {

-        downArray.reset( [wxDisclosureNSButton rotateImage:trianglebm.GetNSImage()] );
+        downArray.reset( [[wxDisclosureNSButton rotateImage:trianglebm.GetNSImage()] retain] );

     }
     }

-    
+

     if ( isOpen )
         [self setImage:(NSImage*)downArray.get()];
     else
     if ( isOpen )
         [self setImage:(NSImage*)downArray.get()];
     else


@@ -347,21 +405,21 @@ wxCFRef<NSImage*> downArray ;
     NSSize imageSize = [image size];
     NSSize newImageSize = NSMakeSize(imageSize.height, imageSize.width);
     NSImage* newImage = [[NSImage alloc] initWithSize: newImageSize];
     NSSize imageSize = [image size];
     NSSize newImageSize = NSMakeSize(imageSize.height, imageSize.width);
     NSImage* newImage = [[NSImage alloc] initWithSize: newImageSize];

- 
+

     [newImage lockFocus];
     [newImage lockFocus];

-    
+

     NSAffineTransform* tm = [NSAffineTransform transform];
     [tm translateXBy:newImageSize.width/2 yBy:newImageSize.height/2];
     [tm rotateByDegrees:-90];
     [tm translateXBy:-newImageSize.width/2 yBy:-newImageSize.height/2];
     [tm concat];
     NSAffineTransform* tm = [NSAffineTransform transform];
     [tm translateXBy:newImageSize.width/2 yBy:newImageSize.height/2];
     [tm rotateByDegrees:-90];
     [tm translateXBy:-newImageSize.width/2 yBy:-newImageSize.height/2];
     [tm concat];

-    
-    
+
+

     [image drawInRect:NSMakeRect(0,0,newImageSize.width, newImageSize.height)
         fromRect:NSZeroRect operation:NSCompositeCopy fraction:1.0];
     [image drawInRect:NSMakeRect(0,0,newImageSize.width, newImageSize.height)
         fromRect:NSZeroRect operation:NSCompositeCopy fraction:1.0];

-    
+

     [newImage unlockFocus];
     [newImage unlockFocus];

-    return newImage;
+    return [newImage autorelease];

 }
 
 @end
 }
 
 @end


@@ -373,7 +431,7 @@ public :
         wxWidgetCocoaImpl(peer, w)
     {
     }
         wxWidgetCocoaImpl(peer, w)
     {
     }

-    
+

     ~wxDisclosureTriangleCocoaImpl()
     {
     }
     ~wxDisclosureTriangleCocoaImpl()
     {
     }


@@ -386,18 +444,21 @@ public :
     }
 };
 
     }
 };
 

-wxWidgetImplType* wxWidgetImpl::CreateDisclosureTriangle( wxWindowMac* wxpeer, 
-                                    wxWindowMac* WXUNUSED(parent), 
-                                    wxWindowID WXUNUSED(id), 
+wxWidgetImplType* wxWidgetImpl::CreateDisclosureTriangle( wxWindowMac* wxpeer,
+                                    wxWindowMac* WXUNUSED(parent),
+                                    wxWindowID WXUNUSED(winid),

                                     const wxString& label,
                                     const wxString& label,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long WXUNUSED(style), 
-                                    long WXUNUSED(extraStyle)) 
+                                    long style,
+                                    long WXUNUSED(extraStyle))

 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxDisclosureNSButton* v = [[wxDisclosureNSButton alloc] initWithFrame:r];
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxDisclosureNSButton* v = [[wxDisclosureNSButton alloc] initWithFrame:r];

-    [v setTitle:wxCFStringRef( label).AsNSString()];
-    wxDisclosureTriangleCocoaImpl* c = new wxDisclosureTriangleCocoaImpl( wxpeer, v );
-    return c;
+    if ( !label.empty() )
+        [v setTitle:wxCFStringRef(label).AsNSString()];
+
+    SetBezelStyleFromBorderFlags(v, style);
+
+    return new wxDisclosureTriangleCocoaImpl( wxpeer, v );

 }
 }