// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "slider.h"
#endif
+#include "wx/wxprec.h"
+
+#if wxUSE_SLIDER
+
#include "wx/slider.h"
#include "wx/mac/uma.h"
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
BEGIN_EVENT_TABLE(wxSlider, wxControl)
END_EVENT_TABLE()
-#endif
// The dimensions of the different styles of sliders (From Aqua document)
#define wxSLIDER_DIMENSIONACROSS 15
#define wxSLIDER_DIMENSIONACROSS_WITHTICKMARKS 24
#define wxSLIDER_DIMENSIONACROSS_ARROW 18
-
+
// Distance between slider and text
#define wxSLIDER_BORDERTEXT 5
-
+
/* NB! The default orientation for a slider is horizontal however if the user specifies
* some slider styles but dosen't specify the orientation we have to assume he wants a
* horizontal one. Therefore in this file when testing for the sliders orientation
* vertical is tested for if this is not set then we use the horizontal one
- * eg. if(GetWindowStyle() & wxSL_VERTICAL) {} else { horizontal case }>
+ * eg. if(GetWindowStyle() & wxSL_VERTICAL) {} else { horizontal case }>
*/
// Slider
m_tickFreq = 0;
}
-extern ControlActionUPP wxMacLiveScrollbarActionUPP ;
-
bool wxSlider::Create(wxWindow *parent, wxWindowID id,
int value, int minValue, int maxValue,
const wxPoint& pos,
const wxValidator& validator,
const wxString& name)
{
- m_macIsUserPane = FALSE ;
-
+ m_macIsUserPane = false ;
+
if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
return false;
m_macMinimumStatic = NULL ;
m_macMaximumStatic = NULL ;
m_macValueStatic = NULL ;
-
-
+
m_lineSize = 1;
m_tickFreq = 0;
-
+
m_rangeMax = maxValue;
m_rangeMin = minValue;
-
+
m_pageSize = (int)((maxValue-minValue)/10);
-
- Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
-
+
+ Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+
+ //
+ // NB: (RN) Ticks here are sometimes off in the GUI if there
+ // is not as many ticks as there are values
+ //
UInt16 tickMarks = 0 ;
if ( style & wxSL_AUTOTICKS )
- tickMarks = (maxValue - minValue);
-
- if (tickMarks > 20)
- tickMarks = tickMarks/5; //keep the number of tickmarks from becoming unwieldly
-
- m_peer = new wxMacControl() ;
- verify_noerr ( CreateSliderControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds ,
- value , minValue , maxValue , kControlSliderPointsDownOrRight , tickMarks , true /* liveTracking */ ,
- wxMacLiveScrollbarActionUPP , m_peer->GetControlRefAddr() ) );
-
-
+ tickMarks = (maxValue - minValue) + 1; //+1 for the 0 value
+
+ while (tickMarks > 20)
+ tickMarks /= 5; //keep the number of tickmarks from becoming unwieldly
+
+ m_peer = new wxMacControl(this) ;
+ verify_noerr ( CreateSliderControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds ,
+ value , minValue , maxValue , kControlSliderPointsDownOrRight , tickMarks , true /* liveTracking */ ,
+ GetwxMacLiveScrollbarActionProc() , m_peer->GetControlRefAddr() ) );
+
+
if(style & wxSL_VERTICAL) {
SetSizeHints(10, -1, 10, -1); // Forces SetSize to use the proper width
}
// 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
-
+
if(style & wxSL_LABELS)
{
- m_macMinimumStatic = new wxStaticText( parent, -1, wxEmptyString );
- m_macMaximumStatic = new wxStaticText( parent, -1, wxEmptyString );
- m_macValueStatic = new wxStaticText( parent, -1, wxEmptyString );
+ m_macMinimumStatic = new wxStaticText( parent, wxID_ANY, wxEmptyString );
+ m_macMaximumStatic = new wxStaticText( parent, wxID_ANY, wxEmptyString );
+ m_macValueStatic = new wxStaticText( parent, wxID_ANY, wxEmptyString );
SetRange(minValue, maxValue);
SetValue(value);
}
MacPostControlCreate(pos,size) ;
-
+
return true;
}
wxSlider::~wxSlider()
{
- delete m_macMinimumStatic ;
- delete m_macMaximumStatic ;
- delete m_macValueStatic ;
+ // this is a special case, as we had to add windows as siblings we are
+ // responsible for their disposal, but only if we are not part of a DestroyAllChildren
+ if ( m_parent && m_parent->IsBeingDeleted() == false )
+ {
+ delete m_macMinimumStatic ;
+ delete m_macMaximumStatic ;
+ delete m_macValueStatic ;
+ }
}
int wxSlider::GetValue() const
{
- return m_peer->GetValue() ;
+ // We may need to invert the value returned by the widget
+ return ValueInvertOrNot( m_peer->GetValue() ) ;
}
void wxSlider::SetValue(int value)
{
wxString valuestring ;
- valuestring.Printf( wxT("%d") , value ) ;
+ valuestring.Printf( wxT("%d") , value ) ;
if ( m_macValueStatic )
m_macValueStatic->SetLabel( valuestring ) ;
- m_peer->SetValue( value ) ;
+
+ // We only invert for the setting of the actual native widget
+ m_peer->SetValue( ValueInvertOrNot ( value ) ) ;
}
void wxSlider::SetRange(int minValue, int maxValue)
{
wxString value;
-
+
m_rangeMin = minValue;
m_rangeMax = maxValue;
-
+
m_peer->SetMinimum( m_rangeMin);
m_peer->SetMaximum( m_rangeMax);
-
+
if(m_macMinimumStatic) {
- value.Printf(wxT("%d"), m_rangeMin);
+ value.Printf(wxT("%d"), ValueInvertOrNot( m_rangeMin ) );
m_macMinimumStatic->SetLabel(value);
}
if(m_macMaximumStatic) {
- value.Printf(wxT("%d"), m_rangeMax);
+ value.Printf(wxT("%d"), ValueInvertOrNot( m_rangeMax ) );
m_macMaximumStatic->SetLabel(value);
}
SetValue(m_rangeMin);
ProcessCommand (event);
}
-void wxSlider::MacHandleControlClick( WXWidget control , wxInt16 controlpart, bool mouseStillDown )
+void wxSlider::MacHandleControlClick( WXWidget control , wxInt16 controlpart, bool mouseStillDown )
{
- SInt16 value = m_peer->GetValue() ;
-
- SetValue( value ) ;
-
+ // Whatever the native value is, we may need to invert it for calling
+ // SetValue and putting the possibly inverted value in the event
+ SInt16 value = ValueInvertOrNot ( m_peer->GetValue() ) ;
+
+ SetValue( value ) ;
+
wxEventType scrollEvent = wxEVT_NULL ;
-
+
scrollEvent = wxEVT_SCROLL_THUMBTRACK;
-
+
wxScrollEvent event(scrollEvent, m_windowId);
event.SetPosition(value);
event.SetEventObject( this );
GetEventHandler()->ProcessEvent(event);
-
+
wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, m_windowId );
cevent.SetInt( value );
cevent.SetEventObject( this );
-
+
GetEventHandler()->ProcessEvent( cevent );
}
-wxInt32 wxSlider::MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF mevent )
+wxInt32 wxSlider::MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF mevent )
{
- SInt16 value = m_peer->GetValue() ;
-
- SetValue( value ) ;
-
+ // Whatever the native value is, we may need to invert it for calling
+ // SetValue and putting the possibly inverted value in the event
+ SInt16 value = ValueInvertOrNot ( m_peer->GetValue() ) ;
+
+ SetValue( value ) ;
+
wxEventType scrollEvent = wxEVT_NULL ;
-
+
scrollEvent = wxEVT_SCROLL_THUMBRELEASE;
-
+
wxScrollEvent event(scrollEvent, m_windowId);
event.SetPosition(value);
event.SetEventObject( this );
GetEventHandler()->ProcessEvent(event);
-
+
wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, m_windowId );
cevent.SetInt( value );
cevent.SetEventObject( this );
-
+
GetEventHandler()->ProcessEvent( cevent );
return noErr ;
}
-
/* This is overloaded in wxSlider so that the proper width/height will always be used
* for the slider different values would cause redrawing and mouse detection problems */
-void wxSlider::SetSizeHints( int minW, int minH,
- int maxW , int maxH ,
- int incW , int incH )
+void wxSlider::DoSetSizeHints( int minW, int minH,
+ int maxW , int maxH ,
+ int incW , int incH )
{
wxSize size = GetBestSize();
-
+
if(GetWindowStyle() & wxSL_VERTICAL) {
- wxWindow::SetSizeHints(size.x, minH, size.x, maxH, incW, incH);
+ wxWindow::DoSetSizeHints(size.x, minH, size.x, maxH, incW, incH);
}
else {
- wxWindow::SetSizeHints(minW, size.y, maxW, size.y, incW, incH);
+ wxWindow::DoSetSizeHints(minW, size.y, maxW, size.y, incW, incH);
}
}
{
wxSize size;
int textwidth, textheight;
-
+
if(GetWindowStyle() & wxSL_LABELS)
{
wxString text;
int ht, wd;
-
+
// Get maximum text label width and height
- text.Printf(wxT("%d"), m_rangeMin);
+ text.Printf(wxT("%d"), ValueInvertOrNot( m_rangeMin ) );
GetTextExtent(text, &textwidth, &textheight);
- text.Printf(wxT("%d"), m_rangeMax);
+ text.Printf(wxT("%d"), ValueInvertOrNot( m_rangeMax ) );
GetTextExtent(text, &wd, &ht);
if(ht > textheight) {
textheight = ht;
textwidth = wd;
}
}
-
+
if(GetWindowStyle() & wxSL_VERTICAL)
{
if(GetWindowStyle() & wxSL_AUTOTICKS) {
int xborder, yborder;
int minValWidth, maxValWidth, textwidth, textheight;
int sliderBreadth;
-
+ int width = w;
+
xborder = yborder = 0;
if (GetWindowStyle() & wxSL_LABELS)
//relative to its parent in order to size properly, so
//move the control first so we can use GetPosition()
wxControl::DoSetSize( x, y , w , h ,sizeFlags ) ;
-
+
wxString text;
int ht;
-
+
// Get maximum text label width and height
- text.Printf(wxT("%d"), m_rangeMin);
+ text.Printf(wxT("%d"), ValueInvertOrNot( m_rangeMin ) );
GetTextExtent(text, &minValWidth, &textheight);
- text.Printf(wxT("%d"), m_rangeMax);
+ text.Printf(wxT("%d"), ValueInvertOrNot( m_rangeMax ) );
GetTextExtent(text, &maxValWidth, &ht);
if(ht > textheight) {
textheight = ht;
}
textwidth = (minValWidth > maxValWidth ? minValWidth : maxValWidth);
-
+
xborder = textwidth + wxSLIDER_BORDERTEXT;
yborder = textheight + wxSLIDER_BORDERTEXT;
-
+
// Get slider breadth
if(GetWindowStyle() & wxSL_AUTOTICKS) {
sliderBreadth = wxSLIDER_DIMENSIONACROSS_WITHTICKMARKS;
else {
sliderBreadth = wxSLIDER_DIMENSIONACROSS_ARROW;
}
-
+
if(GetWindowStyle() & wxSL_VERTICAL)
{
h = h - yborder ;
-
+
if ( m_macMinimumStatic )
m_macMinimumStatic->Move(GetPosition().x + sliderBreadth + wxSLIDER_BORDERTEXT,
GetPosition().y + h - yborder);
}
else
{
+ w = w - xborder ;
if ( m_macMinimumStatic )
m_macMinimumStatic->Move(GetPosition().x + 0, GetPosition().y + sliderBreadth + wxSLIDER_BORDERTEXT);
if ( m_macMaximumStatic )
GetPosition().y + sliderBreadth + wxSLIDER_BORDERTEXT);
if ( m_macValueStatic )
m_macValueStatic->Move(GetPosition().x + w, GetPosition().y + 0);
- w = w - xborder ;
}
}
+
+ // 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.
+
+ // TODO: Can all of this code go in the conditional wxSL_LABELS block?
+
+ int minWidth;
+ minWidth = m_minWidth;
+
+ if (GetWindowStyle() & wxSL_LABELS)
+ {
+ // make sure we don't allow the entire control to be resized accidently
+ if (width == GetSize().x)
+ m_minWidth = -1;
+ }
//If the control has labels, we still need to call this again because
- //the labels alter the control's w and h values.
+ //the labels alter the control's w and h values.
wxControl::DoSetSize( x, y , w , h ,sizeFlags ) ;
+ m_minWidth = minWidth;
}
void wxSlider::DoMoveWindow(int x, int y, int width, int height)
{
wxControl::DoMoveWindow(x,y,width,height) ;
}
+
+// Common processing to invert slider values based on wxSL_INVERSE
+int wxSlider::ValueInvertOrNot(int value) const
+{
+ if (m_windowStyle & wxSL_VERTICAL)
+ {
+ // The reason for the backwards logic is that Mac's vertical sliders are
+ // inverted compared to Windows and GTK, hence we want inversion to be the
+ // default, and if wxSL_INVERSE is set, then we do not invert (use native)
+ if (m_windowStyle & wxSL_INVERSE)
+ return value;
+ else
+ return (m_rangeMax + m_rangeMin) - value;
+ }
+ else // normal logic applies to HORIZONTAL sliders
+ {
+ return wxSliderBase::ValueInvertOrNot(value);
+ }
+}
+
+#endif // wxUSE_SLIDER
projects / wxWidgets.git / blobdiff