// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#endif
#include "wx/slider.h"
+
+#if wxUSE_SLIDER
+
#include "wx/utils.h"
#include <math.h>
#include "gdk/gdk.h"
#include "gtk/gtk.h"
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+
//-----------------------------------------------------------------------------
// data
//-----------------------------------------------------------------------------
// "value_changed"
//-----------------------------------------------------------------------------
-static void gtk_slider_callback( GtkWidget *WXUNUSED(widget), wxSlider *win )
-{
- if (!win->HasVMT()) return;
+static void gtk_slider_callback( GtkAdjustment *adjust, wxSlider *win )
+{
+ if (g_isIdle) wxapp_install_idle_handler();
+
+ if (!win->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
-
- float diff = win->m_adjust->value - win->m_oldPos;
+
+ float diff = adjust->value - win->m_oldPos;
if (fabs(diff) < 0.2) return;
- win->m_oldPos = win->m_adjust->value;
-
- wxEventType command = wxEVT_NULL;
-
- float line_step = win->m_adjust->step_increment;
- float page_step = win->m_adjust->page_increment;
-
- if (fabs(win->m_adjust->value-win->m_adjust->lower) < 0.2) command = wxEVT_SCROLL_BOTTOM;
- else if (fabs(win->m_adjust->value-win->m_adjust->upper) < 0.2) command = wxEVT_SCROLL_TOP;
- else if (fabs(diff-line_step) < 0.2) command = wxEVT_SCROLL_LINEDOWN;
- else if (fabs(diff+line_step) < 0.2) command = wxEVT_SCROLL_LINEUP;
- else if (fabs(diff-page_step) < 0.2) command = wxEVT_SCROLL_PAGEDOWN;
- else if (fabs(diff+page_step) < 0.2) command = wxEVT_SCROLL_PAGEUP;
- else command = wxEVT_SCROLL_THUMBTRACK;
-
- int value = (int)(win->m_adjust->value+0.5);
-
+
+ win->m_oldPos = adjust->value;
+
+ GtkRange *range = GTK_RANGE( win->m_widget );
+
+ wxEventType command = wxEVT_SCROLL_THUMBTRACK;
+ if (range->scroll_type == GTK_SCROLL_STEP_BACKWARD) command = wxEVT_SCROLL_LINEUP;
+ else if (range->scroll_type == GTK_SCROLL_STEP_FORWARD) command = wxEVT_SCROLL_LINEDOWN;
+ else if (range->scroll_type == GTK_SCROLL_PAGE_BACKWARD) command = wxEVT_SCROLL_PAGEUP;
+ else if (range->scroll_type == GTK_SCROLL_PAGE_FORWARD) command = wxEVT_SCROLL_PAGEDOWN;
+
+ int value = (int)ceil(adjust->value);
+
int orient = wxHORIZONTAL;
- if (win->GetWindowStyleFlag() & wxSB_VERTICAL == wxSB_VERTICAL) orient = wxVERTICAL;
-
+ if ( (win->GetWindowStyleFlag() & wxSB_VERTICAL) == wxSB_VERTICAL)
+ orient = wxVERTICAL;
+
wxScrollEvent event( command, win->GetId(), value, orient );
event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event );
-
+
wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, win->GetId() );
cevent.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( cevent );
{
m_acceptsFocus = TRUE;
m_needParent = TRUE;
-
- PreCreation( parent, id, pos, size, style, name );
-
- SetValidator( validator );
+
+ if (!PreCreation( parent, pos, size ) ||
+ !CreateBase( parent, id, pos, size, style, validator, name ))
+ {
+ wxFAIL_MSG( wxT("wxSlider creation failed") );
+ return FALSE;
+ }
m_oldPos = 0.0;
- if (style & wxSL_VERTICAL == wxSL_VERTICAL)
+ if (style & wxSL_VERTICAL)
+ m_widget = gtk_vscale_new( (GtkAdjustment *) NULL );
+ else
m_widget = gtk_hscale_new( (GtkAdjustment *) NULL );
+
+ if (style & wxSL_LABELS)
+ {
+ gtk_scale_set_draw_value( GTK_SCALE( m_widget ), TRUE );
+ gtk_scale_set_digits( GTK_SCALE( m_widget ), 0 );
+
+ /* labels need more space and too small window will
+ cause junk to appear on the dialog */
+ if (style & wxSL_VERTICAL)
+ {
+ wxSize sz( size );
+ if (sz.x < 35)
+ {
+ sz.x = 35;
+ SetSize( sz );
+ }
+ }
+ else
+ {
+ wxSize sz( size );
+ if (sz.y < 35)
+ {
+ sz.y = 35;
+ SetSize( sz );
+ }
+ }
+ }
else
- m_widget = gtk_vscale_new( (GtkAdjustment *) NULL );
-
- gtk_scale_set_draw_value( GTK_SCALE( m_widget ), FALSE );
-
+ gtk_scale_set_draw_value( GTK_SCALE( m_widget ), FALSE );
+
m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) );
-
- gtk_signal_connect( GTK_OBJECT(m_adjust),
+
+ gtk_signal_connect( GTK_OBJECT(m_adjust),
"value_changed",
- (GtkSignalFunc) gtk_slider_callback,
- (gpointer) this );
-
+ (GtkSignalFunc) gtk_slider_callback,
+ (gpointer) this );
+
SetRange( minValue, maxValue );
SetValue( value );
-
- m_parent->AddChild( this );
- (m_parent->m_insertCallback)( m_parent, this );
-
+ m_parent->DoAddChild( this );
+
PostCreation();
-
+
SetBackgroundColour( parent->GetBackgroundColour() );
Show( TRUE );
-
+
return TRUE;
}
float fpos = (float)value;
m_oldPos = fpos;
if (fabs(fpos-m_adjust->value) < 0.2) return;
-
+
m_adjust->value = fpos;
-
+
gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
}
{
float fmin = (float)minValue;
float fmax = (float)maxValue;
-
+
if ((fabs(fmin-m_adjust->lower) < 0.2) &&
(fabs(fmax-m_adjust->upper) < 0.2))
{
return;
}
-
+
m_adjust->lower = fmin;
m_adjust->upper = fmax;
int wxSlider::GetMin(void) const
{
- return (int)(m_adjust->lower+0.5);
+ return (int)ceil(m_adjust->lower);
}
int wxSlider::GetMax(void) const
{
- return (int)(m_adjust->upper+0.5);
+ return (int)ceil(m_adjust->upper);
}
void wxSlider::SetPageSize( int pageSize )
{
float fpage = (float)pageSize;
-
+
if (fabs(fpage-m_adjust->page_increment) < 0.2) return;
-
+
m_adjust->page_increment = fpage;
gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
int wxSlider::GetPageSize(void) const
{
- return (int)(m_adjust->page_increment+0.5);
+ return (int)ceil(m_adjust->page_increment);
}
void wxSlider::SetThumbLength( int len )
{
float flen = (float)len;
-
+
if (fabs(flen-m_adjust->page_size) < 0.2) return;
-
+
m_adjust->page_size = flen;
gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
int wxSlider::GetThumbLength(void) const
{
- return (int)(m_adjust->page_size+0.5);
+ return (int)ceil(m_adjust->page_size);
}
void wxSlider::SetLineSize( int WXUNUSED(lineSize) )
GtkRange *range = GTK_RANGE(m_widget);
return ( (window == GTK_WIDGET(range)->window) ||
(window == range->trough) ||
- (window == range->slider) ||
- (window == range->step_forw) ||
- (window == range->step_back) );
+ (window == range->slider) ||
+ (window == range->step_forw) ||
+ (window == range->step_back) );
}
void wxSlider::ApplyWidgetStyle()
SetWidgetStyle();
gtk_widget_set_style( m_widget, m_widgetStyle );
}
+
+#endif
projects / wxWidgets.git / blobdiff