#include "wx/wxprec.h"
-#include "wx/button.h"
-
#ifndef WX_PRECOMP
+#include "wx/object.h"
#endif
+#include "wx/button.h"
+#include "wx/toplevel.h"
+#include "wx/tglbtn.h"
+
#include "wx/osx/private.h"
#if wxUSE_MARKUP
- (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() )
{
+ 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
- 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
- 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];
}
+}
- 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 )
+ id cell = [(id)m_osxView cell];
+ if ([cell respondsToSelector:@selector(controlSize)])
+ size = [cell controlSize];
+ }
+
+ if ( [GetNSButton() bezelStyle] == NSRoundedBezelStyle )
+ {
+ switch( size )
{
- 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;
- }
+ 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 )
+ {
+ wxString accelstring(label[accelPos + 1]); // Skip '&' itself
+ accelstring.MakeLower();
+ wxCFStringRef cfText(accelstring);
+ [GetNSButton() setKeyEquivalent:cfText.AsNSString()];
+ [GetNSButton() setKeyEquivalentModifierMask:NSCommandKeyMask];
+ }
+ else
{
- wxASSERT( [m_osxView isKindOfClass:[NSButton class]] );
+ [GetNSButton() setKeyEquivalent:@""];
+ }
+}
+
+NSButton *wxButtonCocoaImpl::GetNSButton() const
+{
+ wxASSERT( [m_osxView isKindOfClass:[NSButton class]] );
+
+ return static_cast<NSButton *>(m_osxView);
+}
- return static_cast<NSButton *>(m_osxView);
+// Set the keyboard accelerator key from the label (e.g. "Click &Me")
+void wxButton::OSXSetAcceleratorFromLabel(const wxString& 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;
}
-};
-} // anonymous namespace
+ wxButtonCocoaImpl *impl = static_cast<wxButtonCocoaImpl*>(GetPeer());
+ impl->SetAcceleratorFromLabel(label);
+}
extern "C" void SetBezelStyleFromBorderFlags(NSButton *v, long style);
[v setBezelStyle:NSRegularSquareBezelStyle];
else if ( (style & wxBORDER_MASK) == wxBORDER_SUNKEN )
[v setBezelStyle:NSSmallSquareBezelStyle];
- else
+ else if ( (style & wxBORDER_MASK) == wxBORDER_SIMPLE )
[v setBezelStyle:NSShadowlessSquareBezelStyle];
+ else
+ [v setBezelStyle:NSRegularSquareBezelStyle];
}
}
const wxString& label,
const wxPoint& pos,
const wxSize& size,
- long WXUNUSED(style),
+ long style,
long WXUNUSED(extraStyle))
{
NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
}
else
{
- [v setBezelStyle:NSRoundedBezelStyle];
+ 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];
+ }
+
+ }
}
[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 )
if ( [m_osxView isKindOfClass:[NSButton class]] )
{
if ( isDefault )
+ {
[(NSButton*)m_osxView setKeyEquivalent: @"\r" ];
+ [(NSButton*)m_osxView setKeyEquivalentModifierMask: 0];
+ }
else
[(NSButton*)m_osxView setKeyEquivalent: @"" ];
}
projects / wxWidgets.git / blobdiff