Don't remove generic status bar from parent, since it can be used on

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

diff --git a/src/gtk1/slider.cpp b/src/gtk1/slider.cpp
index 5f9c8915b66b13acfc924024aafeab4e7e2a8924..bcd260ad6eeeb5c596cdec3f70099a5311205d04 100644 (file)
--- a/src/gtk1/slider.cpp
+++ b/src/gtk1/slider.cpp
@@ -1,66 +1,78 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        slider.cpp
+// Name:        gtk/slider.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "slider.h"
 #endif
 
 #pragma implementation "slider.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include "wx/slider.h"
 #include "wx/slider.h"

+
+#if wxUSE_SLIDER
+

 #include "wx/utils.h"
 #include "wx/utils.h"

+

 #include <math.h>
 
 #include <math.h>
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include "wx/gtk/private.h"
+
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;

 
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 

-extern bool   g_blockEventsOnDrag;
+extern bool g_blockEventsOnDrag;
+
+static const float sensitivity = 0.02;

 
 //-----------------------------------------------------------------------------
 // "value_changed"
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "value_changed"
 //-----------------------------------------------------------------------------
 

-static void gtk_slider_callback( GtkWidget *WXUNUSED(widget), wxSlider *win )
-{ 
-    if (!win->HasVMT()) return;
+static void gtk_slider_callback( GtkAdjustment *adjust,
+                                 SCROLLBAR_CBACK_ARG
+                                 wxSlider *win )
+{
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    if (!win->m_hasVMT) return;

     if (g_blockEventsOnDrag) return;
     if (g_blockEventsOnDrag) 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(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);
-      
-    int orient = wxHORIZONTAL;
-    if (win->GetWindowStyleFlag() & wxSB_VERTICAL == wxSB_VERTICAL) orient = wxVERTICAL;
-  
+
+    float diff = adjust->value - win->m_oldPos;
+    if (fabs(diff) < sensitivity) return;
+
+    win->m_oldPos = adjust->value;
+
+    wxEventType command = GtkScrollTypeToWx(GET_SCROLL_TYPE(win->m_widget));
+
+    double dvalue = adjust->value;
+    int value = (int)(dvalue < 0 ? dvalue - 0.5 : dvalue + 0.5);
+
+    int orient = win->GetWindowStyleFlag() & wxSL_VERTICAL ? wxVERTICAL
+                                                           : wxHORIZONTAL;
+

     wxScrollEvent event( command, win->GetId(), value, orient );
     event.SetEventObject( win );
     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 );
     wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, win->GetId() );
     cevent.SetEventObject( win );

-    win->ProcessEvent( cevent );
+    cevent.SetInt( value );
+    win->GetEventHandler()->ProcessEvent( cevent );

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


@@ -69,14 +81,6 @@ static void gtk_slider_callback( GtkWidget *WXUNUSED(widget), wxSlider *win )
 
 IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl)
 

-wxSlider::wxSlider(void)
-{
-}
-
-wxSlider::~wxSlider(void)
-{
-}
-

 bool wxSlider::Create(wxWindow *parent, wxWindowID id,
         int value, int minValue, int maxValue,
         const wxPoint& pos, const wxSize& size,
 bool wxSlider::Create(wxWindow *parent, wxWindowID id,
         int value, int minValue, int maxValue,
         const wxPoint& pos, const wxSize& size,


@@ -84,46 +88,70 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
 {
     m_acceptsFocus = TRUE;
     m_needParent = TRUE;
 {
     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;
 
 
     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 );
         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
     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) );
     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 );
-       
+
+    GtkEnableEvents();
+

     SetRange( minValue, maxValue );
     SetValue( value );
     SetRange( minValue, maxValue );
     SetValue( value );

-  
-    m_parent->AddChild( this );

 
 

-    (m_parent->m_insertCallback)( m_parent, this );
-  
-    PostCreation();
-  
-    SetBackgroundColour( parent->GetBackgroundColour() );
+    m_parent->DoAddChild( this );
+
+    PostCreation(size);

 
 

-    Show( TRUE );
-    

     return TRUE;
 }
 
     return TRUE;
 }
 

-int wxSlider::GetValue(void) const
+int wxSlider::GetValue() const

 {
 {

-    return (int)(m_adjust->value+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::SetValue( int value )
 }
 
 void wxSlider::SetValue( int value )


@@ -131,127 +159,132 @@ void wxSlider::SetValue( int value )
     float fpos = (float)value;
     m_oldPos = fpos;
     if (fabs(fpos-m_adjust->value) < 0.2) return;
     float fpos = (float)value;
     m_oldPos = fpos;
     if (fabs(fpos-m_adjust->value) < 0.2) return;

-    
+

     m_adjust->value = fpos;
     m_adjust->value = fpos;

-  
+
+    GtkDisableEvents();
+    

     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );

+    
+    GtkEnableEvents();

 }
 
 void wxSlider::SetRange( int minValue, int maxValue )
 {
     float fmin = (float)minValue;
     float fmax = (float)maxValue;
 }
 
 void wxSlider::SetRange( int minValue, 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;
     }
     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;

+    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" );
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );

+    
+    GtkEnableEvents();

 }
 
 }
 

-int wxSlider::GetMin(void) const
+int wxSlider::GetMin() const

 {
 {

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

 }
 
 }
 

-int wxSlider::GetMax(void) const
+int wxSlider::GetMax() const

 {
 {

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

 }
 
 void wxSlider::SetPageSize( int pageSize )
 {
     float fpage = (float)pageSize;
 }
 
 void wxSlider::SetPageSize( int 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;
 

+    GtkDisableEvents();
+    

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

+    
+    GtkEnableEvents();

 }
 
 }
 

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

+    GtkDisableEvents();
+    

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

+    
+    GtkEnableEvents();

 }
 
 }
 

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

-int wxSlider::GetLineSize(void) const
-{
-    return 0;
-}
-
-void wxSlider::SetTick( int WXUNUSED(tickPos) )
-{
-}
-
-void wxSlider::SetTickFreq( int WXUNUSED(n), int WXUNUSED(pos) )
-{
-}
-
-int wxSlider::GetTickFreq(void) const
+int wxSlider::GetLineSize() const

 {
     return 0;
 }
 
 {
     return 0;
 }
 

-void wxSlider::ClearTicks(void)
-{
-}
-
-void wxSlider::SetSelection( int WXUNUSED(minPos), int WXUNUSED(maxPos) )
-{
-}
-
-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 );

 }
 
 }
 

-bool wxSlider::IsOwnGtkWindow( GdkWindow *window )
+// static
+wxVisualAttributes
+wxSlider::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))

 {
 {

-    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) );
+    return GetDefaultAttributesFromGTKWidget(gtk_vscale_new);

 }
 
 }
 

-void wxSlider::ApplyWidgetStyle()
-{
-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
-}
+#endif