Add wxTimer::StartOnce().

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

diff --git a/src/osx/cocoa/button.mm b/src/osx/cocoa/button.mm
index 70469c9894cdd2e42d9dfc70e74ef58c2b4cd2d2..df1e092402d485fd6e8953d4acd89096c278d507 100644 (file)
--- a/src/osx/cocoa/button.mm
+++ b/src/osx/cocoa/button.mm
@@ -4,42 +4,27 @@
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 

-#include "wx/button.h"
-

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+#include "wx/object.h"

 #endif
 
 #endif
 

-#include "wx/osx/private.h"
-
-wxSize wxButton::DoGetBestSize() const
-{
-    if ( GetId() == wxID_HELP )
-        return wxSize( 23 , 23 ) ;
-
-    wxRect r ;
-    m_peer->GetBestRect(&r);
-
-    wxSize sz = r.GetSize();
+#include "wx/button.h"
+#include "wx/toplevel.h"
+#include "wx/tglbtn.h"

 
 

-    const int wBtnStd = GetDefaultSize().x;
+#include "wx/osx/private.h"

 
 

-    if ( (sz.x < wBtnStd) && !HasFlag(wxBU_EXACTFIT) )
-        sz.x = wBtnStd;
+#if wxUSE_MARKUP
+    #include "wx/osx/cocoa/private/markuptoattr.h"
+#endif // wxUSE_MARKUP

 
 

-    return sz ;
-}
-
-wxSize wxButton::GetDefaultSize()
-{
-    return wxSize(84, 23);
-}

 
 @implementation wxNSButton
 
 
 @implementation wxNSButton
 


@@ -82,75 +67,295 @@ wxSize wxButton::GetDefaultSize()
     }
 }
 
     }
 }
 

+- (void) setTrackingTag: (NSTrackingRectTag)tag
+{
+    rectTag = tag;
+}
+
+- (NSTrackingRectTag) trackingTag
+{
+    return rectTag;
+}
+
+@end
+
+@interface NSView(PossibleSizeMethods)
+- (NSControlSize)controlSize;

 @end
 
 @end
 

-namespace
+wxButtonCocoaImpl::wxButtonCocoaImpl(wxWindowMac *wxpeer, wxNSButton *v)
+: wxWidgetCocoaImpl(wxpeer, v)

 {
 {

+    SetNeedsFrame(false);
+}

 
 

-class wxButtonCocoaImpl : public wxWidgetCocoaImpl
+void wxButtonCocoaImpl::SetBitmap(const wxBitmap& bitmap)

 {
 {

-public:
-    wxButtonCocoaImpl(wxWindowMac *wxpeer, wxNSButton *v)
-        : wxWidgetCocoaImpl(wxpeer, v)
+    // switch bezel style for plain pushbuttons
+    if ( bitmap.IsOk() )
+    {
+        if ([GetNSButton() bezelStyle] == NSRoundedBezelStyle)
+            [GetNSButton() setBezelStyle:NSRegularSquareBezelStyle];
+    }
+    else

     {
     {

+        [GetNSButton() setBezelStyle:NSRoundedBezelStyle];

     }
     }

+    
+    wxWidgetCocoaImpl::SetBitmap(bitmap);
+}
+
+#if wxUSE_MARKUP
+void wxButtonCocoaImpl::SetLabelMarkup(const wxString& markup)
+{
+    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];
+}
+#endif // wxUSE_MARKUP

 
 

-    virtual void SetBitmap(const wxBitmap& bitmap)
+void wxButtonCocoaImpl::SetPressedBitmap( const wxBitmap& bitmap )
+{
+    NSButton* button = GetNSButton();
+    [button setAlternateImage: bitmap.GetNSImage()];
+    if ( GetWXPeer()->IsKindOf(wxCLASSINFO(wxToggleButton)) )
+    {
+        [button setButtonType:NSToggleButton];
+    }
+    else

     {
     {

-        [GetNSButton() setBezelStyle:bitmap.IsOk() ? NSRegularSquareBezelStyle
-                                                   : NSRoundedBezelStyle];
+        [button setButtonType:NSMomentaryChangeButton];
+    }
+}

 
 

-        wxWidgetCocoaImpl::SetBitmap(bitmap);
+void wxButtonCocoaImpl::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 )
+    {
+        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;
+        }

     }
     }

