tiny fixes

[wxWidgets.git] / src / gtk / slider.cpp

diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp
index d1532a77026410976aaa003e4f8a197aaeb26146..adc016c88f4150bdd203d5ce6d7362169f65643e 100644 (file)
--- a/src/gtk/slider.cpp
+++ b/src/gtk/slider.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:           wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -12,9 +12,22 @@
 #endif
 
 #include "wx/slider.h"
 #endif
 
 #include "wx/slider.h"

+
+#if wxUSE_SLIDER
+

 #include "wx/utils.h"
 #include <math.h>
 
 #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
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------


@@ -25,37 +38,38 @@ extern bool   g_blockEventsOnDrag;
 // "value_changed"
 //-----------------------------------------------------------------------------
 
 // "value_changed"
 //-----------------------------------------------------------------------------
 

-static void gtk_slider_callback( GtkWidget *WXUNUSED(widget), wxSlider *win )
+static void gtk_slider_callback( GtkAdjustment *adjust, wxSlider *win )

 { 
 { 

-  if (!win->HasVMT()) return;
-  if (g_blockEventsOnDrag) return;
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    if (!win->m_hasVMT) return;
+    if (g_blockEventsOnDrag) return;
+
+    float diff = adjust->value - win->m_oldPos;
+    if (fabs(diff) < 0.2) return;

     
     

-  float diff = win->m_adjust->value - win->m_oldPos;
-  if (fabs(diff) < 0.2) return;
-  
-  wxEventType command = wxEVT_NULL;
-  
-  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;
+    win->m_oldPos = adjust->value;
+
+    GtkRange *range = GTK_RANGE( win->m_widget );

 
 

-  int value = (int)(win->m_adjust->value+0.5);
+    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;
+    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 );
+    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->ProcessEvent( cevent );
+    wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, win->GetId() );
+    cevent.SetEventObject( win );
+    win->GetEventHandler()->ProcessEvent( cevent );

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -77,111 +91,145 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
         const wxPoint& pos, const wxSize& size,
         long style, const wxValidator& validator, const wxString& name )
 {
         const wxPoint& pos, const wxSize& size,
         long style, const wxValidator& validator, const wxString& name )
 {

-  m_needParent = TRUE;
+    m_acceptsFocus = TRUE;
+    m_needParent = TRUE;

   
   

-  PreCreation( parent, id, pos, size, style, name );
-  
-  SetValidator( validator );
-
-  m_oldPos = 0.0;
-
-  if (style & wxSL_VERTICAL == wxSL_VERTICAL)
-    m_widget = gtk_hscale_new( (GtkAdjustment *) NULL );
-  else
-    m_widget = gtk_vscale_new( (GtkAdjustment *) NULL );
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( T("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 );

     
     

-  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) );

   
   

-  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 );

   
   

-  gtk_signal_connect (GTK_OBJECT (m_adjust), "value_changed",
-                     (GtkSignalFunc) gtk_slider_callback, (gpointer) this );
-  SetRange( minValue, maxValue );
-  SetValue( value );
+    m_parent->DoAddChild( this );

   
   

-  m_parent->AddChild( this );
-
-  (m_parent->m_insertCallback)( m_parent, this );
-  
-  PostCreation();
+    PostCreation();

   
   

-  SetBackgroundColour( parent->GetBackgroundColour() );
+    SetBackgroundColour( parent->GetBackgroundColour() );

 
 

-  Show( TRUE );
+    Show( TRUE );

     
     

