Fix wrong tab order in wxAuiNotebook after dragging.

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

diff --git a/src/osx/cocoa/button.mm b/src/osx/cocoa/button.mm
index fa8938295dfdc509d1c6484b390e5bb88f1871da..df1e092402d485fd6e8953d4acd89096c278d507 100644 (file)
--- a/src/osx/cocoa/button.mm
+++ b/src/osx/cocoa/button.mm
@@ -11,11 +11,14 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

-#include "wx/button.h"
-

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+#include "wx/object.h"

 #endif
 
 #endif
 

+#include "wx/button.h"
+#include "wx/toplevel.h"
+#include "wx/tglbtn.h"
+

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


@@ -80,185 +83,231 @@
 - (NSControlSize)controlSize;
 @end
 
 - (NSControlSize)controlSize;
 @end
 

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

 {
 {

+    SetNeedsFrame(false);
+}

 
 

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

 {
 {

-public:
-    wxButtonCocoaImpl(wxWindowMac *wxpeer, wxNSButton *v)
-        : wxWidgetCocoaImpl(wxpeer, v)
+    // switch bezel style for plain pushbuttons
+    if ( bitmap.IsOk() )

     {
     {

-        SetNeedsFrame(false);
+        if ([GetNSButton() bezelStyle] == NSRoundedBezelStyle)
+            [GetNSButton() setBezelStyle:NSRegularSquareBezelStyle];

     }
     }

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

     {
     {

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

     }
     }

+    
+    wxWidgetCocoaImpl::SetBitmap(bitmap);
+}

 
 #if wxUSE_MARKUP
 
 #if wxUSE_MARKUP

-    virtual void 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];
-    }
+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
 
 #endif // wxUSE_MARKUP
 

-    void SetPressedBitmap( 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

     {
     {

-        NSButton* button = GetNSButton();
-        [button setAlternateImage: bitmap.GetNSImage()];

         [button setButtonType:NSMomentaryChangeButton];
     }
         [button setButtonType:NSMomentaryChangeButton];
     }

+}

 
 

-    void GetLayoutInset(int &left , int &top , int &right, int &bottom) const
+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)])

     {
     {

-        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;
-            }
-        }
+        id cell = [(id)m_osxView cell];
+        if ([cell respondsToSelector:@selector(controlSize)])
+            size = [cell controlSize];

     }
     
     }
     

-    
-private:
-    NSButton *GetNSButton() const
+    if ( [GetNSButton() bezelStyle] == NSRoundedBezelStyle )

     {
     {

-        wxASSERT( [m_osxView isKindOfClass:[NSButton class]] );
-
-        return static_cast<NSButton *>(m_osxView);
+        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;
+        }

     }
     }

-};
-
-} // 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)
+void wxButtonCocoaImpl::SetAcceleratorFromLabel(const wxString& label)

 {
 {

-    if ( style & wxBORDER_NONE )
+    const int accelPos = wxControl::FindAccelIndex(label);
+    if ( accelPos != wxNOT_FOUND )

     {
     {

-        [v setBezelStyle:NSShadowlessSquareBezelStyle];
-        [v setBordered:NO];
+        wxString accelstring(label[accelPos + 1]); // Skip '&' itself
+        accelstring.MakeLower();
+        wxCFStringRef cfText(accelstring);
+        [GetNSButton() setKeyEquivalent:cfText.AsNSString()];
+        [GetNSButton() setKeyEquivalentModifierMask:NSCommandKeyMask];

     }
     }

-    else // we do have a border
+    else

     {
     {

-        // 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];
+        [GetNSButton() setKeyEquivalent:@""];

     }
 }
 
     }
 }
 

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

 {
 {

-    NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
-    wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
+    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.
     // 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() )
+    if ( winid == wxID_HELP && label.empty() )

     {
         [v setBezelStyle:NSHelpButtonBezelStyle];
     }
     else
     {
     {
         [v setBezelStyle:NSHelpButtonBezelStyle];
     }
     else
     {

-        if ( style & wxBORDER_NONE )
+        // 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 )

         {
         {

-            [v setBezelStyle:NSShadowlessSquareBezelStyle];
-            [v setBordered:NO];
+            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;

         }
         }

-        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];
-            }

 
 

-        }
+        [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);
+}
+
+
+wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer,
+                                    wxWindowMac* WXUNUSED(parent),
+                                    wxWindowID winid,
+                                    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];
+
+    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 )


@@ -266,7 +315,10 @@ void wxWidgetCocoaImpl::SetDefaultButton( bool isDefault )
     if ( [m_osxView isKindOfClass:[NSButton class]] )
     {
         if ( isDefault )
     if ( [m_osxView isKindOfClass:[NSButton class]] )
     {
         if ( isDefault )

+        {

             [(NSButton*)m_osxView setKeyEquivalent: @"\r" ];
             [(NSButton*)m_osxView setKeyEquivalent: @"\r" ];

+            [(NSButton*)m_osxView setKeyEquivalentModifierMask: 0];
+        }

         else
             [(NSButton*)m_osxView setKeyEquivalent: @"" ];
     }
         else
             [(NSButton*)m_osxView setKeyEquivalent: @"" ];
     }


@@ -282,7 +334,7 @@ void wxWidgetCocoaImpl::PerformClick()
 
 wxWidgetImplType* wxWidgetImpl::CreateBitmapButton( wxWindowMac* wxpeer,
                                                    wxWindowMac* WXUNUSED(parent),
 
 wxWidgetImplType* wxWidgetImpl::CreateBitmapButton( wxWindowMac* wxpeer,
                                                    wxWindowMac* WXUNUSED(parent),

-                                                   wxWindowID WXUNUSED(id),
+                                                   wxWindowID winid,

                                                    const wxBitmap& bitmap,
                                                    const wxPoint& pos,
                                                    const wxSize& size,
                                                    const wxBitmap& bitmap,
                                                    const wxPoint& pos,
                                                    const wxSize& size,


@@ -292,7 +344,7 @@ wxWidgetImplType* wxWidgetImpl::CreateBitmapButton( wxWindowMac* wxpeer,
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
 
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
 

-    SetBezelStyleFromBorderFlags(v, style);
+    SetBezelStyleFromBorderFlags(v, style, winid, wxString(), bitmap);

 
     if (bitmap.IsOk())
         [v setImage:bitmap.GetNSImage() ];
 
     if (bitmap.IsOk())
         [v setImage:bitmap.GetNSImage() ];


@@ -439,7 +491,7 @@ public :
 
 wxWidgetImplType* wxWidgetImpl::CreateDisclosureTriangle( wxWindowMac* wxpeer,
                                     wxWindowMac* WXUNUSED(parent),
 
 wxWidgetImplType* wxWidgetImpl::CreateDisclosureTriangle( wxWindowMac* wxpeer,
                                     wxWindowMac* WXUNUSED(parent),

-                                    wxWindowID WXUNUSED(winid),
+                                    wxWindowID winid,

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


@@ -451,7 +503,7 @@ wxWidgetImplType* wxWidgetImpl::CreateDisclosureTriangle( wxWindowMac* wxpeer,
     if ( !label.empty() )
         [v setTitle:wxCFStringRef(label).AsNSString()];
 
     if ( !label.empty() )
         [v setTitle:wxCFStringRef(label).AsNSString()];
 

-    SetBezelStyleFromBorderFlags(v, style);
+    SetBezelStyleFromBorderFlags(v, style, winid, label);

 
     return new wxDisclosureTriangleCocoaImpl( wxpeer, v );
 }
 
     return new wxDisclosureTriangleCocoaImpl( wxpeer, v );
 }