// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#include "gdk/gdk.h"
#include "gtk/gtk.h"
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+
//-----------------------------------------------------------------------------
// data
//-----------------------------------------------------------------------------
static void gtk_slider_callback( GtkWidget *WXUNUSED(widget), wxSlider *win )
{
- if (!win->HasVMT()) return;
+ 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;
if (fabs(diff) < 0.2) return;
+ win->m_oldPos = win->m_adjust->value;
wxEventType command = wxEVT_NULL;
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);
+ int value = (int)ceil(win->m_adjust->value);
int orient = wxHORIZONTAL;
if (win->GetWindowStyleFlag() & wxSB_VERTICAL == wxSB_VERTICAL) orient = wxVERTICAL;
wxScrollEvent event( command, win->GetId(), value, orient );
event.SetEventObject( win );
- win->ProcessEvent( event );
+ win->GetEventHandler()->ProcessEvent( event );
wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, win->GetId() );
cevent.SetEventObject( win );
- win->ProcessEvent( cevent );
+ win->GetEventHandler()->ProcessEvent( cevent );
}
//-----------------------------------------------------------------------------
m_oldPos = 0.0;
- if (style & wxSL_VERTICAL == wxSL_VERTICAL)
- m_widget = gtk_hscale_new( (GtkAdjustment *) NULL );
- else
+ if (style & wxSL_VERTICAL)
m_widget = gtk_vscale_new( (GtkAdjustment *) NULL );
+ else
+ m_widget = gtk_hscale_new( (GtkAdjustment *) NULL );
- gtk_scale_set_draw_value( GTK_SCALE( m_widget ), FALSE );
-
+ if (style & wxSL_LABELS)
+ {
+ gtk_scale_set_draw_value( GTK_SCALE( m_widget ), TRUE );
+
+ /* 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
+ 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),
"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();
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 )
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 )
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()