-  return TRUE;
+    return TRUE;

 }
 
 int wxSlider::GetValue(void) const
 {
 }
 
 int wxSlider::GetValue(void) const
 {

-  return (int)(m_adjust->value+0.5);
+    return (int)(m_adjust->value+0.5);

 }
 
 void wxSlider::SetValue( int value )
 {
 }
 
 void wxSlider::SetValue( int value )
 {

-  float fpos = (float)value;
-  m_oldPos = fpos;
-  if (fabs(fpos-m_adjust->value) < 0.2) return;
-  m_adjust->value = fpos;
+    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" );
+    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );

 }
 
 void wxSlider::SetRange( int minValue, int maxValue )
 {
 }
 
 void wxSlider::SetRange( int minValue, int maxValue )
 {

-  float fmin = (float)minValue;
-  float fmax = (float)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;
+    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->lower = fmin;
+    m_adjust->upper = fmax;

 
 

-  gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );

 }
 
 int wxSlider::GetMin(void) const
 {
 }
 
 int wxSlider::GetMin(void) const
 {

-  return (int)(m_adjust->lower+0.5);
+    return (int)ceil(m_adjust->lower);

 }
 
 int wxSlider::GetMax(void) const
 {
 }
 
 int wxSlider::GetMax(void) const
 {

-  return (int)(m_adjust->upper+0.5);
+    return (int)ceil(m_adjust->upper);

 }
 
 void wxSlider::SetPageSize( int pageSize )
 {
 }
 
 void wxSlider::SetPageSize( int pageSize )
 {

-  float fpage = (float)pageSize;
+    float fpage = (float)pageSize;

       
       

-  if (fabs(fpage-m_adjust->page_increment) < 0.2) return;
+    if (fabs(fpage-m_adjust->page_increment) < 0.2) return;

       
       

-  m_adjust->page_increment = fpage;
+    m_adjust->page_increment = fpage;

 
 

-  gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );

 }
 
 int wxSlider::GetPageSize(void) const
 {
 }
 
 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 )
 {
 }
 
 void wxSlider::SetThumbLength( int len )
 {

-  float flen = (float)len;
+    float flen = (float)len;

       
       

-  if (fabs(flen-m_adjust->page_size) < 0.2) return;
+    if (fabs(flen-m_adjust->page_size) < 0.2) return;

       
       

-  m_adjust->page_size = flen;
+    m_adjust->page_size = flen;

 
 

-  gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );

 }
 
 int wxSlider::GetThumbLength(void) const
 {
 }
 
 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) )
 }
 
 void wxSlider::SetLineSize( int WXUNUSED(lineSize) )


@@ -190,7 +238,7 @@ void wxSlider::SetLineSize( int WXUNUSED(lineSize) )
 
 int wxSlider::GetLineSize(void) const
 {
 
 int wxSlider::GetLineSize(void) const
 {

-  return 0;
+    return 0;

 }
 
 void wxSlider::SetTick( int WXUNUSED(tickPos) )
 }
 
 void wxSlider::SetTick( int WXUNUSED(tickPos) )


@@ -203,7 +251,7 @@ void wxSlider::SetTickFreq( int WXUNUSED(n), int WXUNUSED(pos) )
 
 int wxSlider::GetTickFreq(void) const
 {
 
 int wxSlider::GetTickFreq(void) const
 {

-  return 0;
+    return 0;

 }
 
 void wxSlider::ClearTicks(void)
 }
 
 void wxSlider::ClearTicks(void)


@@ -216,12 +264,12 @@ void wxSlider::SetSelection( int WXUNUSED(minPos), int WXUNUSED(maxPos) )
 
 int wxSlider::GetSelEnd(void) const
 {
 
 int wxSlider::GetSelEnd(void) const
 {

-  return 0;
+    return 0;

 }
 
 int wxSlider::GetSelStart(void) const
 {
 }
 
 int wxSlider::GetSelStart(void) const
 {

-  return 0;
+    return 0;

 }
 
 void wxSlider::ClearSel(void)
 }
 
 void wxSlider::ClearSel(void)


@@ -230,16 +278,18 @@ void wxSlider::ClearSel(void)
 
 bool wxSlider::IsOwnGtkWindow( GdkWindow *window )
 {
 
 bool wxSlider::IsOwnGtkWindow( GdkWindow *window )
 {

-  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) );
+    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) );

 }
 
 void wxSlider::ApplyWidgetStyle()
 {
 }
 
 void wxSlider::ApplyWidgetStyle()
 {

-  SetWidgetStyle();
-  gtk_widget_set_style( m_widget, m_widgetStyle );
+    SetWidgetStyle();
+    gtk_widget_set_style( m_widget, m_widgetStyle );

 }
 }

+
+#endif