Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

I don't think this is still necessary, see #13625

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2012-07-24 21:43:15 +00:00
parent 2f7baaeccf
commit 33418f48c4
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/osx/slider_osx.cpp
View File

@@ -105,6 +105,7 @@ bool wxSlider::Create(wxWindow *parent,
SetPeer(wxWidgetImpl::CreateSlider( this, parent, id, value, minValue, maxValue, pos, size, style, GetExtraStyle() )); SetPeer(wxWidgetImpl::CreateSlider( this, parent, id, value, minValue, maxValue, pos, size, style, GetExtraStyle() ));
#if 0
if (style & wxSL_VERTICAL) if (style & wxSL_VERTICAL)
// Forces SetSize to use the proper width // Forces SetSize to use the proper width
SetSizeHints(10, -1, 10, -1); 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 // NB: SetSizeHints is overloaded by wxSlider and will substitute 10 with the
// proper dimensions, it also means other people cannot bugger the slider with // proper dimensions, it also means other people cannot bugger the slider with
// other values // other values
#endif
if (style & wxSL_LABELS) if (style & wxSL_LABELS)
{ {
m_macMinimumStatic = new wxStaticText( parent, wxID_ANY, wxEmptyString ); 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 // yet another hack since this is a composite control
// when wxSlider has it's size hardcoded, we're not allowed to // when wxSlider has it's size hardcoded, we're not allowed to
// change the size. But when the control has labels, we DO need // change the size. But when the control has labels, we DO need
// to resize the internal Mac control to accommodate the text labels. // to resize the internal Mac control to accommodate the text labels.
// We need to trick the wxWidgets resize mechanism so that we can // We need to trick the wxWidgets resize mechanism so that we can
// resize the slider part of the control ONLY. // resize the slider part of the control ONLY.