fix from Ron for one-shot timers

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

diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp
index 3c7c1ade23184faf52ace2122df0f23083c40194..5d115ba3b87651642e5bc06a620f8110a31d909a 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,6 +12,9 @@
 #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>
 


@@ -39,7 +42,7 @@ static void gtk_slider_callback( GtkWidget *WXUNUSED(widget), wxSlider *win )
 { 
     if (g_isIdle) wxapp_install_idle_handler();
 
 { 
     if (g_isIdle) wxapp_install_idle_handler();
 

-    if (!win->HasVMT()) return;
+    if (!win->m_hasVMT) return;

     if (g_blockEventsOnDrag) return;
     
     float diff = win->m_adjust->value - win->m_oldPos;
     if (g_blockEventsOnDrag) return;
     
     float diff = win->m_adjust->value - win->m_oldPos;


@@ -95,32 +98,59 @@ 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( _T("wxSlider creation failed") );
+       return FALSE;
+    }

 
     m_oldPos = 0.0;
 
 
     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 );
         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",
     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 );
   
     SetRange( minValue, maxValue );
     SetValue( value );
   

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

   
     PostCreation();
   
   
     PostCreation();
   


@@ -255,9 +285,9 @@ bool wxSlider::IsOwnGtkWindow( GdkWindow *window )
     GtkRange *range = GTK_RANGE(m_widget);
     return ( (window == GTK_WIDGET(range)->window) ||
              (window == range->trough) ||
     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()
 }
 
 void wxSlider::ApplyWidgetStyle()


@@ -265,3 +295,5 @@ void wxSlider::ApplyWidgetStyle()
     SetWidgetStyle();
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
     SetWidgetStyle();
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }

+
+#endif