From d30a02642db7003630a73670cd2c2c54eb38367f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 2 Mar 2014 15:50:11 +0000 Subject: [PATCH] Implement support for wxGA_VERTICAL style in wxOSX. Rotate the native control to make it look correct in vertical orientation. Closes #15682. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 1 + src/osx/cocoa/gauge.mm | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/changes.txt b/docs/changes.txt index 7753754b94..e9f8b2de11 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -641,6 +641,7 @@ wxOSX: - Fix incorrect joystick detection in configure (Lauri Nurmi). - Fix crash in wxDataViewCtrl when cancelling choice selection (hartwigw). +- Implement support for wxGA_VERTICAL in wxGauge (themindiswatching). - Add support for wxEVT_COMBOBOX_DROPDOWN and wxEVT_COMBOBOX_CLOSEUP events to wxOSX/Cocoa (Igor Korot). diff --git a/src/osx/cocoa/gauge.mm b/src/osx/cocoa/gauge.mm index cf82bd434b..fe15e849a5 100644 --- a/src/osx/cocoa/gauge.mm +++ b/src/osx/cocoa/gauge.mm @@ -113,7 +113,7 @@ wxWidgetImplType* wxWidgetImpl::CreateGauge( wxWindowMac* wxpeer, wxInt32 maximum, const wxPoint& pos, const wxSize& size, - long WXUNUSED(style), + long style, long WXUNUSED(extraStyle)) { NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ; @@ -123,6 +123,10 @@ wxWidgetImplType* wxWidgetImpl::CreateGauge( wxWindowMac* wxpeer, [v setMaxValue: maximum]; [v setIndeterminate:FALSE]; [v setDoubleValue: (double) value]; + if (style & wxGA_VERTICAL) + { + [v setBoundsRotation:-90.0]; + } wxWidgetCocoaImpl* c = new wxOSXGaugeCocoaImpl( wxpeer, v ); return c; }