X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..9c112555198f51fcec71106530cddba95a17f3dc:/src/gtk1/slider.cpp?ds=sidebyside

diff --git a/src/gtk1/slider.cpp b/src/gtk1/slider.cpp
index 891fcf61f9..c5d5be31fe 100644
--- a/src/gtk1/slider.cpp
+++ b/src/gtk1/slider.cpp
@@ -1,247 +1,295 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        slider.cpp
+// Name:        gtk/slider.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:   	wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "slider.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/slider.h"
+
+#if wxUSE_SLIDER
+
 #include "wx/utils.h"
+#include "wx/math.h"
+#include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------
-// wxSlider
+// idle system
 //-----------------------------------------------------------------------------
 
-void gtk_slider_callback( GtkWidget *WXUNUSED(widget), wxSlider *win )
-{ 
-/*
-  printf( "OnScroll from " );
-  if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-    printf( win->GetClassInfo()->GetClassName() );
-  printf( ".\n" );
-*/
-  
-  if (!win->HasVMT()) return;
-    
-  float diff = win->m_adjust->value - win->m_oldPos;
-  if (fabs(diff) < 0.2) return;
-  
-  int command = 0;
-  
-  float line_step = win->m_adjust->step_increment;
-  float page_step = win->m_adjust->page_increment;
-  
-  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);
-      
-  int orient = wxHORIZONTAL;
-  if (win->GetWindowStyleFlag() & wxSB_VERTICAL == wxSB_VERTICAL) orient = wxHORIZONTAL;
-  
-  wxScrollEvent event( command, win->GetId(), value, orient );
-  event.SetEventObject( win );
-  win->ProcessEvent( event );
-  
-  wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, win->GetId() );
-  cevent.SetEventObject( win );
-  win->ProcessEvent( cevent );
-};
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
 
-IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl)
+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------
 
-wxSlider::wxSlider(void)
-{
-};
+extern bool g_blockEventsOnDrag;
 
-wxSlider::wxSlider( wxWindow *parent, const wxWindowID id,
-        const int value, const int minValue, const int maxValue,
-        const wxPoint& pos, const wxSize& size,
-        const long style,
-/*      const wxValidator& validator = wxDefaultValidator, */
-        const wxString& name )
-{
-  Create( parent, id, value, minValue, maxValue,
-          pos, size, style, name );
-};
+static const float sensitivity = 0.02;
+
+//-----------------------------------------------------------------------------
+// "value_changed"
+//-----------------------------------------------------------------------------
 
-wxSlider::~wxSlider(void)
+extern "C" {
+static void gtk_slider_callback( GtkAdjustment *adjust,
+                                 SCROLLBAR_CBACK_ARG
+                                 wxSlider *win )
 {
-};
+    if (g_isIdle) wxapp_install_idle_handler();
 
-bool wxSlider::Create(wxWindow *parent, const wxWindowID id,
-        const int value, const int minValue, const int maxValue,
-        const wxPoint& pos, const wxSize& size,
-        const long style,
-/*      const wxValidator& validator = wxDefaultValidator, */
-        const wxString& name )
-{
-  m_needParent = TRUE;
-  
-  PreCreation( parent, id, pos, size, style, name );
-  
-  m_oldPos = 0.0;
-
-  if (style & wxSL_VERTICAL == wxSL_VERTICAL)
-    m_widget = gtk_hscale_new( NULL );
-  else
-    m_widget = gtk_vscale_new( NULL );
-    
-  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 );
-  SetRange( minValue, maxValue );
-  SetValue( value );
-  
-  PostCreation();
-  
-  Show( TRUE );
-    
-  return TRUE;
-};
+    if (!win->m_hasVMT) return;
+    if (g_blockEventsOnDrag) return;
 
-int wxSlider::GetValue(void) const
-{
-  return (int)(m_adjust->value+0.5);
-};
+    float diff = adjust->value - win->m_oldPos;
+    if (fabs(diff) < sensitivity) return;
 
