// 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/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();
-
- const int wBtnStd = GetDefaultSize().x;
-
- 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
@end
+@interface NSView(PossibleSizeMethods)
+- (NSControlSize)controlSize;
+@end
+
namespace
{
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();
[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
{
} // 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
+ [v setBezelStyle:NSShadowlessSquareBezelStyle];
+ }
+}
+
+
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),
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];
}
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];
+ if ([m_osxView isKindOfClass:[NSControl class]])
+ [(NSControl*)m_osxView performClick:nil];
}
#if wxUSE_BMPBUTTON
{
NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
-
- // trying to get as close as possible to flags
- if ( style & wxBORDER_NONE )
- {
- [v setBezelStyle:NSShadowlessSquareBezelStyle];
- [v setBordered:NO];
- }
- 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
- [v setBezelStyle:NSShadowlessSquareBezelStyle];
- }
-
- if (bitmap.Ok())
+
+ SetBezelStyleFromBorderFlags(v, style);
+
+ if (bitmap.IsOk())
[v setImage:bitmap.GetNSImage() ];
-
+
[v setButtonType:NSMomentaryPushInButton];
wxWidgetCocoaImpl* c = new wxButtonCocoaImpl( wxpeer, v );
return c;
}
-#endif
+#endif // wxUSE_BMPBUTTON
//
// wxDisclosureButton implementation
- (id) initWithFrame:(NSRect) frame
{
self = [super initWithFrame:frame];
- [self setBezelStyle:NSSmallSquareBezelStyle];
isOpen = NO;
[self setImagePosition:NSImageLeft];
[self updateImage];
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 )
fromRect:NSZeroRect operation:NSCompositeCopy fraction:1.0];
[newImage unlockFocus];
- return newImage;
+ return [newImage autorelease];
}
@end
wxWidgetImplType* wxWidgetImpl::CreateDisclosureTriangle( wxWindowMac* wxpeer,
wxWindowMac* WXUNUSED(parent),
- wxWindowID WXUNUSED(id),
+ wxWindowID WXUNUSED(winid),
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];
- [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 );
}
projects / wxWidgets.git / blobdiff