From 33418f48c443578e71552366f80d29c81c615f1b Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Tue, 24 Jul 2012 21:43:15 +0000 Subject: [PATCH] I don't think this is still necessary, see #13625 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/slider_osx.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/osx/slider_osx.cpp b/src/osx/slider_osx.cpp index b306575842..02c964e74a 100644 --- a/src/osx/slider_osx.cpp +++ b/src/osx/slider_osx.cpp @@ -105,6 +105,7 @@ bool wxSlider::Create(wxWindow *parent, SetPeer(wxWidgetImpl::CreateSlider( this, parent, id, value, minValue, maxValue, pos, size, style, GetExtraStyle() )); +#if 0 if (style & wxSL_VERTICAL) // Forces SetSize to use the proper width SetSizeHints(10, -1, 10, -1); @@ -115,7 +116,8 @@ bool wxSlider::Create(wxWindow *parent, // NB: SetSizeHints is overloaded by wxSlider and will substitute 10 with the // proper dimensions, it also means other people cannot bugger the slider with // other values - +#endif + if (style & wxSL_LABELS) { m_macMinimumStatic = new wxStaticText( parent, wxID_ANY, wxEmptyString ); @@ -476,6 +478,7 @@ void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags) // yet another hack since this is a composite control // when wxSlider has it's size hardcoded, we're not allowed to // change the size. But when the control has labels, we DO need + // to resize the internal Mac control to accommodate the text labels. // We need to trick the wxWidgets resize mechanism so that we can // resize the slider part of the control ONLY. -- 2.45.2