-void wxSlider::SetValue( const int value )
-{
-  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" );
-};
+    win->m_oldPos = adjust->value;
 
-void wxSlider::SetRange( const int minValue, const int maxValue )
-{
-  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;
+    wxEventType command = GtkScrollTypeToWx(GET_SCROLL_TYPE(win->m_widget));
 
-  gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
-};
+    double dvalue = adjust->value;
+    int value = (int)(dvalue < 0 ? dvalue - 0.5 : dvalue + 0.5);
 
-int wxSlider::GetMin(void) const
-{
-  return (int)(m_adjust->lower+0.5);
-};
+    int orient = win->GetWindowStyleFlag() & wxSL_VERTICAL ? wxVERTICAL
+                                                           : wxHORIZONTAL;
 
-int wxSlider::GetMax(void) const
-{
-  return (int)(m_adjust->upper+0.5);
-};
+    wxScrollEvent event( command, win->GetId(), value, orient );
+    event.SetEventObject( win );
+    win->GetEventHandler()->ProcessEvent( event );
 
-void wxSlider::SetPageSize( const int pageSize )
-{
-  float fpage = (float)pageSize;
-      
-  if (fabs(fpage-m_adjust->page_increment) < 0.2) return;
-      
-  m_adjust->page_increment = fpage;
+    wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, win->GetId() );
+    cevent.SetEventObject( win );
+    cevent.SetInt( value );
+    win->GetEventHandler()->ProcessEvent( cevent );
+}
+}
 
-  gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
-};
+//-----------------------------------------------------------------------------
+// wxSlider
+//-----------------------------------------------------------------------------
 
-int wxSlider::GetPageSize(void) const
-{
-  return (int)(m_adjust->page_increment+0.5);
-};
+IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl)
 
-void wxSlider::SetThumbLength( const int len )
+bool wxSlider::Create(wxWindow *parent, wxWindowID id,
+        int value, int minValue, int maxValue,
+        const wxPoint& pos, const wxSize& size,
+        long style, const wxValidator& validator, const wxString& name )
 {
-  float flen = (float)len;
-      
-  if (fabs(flen-m_adjust->page_size) < 0.2) return;
-      
-  m_adjust->page_size = flen;
+    m_acceptsFocus = TRUE;
+    m_needParent = TRUE;
+
+    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)
+        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
+        gtk_scale_set_draw_value( GTK_SCALE( m_widget ), FALSE );
+
+    m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) );
+
+#ifdef __WXGTK20__
+    if (style & wxSL_INVERSE)
+        gtk_range_set_inverted( GTK_RANGE(m_widget), TRUE );
+#endif
+
+    GtkEnableEvents();
+
+    SetRange( minValue, maxValue );
+    SetValue( value );
+
+    m_parent->DoAddChild( this );
+
+    PostCreation(size);
 
-  gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
-};
+    return TRUE;
+}
 
-int wxSlider::GetThumbLength(void) const
+int wxSlider::GetValue() const
 {
-  return (int)(m_adjust->page_size+0.5);
-};
+    // we want to round to the nearest integer, i.e. 0.9 is rounded to 1 and
+    // -0.9 is rounded to -1
+    double val = m_adjust->value;
+    return (int)(val < 0 ? val - 0.5 : val + 0.5);
+}
 
-void wxSlider::SetLineSize( const int WXUNUSED(lineSize) )
+void wxSlider::SetValue( int value )
 {
-};
+    float fpos = (float)value;
+    m_oldPos = fpos;
+    if (fabs(fpos-m_adjust->value) < 0.2) return;
 
-int wxSlider::GetLineSize(void) const
+    m_adjust->value = fpos;
+
+    GtkDisableEvents();
+    
+    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
+    
+    GtkEnableEvents();
+}
+
+void wxSlider::SetRange( int minValue, int maxValue )
 {
-  return 0;
-};
+    float fmin = (float)minValue;
+    float fmax = (float)maxValue;
 
