mac paths updated

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

diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp
index 0a75a32c556ea8d2781a649f99ef71266a552101..f14ae6394ae551c4ed25c47bdd6eb9b95f7b64bc 100644 (file)
--- a/src/gtk/slider.cpp
+++ b/src/gtk/slider.cpp
@@ -19,7 +19,7 @@
     #include "wx/math.h"
 #endif
 
     #include "wx/math.h"
 #endif
 

-#include "wx/gtk/private.h"
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // data
 
 //-----------------------------------------------------------------------------
 // data


@@ -46,7 +46,7 @@ ProcessScrollEvent(wxSlider *win, wxEventType evtType)
     {
         wxScrollEvent event( evtType, win->GetId(), value, orient );
         event.SetEventObject( win );
     {
         wxScrollEvent event( evtType, win->GetId(), value, orient );
         event.SetEventObject( win );

-        win->GetEventHandler()->ProcessEvent( event );
+        win->HandleWindowEvent( event );

     }
 
     // but, in any case, except if we're dragging the slider (and so the change
     }
 
     // but, in any case, except if we're dragging the slider (and so the change


@@ -55,14 +55,14 @@ ProcessScrollEvent(wxSlider *win, wxEventType evtType)
     {
         wxScrollEvent event(wxEVT_SCROLL_CHANGED, win->GetId(), value, orient);
         event.SetEventObject( win );
     {
         wxScrollEvent event(wxEVT_SCROLL_CHANGED, win->GetId(), value, orient);
         event.SetEventObject( win );

-        win->GetEventHandler()->ProcessEvent( event );
+        win->HandleWindowEvent( event );

     }
 
     // and also generate a command event for compatibility
     wxCommandEvent event( wxEVT_COMMAND_SLIDER_UPDATED, win->GetId() );
     event.SetEventObject( win );
     event.SetInt( value );
     }
 
     // and also generate a command event for compatibility
     wxCommandEvent event( wxEVT_COMMAND_SLIDER_UPDATED, win->GetId() );
     event.SetEventObject( win );
     event.SetInt( value );

-    win->GetEventHandler()->ProcessEvent( event );
+    win->HandleWindowEvent( event );

 }
 
 static inline wxEventType GtkScrollTypeToWx(int scrollType)
 }
 
 static inline wxEventType GtkScrollTypeToWx(int scrollType)


@@ -124,15 +124,14 @@ extern "C" {
 static void
 gtk_value_changed(GtkRange* range, wxSlider* win)
 {
 static void
 gtk_value_changed(GtkRange* range, wxSlider* win)
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-
-    if (!win->m_hasVMT) return;
-    if (g_blockEventsOnDrag) return;
-

     GtkAdjustment* adj = gtk_range_get_adjustment (range);
     const int pos = wxRound(adj->value);
     const double oldPos = win->m_pos;
     win->m_pos = adj->value;
     GtkAdjustment* adj = gtk_range_get_adjustment (range);
     const int pos = wxRound(adj->value);
     const double oldPos = win->m_pos;
     win->m_pos = adj->value;

+
+    if (!win->m_hasVMT || g_blockEventsOnDrag)
+        return;
+

     if (win->m_blockScrollEvent)
     {
         win->m_scrollEventType = GTK_SCROLL_NONE;
     if (win->m_blockScrollEvent)
     {
         win->m_scrollEventType = GTK_SCROLL_NONE;


@@ -181,7 +180,6 @@ gtk_value_changed(GtkRange* range, wxSlider* win)
     // If integral position has changed
     if (wxRound(oldPos) != pos)
     {
     // If integral position has changed
     if (wxRound(oldPos) != pos)
     {

-        wxCHECK_RET(eventType != wxEVT_NULL, _T("Unknown slider scroll event type"));

         ProcessScrollEvent(win, eventType);
         win->m_needThumbRelease = eventType == wxEVT_SCROLL_THUMBTRACK;
     }
         ProcessScrollEvent(win, eventType);
         win->m_needThumbRelease = eventType == wxEVT_SCROLL_THUMBTRACK;
     }


@@ -233,9 +231,9 @@ gtk_event_after(GtkRange* range, GdkEvent* event, wxSlider* win)
             ProcessScrollEvent(win, wxEVT_SCROLL_THUMBRELEASE);
         }
         // Keep slider at an integral position
             ProcessScrollEvent(win, wxEVT_SCROLL_THUMBRELEASE);
         }
         // Keep slider at an integral position

-        win->BlockScrollEvent();
+        win->m_blockScrollEvent = true;

         gtk_range_set_value(GTK_RANGE (win->m_widget), win->GetValue());
         gtk_range_set_value(GTK_RANGE (win->m_widget), win->GetValue());

-        win->UnblockScrollEvent();
+        win->m_blockScrollEvent = false;

     }
 }
 }
     }
 }
 }


@@ -279,17 +277,24 @@ IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl)
 wxSlider::wxSlider()
 {
     m_pos = 0;
 wxSlider::wxSlider()
 {
     m_pos = 0;

-    m_scrollEventType = 0;
+    m_scrollEventType = GTK_SCROLL_NONE;

     m_needThumbRelease = false;
     m_needThumbRelease = false;

+    m_blockScrollEvent = false;

 }
 
 }
 

