X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/858b5bddf67a137c09cd1ac63820a02a4dc3efb3..f377a3b58c509ceba8c9335dbe45d100cca615ad:/src/gtk1/slider.cpp?ds=sidebyside

diff --git a/src/gtk1/slider.cpp b/src/gtk1/slider.cpp
index e7f36d0c4c..b2f0bccefc 100644
--- a/src/gtk1/slider.cpp
+++ b/src/gtk1/slider.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:           wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -12,6 +12,9 @@
 #endif
 
 #include "wx/slider.h"
+
+#if wxUSE_SLIDER
+
 #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 (!win->HasVMT()) return;
+    if (!win->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
     
     float diff = win->m_adjust->value - win->m_oldPos;
@@ -97,7 +100,9 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
   
     PreCreation( parent, id, pos, size, style, name );
   
+#if wxUSE_VALIDATORS
     SetValidator( validator );
+#endif
 
     m_oldPos = 0.0;
 
@@ -109,27 +114,27 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
     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 */
+        
+        /* 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 );
-	    }
-	}
+        {
+            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 );
-	    }
-	}
+        {
+            wxSize sz( size );
+            if (sz.y < 35)
+            {
+                sz.y = 35;
+                SetSize( sz );
+            }
+        }
     }
     else
         gtk_scale_set_draw_value( GTK_SCALE( m_widget ), FALSE );
@@ -138,15 +143,13 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
   
     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();
   
@@ -281,9 +284,9 @@ 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) );
+             (window == range->slider) ||
+             (window == range->step_forw) ||
+             (window == range->step_back) );
 }
 
 void wxSlider::ApplyWidgetStyle()
@@ -291,3 +294,5 @@ void wxSlider::ApplyWidgetStyle()
     SetWidgetStyle();
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
+
+#endif