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 }>
+ */
// Slider
const wxValidator& validator,
const wxString& name)
{
- Rect bounds ;
- Str255 title ;
- wxSize slsize;
- int maxtextwidth, textheight;
-
- // Is control horizontal or vertical (Can be ambigous if user selects
- // another style without also specifying horz or vert
- if (!(style & wxSL_HORIZONTAL) && !(style & wxSL_VERTICAL)) {
- // Default is horizontal so make it so
- style |= wxSL_HORIZONTAL;
- }
- slsize = size;
- // Check that size corresponds with users selection of vertical or
- // horizontal slider and insert suitable default values
- if (style & wxSL_HORIZONTAL)
- {
- slsize.y = 15; // Slider width
- if (slsize.x == -1) {
- slsize.x = 150; // Slider default length
- }
- }
- else
- {
- slsize.x = 15; // Slider width
- if (slsize.y == -1) {
- slsize.y = 150; // Slider default length
- }
+ Rect bounds ;
+ Str255 title ;
+ SInt16 procID;
+
+ 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);
+
+ MacPreControlCreate( parent, id, "", pos, size, style,
+ validator, name, &bounds, title );
+
+ procID = kControlSliderProc + kControlSliderLiveFeedback;
+ if(style & wxSL_AUTOTICKS) {
+ procID += kControlSliderHasTickMarks;
}
- /* Set the height and width for the slider control region. The actual
- * slider is set at 10 pixels across. If the slider has labels then the
- * control region must be large enough to contain these labels
- */
- if (style & wxSL_LABELS)
- {
- wxString text;
- int ht, wd;
-
- // Get maximum text label width and height
- text.Printf("%d", minValue);
- parent->GetTextExtent(text, &maxtextwidth, &textheight);
- text.Printf("%d", maxValue);
- parent->GetTextExtent(text, &wd, &ht);
- if(ht > textheight) {
- textheight = ht;
- }
- if (wd > maxtextwidth) {
- maxtextwidth = wd;
- }
-
- if (style & wxSL_VERTICAL) {
- slsize.x = (15 + maxtextwidth + 2); // Slider wd plus mac text width
- }
- if (style & wxSL_HORIZONTAL) {
- slsize.y = (15 + textheight); // Slider ht plus text ht.
- }
- }
-
- MacPreControlCreate( parent , id , "" , pos , slsize , style,
- validator , name , &bounds , title ) ;
- 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);
-
- // Must modify bounds to that of the slider dimensions from slider
- // dimensions plus text labels.
- if (style & wxSL_LABELS)
- {
- if ( style & wxSL_HORIZONTAL )
- {
- bounds.bottom = bounds.top + 15;
- bounds.right -= (5 + maxtextwidth);
- }
- else // Vertical slider
- {
- bounds.right = bounds.left + 15;
- bounds.bottom -= (5 + textheight);
- }
- }
-
- m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds ,
- title , true , value , minValue , maxValue,
- kControlSliderProc + kControlSliderLiveFeedback + ( ( style & wxSL_AUTOTICKS ) ? kControlSliderHasTickMarks : 0 ) , (long) this ) ;
-
- wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
-
- ::SetControlAction( m_macControl , wxMacLiveScrollbarActionUPP ) ;
-
- MacPostControlCreate() ;
-
- if ( style & wxSL_LABELS )
- {
- if ( style & wxSL_HORIZONTAL )
- {
- wxPoint leftpos( 0 , 15 ) ;
- wxPoint rightpos( m_width - (maxtextwidth + 20) , 15 ) ;
- wxPoint valuepos( m_width - maxtextwidth , 0 ) ;
- wxString valuestring ;
-
- valuestring.Printf( "%d" , minValue ) ;
- m_macMinimumStatic = new wxStaticText( this , -1 , valuestring , leftpos ) ;
-
- valuestring.Printf( "%d" , maxValue ) ;
- m_macMinimumStatic = new wxStaticText( this , -1 , valuestring , rightpos ) ;
-
- valuestring.Printf( "%d" , value ) ;
- m_macMinimumStatic = new wxStaticText( this , -1 , valuestring , valuepos ) ;
- }
- else // Vertical slider
- {
- wxPoint toppos( 17 , 0 ) ;
- wxPoint bottompos( 17 , m_height - (textheight + 15) ) ;
- wxPoint valuepos( 0 , m_height - textheight ) ;
- wxString valuestring ;
-
- valuestring.Printf( "%d" , minValue ) ;
- m_macMinimumStatic = new wxStaticText( this , -1 , valuestring , bottompos ) ;
-
- valuestring.Printf( "%d" , maxValue ) ;
- m_macMinimumStatic = new wxStaticText( this , -1 , valuestring , toppos ) ;
-
- valuestring.Printf( "%d" , value ) ;
- m_macMinimumStatic = new wxStaticText( this , -1 , valuestring , valuepos ) ;
- }
+ m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()), &bounds, title, false,
+ value, minValue, maxValue, procID, (long) this);
+
+ wxASSERT_MSG( (ControlHandle) m_macControl != NULL , "No valid mac control" ) ;
+
+ ::SetControlAction( (ControlHandle) m_macControl , wxMacLiveScrollbarActionUPP ) ;
+
+ if(style & wxSL_LABELS)
+ {
+ m_macMinimumStatic = new wxStaticText( this, -1, "" );
+ m_macMaximumStatic = new wxStaticText( this, -1, "" );
+ m_macValueStatic = new wxStaticText( this, -1, "" );
+ SetRange(minValue, maxValue);
+ SetValue(value);
}
- return true;
+ else {
+ m_macMinimumStatic = NULL ;
+ m_macMaximumStatic = NULL ;
+ m_macValueStatic = NULL ;
+ }
+
+ if(style & wxSL_VERTICAL) {
+ SetSizeHints(10, -1, 10, -1); // Forces SetSize to use the proper width
+ }
+ else {
+ SetSizeHints(-1, 10, -1, 10); // Forces SetSize to use the proper height
+ }
+ // 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
+
+ MacPostControlCreate() ;
+
+ return true;
}
wxSlider::~wxSlider()
int wxSlider::GetValue() const
{
- return GetControlValue( m_macControl) ;
+ return GetControl32BitValue( (ControlHandle) m_macControl) ;
}
void wxSlider::SetValue(int value)
{
wxString valuestring ;
valuestring.Printf( "%d" , value ) ;
- if ( m_macMinimumStatic )
- m_macMinimumStatic->SetLabel( valuestring ) ;
- SetControlValue( m_macControl , value ) ;
+ if ( m_macValueStatic )
+ m_macValueStatic->SetLabel( valuestring ) ;
+ SetControl32BitValue( (ControlHandle) m_macControl , value ) ;
}
void wxSlider::SetRange(int minValue, int maxValue)
m_rangeMin = minValue;
m_rangeMax = maxValue;
- // TODO
- SetControlMinimum(m_macControl, m_rangeMin);
- SetControlMaximum(m_macControl, m_rangeMax);
+ SetControl32BitMinimum( (ControlHandle) m_macControl, m_rangeMin);
+ SetControl32BitMaximum( (ControlHandle) m_macControl, m_rangeMax);
if(m_macMinimumStatic) {
value.Printf("%d", m_rangeMin);
ProcessCommand (event);
}
-bool wxSlider::Show( bool show )
-{
- return wxWindow::Show( show ) ;
-}
-
-void wxSlider::MacHandleControlClick( ControlHandle control , SInt16 controlpart )
+void wxSlider::MacHandleControlClick( WXWidget control , wxInt16 controlpart )
{
- SInt16 value = ::GetControlValue( m_macControl ) ;
+ SInt16 value = ::GetControl32BitValue( (ControlHandle) m_macControl ) ;
SetValue( value ) ;
GetEventHandler()->ProcessEvent( cevent );
}
+
+ /* 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 )
+ {
+ wxSize size = GetBestSize();
+
+ if(GetWindowStyle() & wxSL_VERTICAL) {
+ wxWindow::SetSizeHints(size.x, minH, size.x, maxH, incW, incH);
+ }
+ else {
+ wxWindow::SetSizeHints(minW, size.y, maxW, size.y, incW, incH);
+ }
+ }
+
+ wxSize wxSlider::DoGetBestSize() const
+ {
+ wxSize size;
+ int textwidth, textheight;
+
+ if(GetWindowStyle() & wxSL_LABELS)
+ {
+ wxString text;
+ int ht, wd;
+
+ // Get maximum text label width and height
+ text.Printf("%d", m_rangeMin);
+ GetTextExtent(text, &textwidth, &textheight);
+ text.Printf("%d", m_rangeMax);
+ GetTextExtent(text, &wd, &ht);
+ if(ht > textheight) {
+ textheight = ht;
+ }
+ if (wd > textwidth) {
+ textwidth = wd;
+ }
+ }
+
+ if(GetWindowStyle() & wxSL_VERTICAL)
+ {
+ if(GetWindowStyle() & wxSL_AUTOTICKS) {
+ size.x = wxSLIDER_DIMENSIONACROSS_WITHTICKMARKS;
+ }
+ else {
+ size.x = wxSLIDER_DIMENSIONACROSS_ARROW;
+ }
+ if(GetWindowStyle() & wxSL_LABELS) {
+ size.x += textwidth + wxSLIDER_BORDERTEXT;
+ }
+ size.y = 150;
+ }
+ else
+ {
+ if(GetWindowStyle() & wxSL_AUTOTICKS) {
+ size.y = wxSLIDER_DIMENSIONACROSS_WITHTICKMARKS;
+ }
+ else {
+ size.y = wxSLIDER_DIMENSIONACROSS_ARROW;
+ }
+ if(GetWindowStyle() & wxSL_LABELS) {
+ size.y += textheight + wxSLIDER_BORDERTEXT;
+ }
+ size.x = 150;
+ }
+ return size;
+ }
+
+ void wxSlider::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+ {
+ wxControl::DoSetSize( x, y , width , height ,sizeFlags ) ;
+ }
+
+ void wxSlider::MacUpdateDimensions()
+{
+ // actually in the current systems this should never be possible, but later reparenting
+ // may become a reality
+
+ if ( (ControlHandle) m_macControl == NULL )
+ return ;
+
+ if ( GetParent() == NULL )
+ return ;
+
+ WindowRef rootwindow = (WindowRef) MacGetRootWindow() ;
+ if ( rootwindow == NULL )
+ return ;
+
+ int xborder, yborder;
+ int minValWidth, maxValWidth, textwidth, textheight;
+ int sliderBreadth;
+
+ xborder = yborder = 0;
+
+ if (GetWindowStyle() & wxSL_LABELS)
+ {
+ wxString text;
+ int ht;
+
+ // Get maximum text label width and height
+ text.Printf("%d", m_rangeMin);
+ GetTextExtent(text, &minValWidth, &textheight);
+ text.Printf("%d", 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)
+ {
+ m_macMinimumStatic->Move(sliderBreadth + wxSLIDER_BORDERTEXT,
+ m_height - yborder - textheight);
+ m_macMaximumStatic->Move(sliderBreadth + wxSLIDER_BORDERTEXT, 0);
+ m_macValueStatic->Move(0, m_height - textheight);
+ }
+ else
+ {
+ m_macMinimumStatic->Move(0, sliderBreadth + wxSLIDER_BORDERTEXT);
+ m_macMaximumStatic->Move(m_width - xborder - maxValWidth / 2,
+ sliderBreadth + wxSLIDER_BORDERTEXT);
+ m_macValueStatic->Move(m_width - textwidth, 0);
+ }
+ }
+
+ Rect oldBounds ;
+ GetControlBounds( (ControlHandle) m_macControl , &oldBounds ) ;
+
+ int new_x = m_x + MacGetLeftBorderSize() + m_macHorizontalBorder ;
+ int new_y = m_y + MacGetTopBorderSize() + m_macVerticalBorder ;
+ int new_width = m_width - MacGetLeftBorderSize() - MacGetRightBorderSize() - 2 * m_macHorizontalBorder - xborder ;
+ int new_height = m_height - MacGetTopBorderSize() - MacGetBottomBorderSize() - 2 * m_macVerticalBorder - yborder ;
+
+ GetParent()->MacWindowToRootWindow( & new_x , & new_y ) ;
+ bool doMove = new_x != oldBounds.left || new_y != oldBounds.top ;
+ bool doResize = ( oldBounds.right - oldBounds.left ) != new_width || (oldBounds.bottom - oldBounds.top ) != new_height ;
+ if ( doMove || doResize )
+ {
+ InvalWindowRect( rootwindow, &oldBounds ) ;
+ if ( doMove )
+ {
+ UMAMoveControl( (ControlHandle) m_macControl , new_x , new_y ) ;
+ }
+ if ( doResize )
+ {
+ UMASizeControl( (ControlHandle) m_macControl , new_width , new_height ) ;
+ }
+ }
+}
+
+ void wxSlider::DoMoveWindow(int x, int y, int width, int height)
+ {
+ wxControl::DoMoveWindow(x,y,width,height) ;
+}
\ No newline at end of file
projects / wxWidgets.git / blobdiff