-bool wxSlider::Create(wxWindow *parent, wxWindowID id,
-        int value, int minValue, int maxValue,
-        const wxPoint& pos, const wxSize& size,
-        long style, const wxValidator& validator, const wxString& name )
+bool wxSlider::Create(wxWindow *parent,
+                      wxWindowID id,
+                      int value,
+                      int minValue,
+                      int maxValue,
+                      const wxPoint& pos,
+                      const wxSize& size,
+                      long style,
+                      const wxValidator& validator,
+                      const wxString& name)

 {
 {

-    m_acceptsFocus = true;
-    m_needParent = true;
+    m_pos = value;
+    m_scrollEventType = GTK_SCROLL_NONE;

 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))


@@ -298,10 +303,6 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
         return false;
     }
 
         return false;
     }
 

-    m_pos = 0;
-    m_scrollEventType = 0;
-    m_needThumbRelease = false;
-

     if (style & wxSL_VERTICAL)
         m_widget = gtk_vscale_new( (GtkAdjustment *) NULL );
     else
     if (style & wxSL_VERTICAL)
         m_widget = gtk_vscale_new( (GtkAdjustment *) NULL );
     else


@@ -319,13 +320,14 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
     g_signal_connect(m_widget, "move_slider", G_CALLBACK(gtk_move_slider), this);
     g_signal_connect(m_widget, "format_value", G_CALLBACK(gtk_format_value), NULL);
     g_signal_connect(m_widget, "value_changed", G_CALLBACK(gtk_value_changed), this);
     g_signal_connect(m_widget, "move_slider", G_CALLBACK(gtk_move_slider), this);
     g_signal_connect(m_widget, "format_value", G_CALLBACK(gtk_format_value), NULL);
     g_signal_connect(m_widget, "value_changed", G_CALLBACK(gtk_value_changed), this);

-    gulong handler_id;
-    handler_id = g_signal_connect(
-        m_widget, "event_after", G_CALLBACK(gtk_event_after), this);
+    gulong handler_id = g_signal_connect(m_widget, "event_after", G_CALLBACK(gtk_event_after), this);

     g_signal_handler_block(m_widget, handler_id);
 
     SetRange( minValue, maxValue );
     g_signal_handler_block(m_widget, handler_id);
 
     SetRange( minValue, maxValue );

-    SetValue( value );
+
+    // don't call the public SetValue() as it won't do anything unless the
+    // value really changed
+    GTKSetValue( value );

 
     m_parent->DoAddChild( this );
 
 
     m_parent->DoAddChild( this );
 


@@ -342,26 +344,24 @@ int wxSlider::GetValue() const
 void wxSlider::SetValue( int value )
 {
     if (GetValue() != value)
 void wxSlider::SetValue( int value )
 {
     if (GetValue() != value)

-    {
-        BlockScrollEvent();
-        gtk_range_set_value(GTK_RANGE (m_widget), value);
-        UnblockScrollEvent();
+        GTKSetValue(value);
+}

 
 

-        // keep m_pos in sync in case the value_changed callback didn't didn't
-        // get called, such as when the widget is first created
-        if (GetValue() != value)
-        {
-            m_pos = gtk_range_get_value(GTK_RANGE(m_widget));
-        }
-    }
+void wxSlider::GTKSetValue(int value)
+{
+    m_blockScrollEvent = true;
+    gtk_range_set_value(GTK_RANGE (m_widget), value);
+    m_blockScrollEvent = false;

 }
 
 void wxSlider::SetRange( int minValue, int maxValue )
 {
 }
 
 void wxSlider::SetRange( int minValue, int maxValue )
 {

-    BlockScrollEvent();
+    m_blockScrollEvent = true;
+    if (minValue == maxValue)
+       maxValue++;

     gtk_range_set_range(GTK_RANGE (m_widget), minValue, maxValue);
     gtk_range_set_increments(GTK_RANGE (m_widget), 1, (maxValue - minValue + 9) / 10);
     gtk_range_set_range(GTK_RANGE (m_widget), minValue, maxValue);
     gtk_range_set_increments(GTK_RANGE (m_widget), 1, (maxValue - minValue + 9) / 10);

-    UnblockScrollEvent();
+    m_blockScrollEvent = false;

 }
 
 int wxSlider::GetMin() const
 }
 
 int wxSlider::GetMin() const


@@ -376,9 +376,9 @@ int wxSlider::GetMax() const
 
 void wxSlider::SetPageSize( int pageSize )
 {
 
 void wxSlider::SetPageSize( int pageSize )
 {

-    BlockScrollEvent();
+    m_blockScrollEvent = true;

     gtk_range_set_increments(GTK_RANGE (m_widget), GetLineSize(), pageSize);
     gtk_range_set_increments(GTK_RANGE (m_widget), GetLineSize(), pageSize);

-    UnblockScrollEvent();
+    m_blockScrollEvent = false;

 }
 
 int wxSlider::GetPageSize() const
 }
 
 int wxSlider::GetPageSize() const


@@ -398,9 +398,9 @@ int wxSlider::GetThumbLength() const
 
 void wxSlider::SetLineSize( int lineSize )
 {
 
 void wxSlider::SetLineSize( int lineSize )
 {

-    BlockScrollEvent();
+    m_blockScrollEvent = true;

     gtk_range_set_increments(GTK_RANGE (m_widget), lineSize, GetPageSize());
     gtk_range_set_increments(GTK_RANGE (m_widget), lineSize, GetPageSize());

-    UnblockScrollEvent();
+    m_blockScrollEvent = false;

 }
 
 int wxSlider::GetLineSize() const
 }
 
 int wxSlider::GetLineSize() const