+}

 
 

-private:
-    NSButton *GetNSButton() const
+void wxButtonCocoaImpl::SetAcceleratorFromLabel(const wxString& label)
+{
+    const int accelPos = wxControl::FindAccelIndex(label);
+    if ( accelPos != wxNOT_FOUND )

     {
     {

-        wxASSERT( [m_osxView isKindOfClass:[NSButton class]] );
+        wxString accelstring(label[accelPos + 1]); // Skip '&' itself
+        accelstring.MakeLower();
+        wxCFStringRef cfText(accelstring);
+        [GetNSButton() setKeyEquivalent:cfText.AsNSString()];
+        [GetNSButton() setKeyEquivalentModifierMask:NSCommandKeyMask];
+    }
+    else
+    {
+        [GetNSButton() setKeyEquivalent:@""];
+    }
+}

 
 

-        return static_cast<NSButton *>(m_osxView);
+NSButton *wxButtonCocoaImpl::GetNSButton() const
+{
+    wxASSERT( [m_osxView isKindOfClass:[NSButton class]] );
+    
+    return static_cast<NSButton *>(m_osxView);
+}
+
+// Set bezel style depending on the wxBORDER_XXX flags specified by the style
+// and also accounting for the label (bezels are different for multiline
+// buttons and normal ones) and the ID (special bezel is used for help button).
+//
+// This is extern because it's also used in src/osx/cocoa/tglbtn.mm.
+extern "C"
+void
+SetBezelStyleFromBorderFlags(NSButton *v,
+                             long style,
+                             wxWindowID winid,
+                             const wxString& label = wxString(),
+                             const wxBitmap& bitmap = wxBitmap())
+{
+    // 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 ( winid == wxID_HELP && label.empty() )
+    {
+        [v setBezelStyle:NSHelpButtonBezelStyle];

     }
     }

-};
+    else
+    {
+        // We can't use rounded bezel styles neither for multiline buttons nor
+        // for buttons containing (big) icons as they are only meant to be used
+        // at certain sizes, so the style used depends on whether the label is
+        // single or multi line.
+        const bool
+            isSimpleText = (label.find_first_of("\n\r") == wxString::npos)
+                                && (!bitmap.IsOk() || bitmap.GetHeight() < 20);
+
+        NSBezelStyle bezel;
+        switch ( style & wxBORDER_MASK )
+        {
+            case wxBORDER_NONE:
+                bezel = NSShadowlessSquareBezelStyle;
+                [v setBordered:NO];
+                break;
+
+            case wxBORDER_SIMPLE:
+                bezel = NSShadowlessSquareBezelStyle;
+                break;
+
+            case wxBORDER_SUNKEN:
+                bezel = isSimpleText ? NSTexturedRoundedBezelStyle
+                                     : NSSmallSquareBezelStyle;
+                break;
+
+            default:
+                wxFAIL_MSG( "Unknown border style" );
+                // fall through
+
+            case 0:
+            case wxBORDER_STATIC:
+            case wxBORDER_RAISED:
+            case wxBORDER_THEME:
+                bezel = isSimpleText ? NSRoundedBezelStyle
+                                     : NSRegularSquareBezelStyle;
+                break;
+        }
+
+        [v setBezelStyle:bezel];
+    }
+}
+
+// Set the keyboard accelerator key from the label (e.g. "Click &Me")
+void wxButton::OSXUpdateAfterLabelChange(const wxString& label)
+{
+    wxButtonCocoaImpl *impl = static_cast<wxButtonCocoaImpl*>(GetPeer());
+
+    // Update the bezel style as may be necessary if our new label is multi
+    // line while the old one wasn't (or vice versa).
+    SetBezelStyleFromBorderFlags(impl->GetNSButton(),
+                                 GetWindowStyle(),
+                                 GetId(),
+                                 label);
+
+
+    // Skip setting the accelerator for the default buttons as this would
+    // overwrite the default "Enter" which should be preserved.
+    wxTopLevelWindow * const
+        tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
+    if ( tlw )
+    {
+        if ( tlw->GetDefaultItem() == this )
+            return;
+    }
+
+    impl->SetAcceleratorFromLabel(label);
+}

 
 