-// not supported in wxGTK (and GTK)
+    if ((fabs(fmin-m_adjust->lower) < 0.2) &&
+        (fabs(fmax-m_adjust->upper) < 0.2))
+    {
+        return;
+    }
+
+    m_adjust->lower = fmin;
+    m_adjust->upper = fmax;
+    m_adjust->step_increment = 1.0;
+    m_adjust->page_increment = ceil((fmax-fmin) / 10.0);
+
+    GtkDisableEvents();
+    
+    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+    
+    GtkEnableEvents();
+}
 
-void wxSlider::GetSize( int *x, int *y ) const
+int wxSlider::GetMin() const
 {
-  wxWindow::GetSize( x, y );
-};
+    return (int)ceil(m_adjust->lower);
+}
 
-void wxSlider::SetSize( const int x, const int y, const int width, const int height, const int sizeFlags )
+int wxSlider::GetMax() const
 {
-  wxWindow::SetSize( x, y, width, height, sizeFlags );
-};
+    return (int)ceil(m_adjust->upper);
+}
 
-void wxSlider::GetPosition( int *x, int *y ) const
+void wxSlider::SetPageSize( int pageSize )
 {
-  wxWindow::GetPosition( x, y );
-};
+    float fpage = (float)pageSize;
+
+    if (fabs(fpage-m_adjust->page_increment) < 0.2) return;
 
-void wxSlider::SetTick( const int WXUNUSED(tickPos) )
+    m_adjust->page_increment = fpage;
+
+    GtkDisableEvents();
+    
+    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+    
+    GtkEnableEvents();
+}
+
+int wxSlider::GetPageSize() const
 {
-};
+    return (int)ceil(m_adjust->page_increment);
+}
 
-void wxSlider::SetTickFreq( const int WXUNUSED(n), const int WXUNUSED(pos) )
+void wxSlider::SetThumbLength( int len )
 {
-};
+    float flen = (float)len;
+
+    if (fabs(flen-m_adjust->page_size) < 0.2) return;
 
-int wxSlider::GetTickFreq(void) const
+    m_adjust->page_size = flen;
+
+    GtkDisableEvents();
+    
+    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+    
+    GtkEnableEvents();
+}
+
+int wxSlider::GetThumbLength() const
 {
-  return 0;
-};
+    return (int)ceil(m_adjust->page_size);
+}
 
-void wxSlider::ClearTicks(void)
+void wxSlider::SetLineSize( int WXUNUSED(lineSize) )
 {
-};
+}
 
-void wxSlider::SetSelection( const int WXUNUSED(minPos), const int WXUNUSED(maxPos) )
+int wxSlider::GetLineSize() const
 {
-};
+    return 0;
+}
 
-int wxSlider::GetSelEnd(void) const
+bool wxSlider::IsOwnGtkWindow( GdkWindow *window )
 {
-  return 0;
-};
+    GtkRange *range = GTK_RANGE(m_widget);
+#ifdef __WXGTK20__
+    return (range->event_window == window);
+#else
+    return ( (window == GTK_WIDGET(range)->window)
+                || (window == range->trough)
+                || (window == range->slider)
+                || (window == range->step_forw)
+                || (window == range->step_back) );
+#endif
+}
 
-int wxSlider::GetSelStart(void) const
+void wxSlider::GtkDisableEvents()
 {
-  return 0;
-};
+    gtk_signal_disconnect_by_func( GTK_OBJECT(m_adjust),
+                        GTK_SIGNAL_FUNC(gtk_slider_callback),
+                        (gpointer) this );
+}
 
-void wxSlider::ClearSel(void)
+void wxSlider::GtkEnableEvents()
+{
+    gtk_signal_connect( GTK_OBJECT (m_adjust),
+                        "value_changed",
+                        GTK_SIGNAL_FUNC(gtk_slider_callback),
+                        (gpointer) this );
+}
+
+// static
+wxVisualAttributes
+wxSlider::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-};
+    return GetDefaultAttributesFromGTKWidget(gtk_vscale_new);
+}
 
+#endif