Convert wxFSW_EVENT_{WARNING,ERROR} to string correctly.

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

diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp
index 78f0d118089c74c7bc771ec78d0e928a96291c49..dd3b3889ee5b17b946f4aa22b0f8a38ab7c65798 100644 (file)
--- a/src/gtk/slider.cpp
+++ b/src/gtk/slider.cpp
@@ -129,7 +129,7 @@ gtk_value_changed(GtkRange* range, wxSlider* win)
     const double oldPos = win->m_pos;
     win->m_pos = value;
 
-    if (!win->m_hasVMT || g_blockEventsOnDrag)
+    if (g_blockEventsOnDrag)
         return;
 
     if (win->GTKEventsDisabled())
@@ -275,10 +275,13 @@ static gchar* gtk_format_value(GtkScale*, double value, void*)
 
 wxSlider::wxSlider()
 {
-    m_pos = 0;
-    m_scrollEventType = GTK_SCROLL_NONE;
-    m_needThumbRelease = false;
-    m_blockScrollEvent = false;
+    m_scale = NULL;
+}
+
+wxSlider::~wxSlider()
+{
+    if (m_scale && m_scale != m_widget)
+        GTKDisconnect(m_scale);
 }
 
 bool wxSlider::Create(wxWindow *parent,
@@ -294,6 +297,8 @@ bool wxSlider::Create(wxWindow *parent,
 {
     m_pos = value;
     m_scrollEventType = GTK_SCROLL_NONE;
+    m_needThumbRelease = false;
+    m_blockScrollEvent = false;
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
@@ -307,7 +312,6 @@ bool wxSlider::Create(wxWindow *parent,
         m_scale = gtk_vscale_new( NULL );
     else
         m_scale = gtk_hscale_new( NULL );
-    g_object_ref(m_scale);
 
     if (style & wxSL_MIN_MAX_LABELS)
     {
@@ -317,7 +321,6 @@ bool wxSlider::Create(wxWindow *parent,
             m_widget = gtk_hbox_new(false, 0);
         else
             m_widget = gtk_vbox_new(false, 0);
-        g_object_ref(m_widget);
         gtk_container_add( GTK_CONTAINER(m_widget), m_scale );
 
         GtkWidget *box;
@@ -325,25 +328,21 @@ bool wxSlider::Create(wxWindow *parent,
             box = gtk_vbox_new(false,0);
         else
             box = gtk_hbox_new(false,0);
-        g_object_ref(box);
         gtk_widget_show(box);
         gtk_container_add( GTK_CONTAINER(m_widget), box );
 
         m_minLabel = gtk_label_new(NULL);
-        g_object_ref(m_minLabel);
         gtk_widget_show( m_minLabel );
         gtk_container_add( GTK_CONTAINER(box), m_minLabel );
         gtk_box_set_child_packing( GTK_BOX(box), m_minLabel, FALSE, FALSE, 0, GTK_PACK_START );
 
         // expanding empty space between the min/max labels
         GtkWidget *space = gtk_label_new(NULL);
-        g_object_ref(space);
         gtk_widget_show( space );
         gtk_container_add( GTK_CONTAINER(box), space );
         gtk_box_set_child_packing( GTK_BOX(box), space, TRUE, FALSE, 0, GTK_PACK_START );
 
         m_maxLabel = gtk_label_new(NULL);
-        g_object_ref(m_maxLabel);
         gtk_widget_show( m_maxLabel );
         gtk_container_add( GTK_CONTAINER(box), m_maxLabel );
         gtk_box_set_child_packing( GTK_BOX(box), m_maxLabel, FALSE, FALSE, 0, GTK_PACK_END );
@@ -354,6 +353,7 @@ bool wxSlider::Create(wxWindow *parent,
         m_maxLabel = NULL;
         m_minLabel = NULL;
     }
+    g_object_ref(m_widget);
 
     const bool showValueLabel = (style & wxSL_VALUE_LABEL) != 0;
     gtk_scale_set_draw_value(GTK_SCALE (m_scale), showValueLabel );