-} // anonymous namespace

 
 wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer,
                                     wxWindowMac* WXUNUSED(parent),
 
 wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer,
                                     wxWindowMac* WXUNUSED(parent),

-                                    wxWindowID id,
-                                    const wxString& WXUNUSED(label),
+                                    wxWindowID winid,
+                                    const wxString& label,

                                     const wxPoint& pos,
                                     const wxSize& size,
                                     const wxPoint& pos,
                                     const wxSize& size,

-                                    long WXUNUSED(style),
+                                    long style,

                                     long WXUNUSED(extraStyle))
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
 
                                     long WXUNUSED(extraStyle))
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
 

-    if ( id == wxID_HELP )
-    {
-        [v setBezelStyle:NSHelpButtonBezelStyle];
-    }
-    else
-    {
-        [v setBezelStyle:NSRoundedBezelStyle];
-    }
+    SetBezelStyleFromBorderFlags(v, style, winid, label);

 
     [v setButtonType:NSMomentaryPushInButton];
 
     [v setButtonType:NSMomentaryPushInButton];

-    return new wxButtonCocoaImpl( wxpeer, v );
+    wxButtonCocoaImpl* const impl = new wxButtonCocoaImpl( wxpeer, v );
+    impl->SetAcceleratorFromLabel(label);
+    return impl;

 }
 
 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" ];
+            [(NSButton*)m_osxView setKeyEquivalentModifierMask: 0];
+        }
+        else
+            [(NSButton*)m_osxView setKeyEquivalent: @"" ];
+    }

 }
 
 void wxWidgetCocoaImpl::PerformClick()
 {
 }
 
 void wxWidgetCocoaImpl::PerformClick()
 {

+    if ([m_osxView isKindOfClass:[NSControl class]])
+        [(NSControl*)m_osxView performClick:nil];
+}
+
+#if wxUSE_BMPBUTTON
+
+wxWidgetImplType* wxWidgetImpl::CreateBitmapButton( wxWindowMac* wxpeer,
+                                                   wxWindowMac* WXUNUSED(parent),
+                                                   wxWindowID winid,
+                                                   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, winid, wxString(), bitmap);
+
+    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
 //


@@ -201,7 +406,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];


@@ -232,7 +436,7 @@ 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 )
     }
 
     if ( isOpen )


@@ -260,7 +464,7 @@ wxCFRef<NSImage*> downArray ;
         fromRect:NSZeroRect operation:NSCompositeCopy fraction:1.0];
 
     [newImage unlockFocus];
         fromRect:NSZeroRect operation:NSCompositeCopy fraction:1.0];
 
     [newImage unlockFocus];

-    return newImage;
+    return [newImage autorelease];

 }
 
 @end
 }
 
 @end


@@ -287,16 +491,19 @@ public :
 
 wxWidgetImplType* wxWidgetImpl::CreateDisclosureTriangle( wxWindowMac* wxpeer,
                                     wxWindowMac* WXUNUSED(parent),
 
 wxWidgetImplType* wxWidgetImpl::CreateDisclosureTriangle( wxWindowMac* wxpeer,
                                     wxWindowMac* WXUNUSED(parent),

-                                    wxWindowID WXUNUSED(id),
+                                    wxWindowID winid,

                                     const wxString& label,
                                     const wxPoint& pos,
                                     const wxSize& size,
                                     const wxString& label,
                                     const wxPoint& pos,
                                     const wxSize& size,

-                                    long WXUNUSED(style),
+                                    long style,

                                     long WXUNUSED(extraStyle))
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxDisclosureNSButton* v = [[wxDisclosureNSButton alloc] initWithFrame:r];
                                     long WXUNUSED(extraStyle))
 {
     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, winid, label);
+
+    return new wxDisclosureTriangleCocoaImpl( wxpeer, v );

 }
 }