From eca62298b9c92fd9ff1789807685dd32f8ce470d Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Thu, 24 Sep 2009 08:05:17 +0000 Subject: [PATCH] fixing styles, closes #11128 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/cocoa/bmpbuttn.mm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/osx/cocoa/bmpbuttn.mm b/src/osx/cocoa/bmpbuttn.mm index 1cbc2dfa81..d3c0092ba0 100644 --- a/src/osx/cocoa/bmpbuttn.mm +++ b/src/osx/cocoa/bmpbuttn.mm @@ -38,13 +38,17 @@ wxWidgetImplType* wxWidgetImpl::CreateBitmapButton( wxWindowMac* wxpeer, if ( style & wxBORDER_NONE ) { [v setBezelStyle:NSShadowlessSquareBezelStyle]; + [v setBordered:NO]; } else { - if ( style & wxBU_AUTODRAW ) - [v setBezelStyle:NSShadowlessSquareBezelStyle]; - 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()) -- 2.50.0