const wxSize& size, long style,
const wxValidator& validator,
const wxString& name)
-{
- m_macIsUserPane = false;
-
+{
+ DontCreatePeer();
+
m_macMinimumStatic = NULL;
m_macMaximumStatic = NULL;
m_macValueStatic = NULL;
if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
return false;
- m_peer = 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)
// Forces SetSize to use the proper width
SetSizeHints(10, -1, 10, -1);
// 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 );
int wxSlider::GetValue() const
{
// We may need to invert the value returned by the widget
- return ValueInvertOrNot( m_peer->GetValue() ) ;
+ return ValueInvertOrNot( GetPeer()->GetValue() ) ;
}
void wxSlider::SetValue(int value)
}
// We only invert for the setting of the actual native widget
- m_peer->SetValue( ValueInvertOrNot( value ) );
+ GetPeer()->SetValue( ValueInvertOrNot( value ) );
}
void wxSlider::SetRange(int minValue, int maxValue)
m_rangeMin = minValue;
m_rangeMax = maxValue;
- m_peer->SetMinimum( m_rangeMin );
- m_peer->SetMaximum( m_rangeMax );
+ GetPeer()->SetMinimum( m_rangeMin );
+ GetPeer()->SetMaximum( m_rangeMax );
if (m_macMinimumStatic)
{
}
// For trackbars only
-void wxSlider::SetTickFreq(int n, int WXUNUSED(pos))
+void wxSlider::DoSetTickFreq(int n)
{
// TODO
m_tickFreq = n;
{
// Whatever the native value is, we may need to invert it for calling
// SetValue and putting the possibly inverted value in the event
- int value = ValueInvertOrNot( m_peer->GetValue() );
+ int value = ValueInvertOrNot( GetPeer()->GetValue() );
SetValue( value );
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 );
if (GetWindowStyle() & wxSL_VERTICAL)
// If vertical, use current value
- text.Printf(wxT("%d"), (int)m_peer->GetValue());
+ text.Printf(wxT("%d"), (int)GetPeer()->GetValue());
else
// Use max so that the current value doesn't drift as centering would need to change
text.Printf(wxT("%d"), m_rangeMax);
// 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.
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;
}