X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b1a39f47f8e4e9662ecdecab8f38fca1342202a7..aadbdf11bda695e2ca135ef1e4dc09d6c01d2521:/src/gtk/slider.cpp

diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp
index a9a4e9a7d3..e7f36d0c4c 100644
--- a/src/gtk/slider.cpp
+++ b/src/gtk/slider.cpp
@@ -18,6 +18,13 @@
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
@@ -30,6 +37,8 @@ extern bool   g_blockEventsOnDrag;
 
 static void gtk_slider_callback( GtkWidget *WXUNUSED(widget), wxSlider *win )
 { 
+    if (g_isIdle) wxapp_install_idle_handler();
+
     if (!win->HasVMT()) return;
     if (g_blockEventsOnDrag) return;
     
@@ -92,13 +101,39 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
 
     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 );
+    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),