supporting native large control sizes
This commit is contained in:
parent
80610cb383
commit
31581c0f41
@ -156,6 +156,9 @@ void wxButtonCocoaImpl::GetLayoutInset(int &left , int &top , int &right, int &b
|
||||
{
|
||||
switch( size )
|
||||
{
|
||||
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_16
|
||||
case NSControlSizeLarge:
|
||||
#endif
|
||||
case NSRegularControlSize:
|
||||
left = right = 6;
|
||||
top = 4;
|
||||
|
@ -88,6 +88,9 @@ public:
|
||||
|
||||
switch( size )
|
||||
{
|
||||
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_16
|
||||
case NSControlSizeLarge:
|
||||
#endif
|
||||
case NSRegularControlSize:
|
||||
left = right = 3;
|
||||
top = 2;
|
||||
|
@ -78,6 +78,9 @@ public :
|
||||
|
||||
switch( size )
|
||||
{
|
||||
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_16
|
||||
case NSControlSizeLarge:
|
||||
#endif
|
||||
case NSRegularControlSize:
|
||||
left = right = 2;
|
||||
top = 0;
|
||||
|
@ -25,6 +25,7 @@
|
||||
#endif
|
||||
|
||||
#include "wx/osx/private.h"
|
||||
#include "wx/osx/private/available.h"
|
||||
|
||||
// forward decls
|
||||
|
||||
@ -422,6 +423,11 @@ wxListWidgetColumn* wxListWidgetCocoaImpl::InsertCheckColumn( unsigned pos , con
|
||||
break ;
|
||||
|
||||
case wxWINDOW_VARIANT_LARGE :
|
||||
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_16
|
||||
if ( WX_IS_MACOS_AVAILABLE( 10, 16 ))
|
||||
size = NSControlSizeLarge;
|
||||
else
|
||||
#endif
|
||||
size = NSRegularControlSize;
|
||||
break ;
|
||||
|
||||
|
@ -3504,6 +3504,11 @@ void wxWidgetCocoaImpl::SetControlSize( wxWindowVariant variant )
|
||||
break ;
|
||||
|
||||
case wxWINDOW_VARIANT_LARGE :
|
||||
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_16
|
||||
if ( WX_IS_MACOS_AVAILABLE( 10, 16 ))
|
||||
size = NSControlSizeLarge;
|
||||
else
|
||||
#endif
|
||||
size = NSRegularControlSize;
|
||||
break ;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user