regenerated configure from new configure.in

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

diff --git a/src/gtk1/slider.cpp b/src/gtk1/slider.cpp
index 3f2b9b84f8e027af584db4463ee8daf1dc25147d..7450b6ac34f0e4ae849ffa31becf7d4b52624724 100644 (file)
--- a/src/gtk1/slider.cpp
+++ b/src/gtk1/slider.cpp
@@ -2,9 +2,8 @@
 // Name:        slider.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -91,6 +90,8 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
   else
     m_widget = gtk_vscale_new( (GtkAdjustment *) NULL );
     
+  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",
@@ -100,6 +101,9 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
   
   PostCreation();
   
+  SetBackgroundColour( parent->GetBackgroundColour() );
+  SetForegroundColour( parent->GetForegroundColour() );
+
   Show( TRUE );
     
   return TRUE;
@@ -186,23 +190,6 @@ int wxSlider::GetLineSize(void) const
   return 0;
 }
 
-// not supported in wxGTK (and GTK)
-
-void wxSlider::GetSize( int *x, int *y ) const
-{
-  wxWindow::GetSize( x, y );
-}
-
-void wxSlider::SetSize( int x, int y, int width, int height, int sizeFlags )
-{
-  wxWindow::SetSize( x, y, width, height, sizeFlags );
-}
-
-void wxSlider::GetPosition( int *x, int *y ) const
-{
-  wxWindow::GetPosition( x, y );
-}
-
 void wxSlider::SetTick( int WXUNUSED(tickPos) )
 {
 }
@@ -248,4 +235,8 @@ bool wxSlider::IsOwnGtkWindow( GdkWindow *window )
           (window == range->step_back) );
 }
 
-
+void wxSlider::ApplyWidgetStyle()
+{
+  SetWidgetStyle();
+  gtk_widget_set_style( m_widget, m_widgetStyle );
+}