Add wxDataViewCtrl::SetRowHeight() and provide its generic implementation.

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

diff --git a/src/osx/cocoa/button.mm b/src/osx/cocoa/button.mm
index 355b77707a8440db15050edad69986e82f445544..09f1f192dd223a8bfc05a93b08e628bcc9961684 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
 /////////////////////////////////////////////////////////////////////////////


@@ -18,16 +18,28 @@
 
 #include "wx/osx/private.h"
 
 
 #include "wx/osx/private.h"
 

+#if wxUSE_MARKUP
+    #include "wx/osx/cocoa/private/markuptoattr.h"
+#endif // wxUSE_MARKUP
+
+

 wxSize wxButton::DoGetBestSize() const
 {
 wxSize wxButton::DoGetBestSize() const
 {

-    if ( GetId() == wxID_HELP )
+    // We only use help button bezel if we don't have any (non standard) label
+    // to display in the button. Otherwise even wxID_HELP buttons look like
+    // normal push buttons.
+    if ( GetId() == wxID_HELP && GetLabel().empty() )

         return wxSize( 23 , 23 ) ;
 
     wxRect r ;
         return wxSize( 23 , 23 ) ;
 
     wxRect r ;

-    m_peer->GetBestRect(&r);
+    GetPeer()->GetBestRect(&r);

 
     wxSize sz = r.GetSize();
 
     wxSize sz = r.GetSize();

-
+    sz.x  = sz.x  + MacGetLeftBorderSize() +
+    MacGetRightBorderSize();
+    sz.y = sz.y + MacGetTopBorderSize() +
+    MacGetBottomBorderSize();
+    

     const int wBtnStd = GetDefaultSize().x;
 
     if ( (sz.x < wBtnStd) && !HasFlag(wxBU_EXACTFIT) )
     const int wBtnStd = GetDefaultSize().x;
 
     if ( (sz.x < wBtnStd) && !HasFlag(wxBU_EXACTFIT) )


@@ -38,7 +50,7 @@ wxSize wxButton::DoGetBestSize() const
 
 wxSize wxButton::GetDefaultSize()
 {
 
 wxSize wxButton::GetDefaultSize()
 {

-    return wxSize(84, 23);
+    return wxSize(84, 20);

 }
 
 @implementation wxNSButton
 }
 
 @implementation wxNSButton


@@ -94,6 +106,10 @@ wxSize wxButton::GetDefaultSize()
 
 @end
 
 
 @end
 

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

 namespace
 {
 
 namespace
 {
 


@@ -114,6 +130,25 @@ public:
         wxWidgetCocoaImpl::SetBitmap(bitmap);
     }
 
         wxWidgetCocoaImpl::SetBitmap(bitmap);
     }
 

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

     void SetPressedBitmap( const wxBitmap& bitmap )
     {
         NSButton* button = GetNSButton();
     void SetPressedBitmap( const wxBitmap& bitmap )
     {
         NSButton* button = GetNSButton();


@@ -121,6 +156,43 @@ public:
         [button setButtonType:NSMomentaryChangeButton];
     }
 
         [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 )
+        {
+            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
     {
 private:
     NSButton *GetNSButton() const
     {


@@ -130,6 +202,10 @@ private:
     }
 };
 
     }
 };
 

+} // 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)
 {
 // set bezel style depending on the wxBORDER_XXX flags specified by the style
 void SetBezelStyleFromBorderFlags(NSButton *v, long style)
 {


@@ -150,12 +226,11 @@ void SetBezelStyleFromBorderFlags(NSButton *v, long style)
     }
 }
 
     }
 }
 

-} // anonymous namespace

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

-                                    const wxString& WXUNUSED(label),
+                                    const wxString& label,

                                     const wxPoint& pos,
                                     const wxSize& size,
                                     long WXUNUSED(style),
                                     const wxPoint& pos,
                                     const wxSize& size,
                                     long WXUNUSED(style),


@@ -164,7 +239,11 @@ wxWidgetImplType* wxWidgetImpl::CreateButton( 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];
 

-    if ( id == wxID_HELP )
+    // 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];
     }
     {
         [v setBezelStyle:NSHelpButtonBezelStyle];
     }


@@ -179,10 +258,13 @@ wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer,
 
 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()
 }
 
 void wxWidgetCocoaImpl::PerformClick()


@@ -207,7 +289,7 @@ wxWidgetImplType* wxWidgetImpl::CreateBitmapButton( wxWindowMac* wxpeer,
 
     SetBezelStyleFromBorderFlags(v, style);
 
 
     SetBezelStyleFromBorderFlags(v, style);
 

-    if (bitmap.Ok())
+    if (bitmap.IsOk())

         [v setImage:bitmap.GetNSImage() ];
 
     [v setButtonType:NSMomentaryPushInButton];
         [v setImage:bitmap.GetNSImage() ];
 
     [v setButtonType:NSMomentaryPushInButton];