X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d15694e8cad1d44087323bd568ca33ff5b354f2c..62795f413a7222863b4aee76c08764071f94bd87:/src/osx/slider_osx.cpp diff --git a/src/osx/slider_osx.cpp b/src/osx/slider_osx.cpp index b306575842..5d658fe181 100644 --- a/src/osx/slider_osx.cpp +++ b/src/osx/slider_osx.cpp @@ -4,7 +4,6 @@ // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id$ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -105,6 +104,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 +115,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 ); @@ -297,7 +298,7 @@ void wxSlider::TriggerScrollEvent( wxEventType scrollEvent) event.SetEventObject( this ); HandleWindowEvent( event ); - wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, m_windowId ); + wxCommandEvent cevent( wxEVT_SLIDER, m_windowId ); cevent.SetInt( value ); cevent.SetEventObject( this ); HandleWindowEvent( cevent ); @@ -476,6 +477,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. @@ -486,7 +488,7 @@ void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags) if (GetWindowStyle() & wxSL_LABELS) { - // make sure we don't allow the entire control to be resized accidently + // make sure we don't allow the entire control to be resized accidentally if (width == GetSize().x) m_minWidth = -1; }