speeding up rectangle drawing by using specific methods, needs 40% less time

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

diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp
index 83deaec5f310f56f656a2fc1a17619e8958d4141..0527106ad9ef200045956cc93d1339ad55eab0ba 100644 (file)
--- a/src/gtk/slider.cpp
+++ b/src/gtk/slider.cpp
@@ -20,6 +20,7 @@
 #endif
 
 #include <gtk/gtk.h>
 #endif
 
 #include <gtk/gtk.h>

+#include "wx/gtk/private/gtk2-compat.h"

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


@@ -124,10 +125,9 @@ extern "C" {
 static void
 gtk_value_changed(GtkRange* range, wxSlider* win)
 {
 static void
 gtk_value_changed(GtkRange* range, wxSlider* win)
 {

-    GtkAdjustment* adj = gtk_range_get_adjustment (range);
-    const int pos = wxRound(adj->value);
+    const double value = gtk_range_get_value(range);

     const double oldPos = win->m_pos;
     const double oldPos = win->m_pos;

-    win->m_pos = adj->value;
+    win->m_pos = value;

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


@@ -151,18 +151,19 @@ gtk_value_changed(GtkRange* range, wxSlider* win)
     else if (win->m_mouseButtonDown)
     {
         // Difference from last change event
     else if (win->m_mouseButtonDown)
     {
         // Difference from last change event

-        const double diff = adj->value - oldPos;
+        const double diff = value - oldPos;

         const bool isDown = diff > 0;
 
         const bool isDown = diff > 0;
 

-        if (IsScrollIncrement(adj->page_increment, diff))
+        GtkAdjustment* adj = gtk_range_get_adjustment(range);
+        if (IsScrollIncrement(gtk_adjustment_get_page_increment(adj), diff))

         {
             eventType = isDown ? wxEVT_SCROLL_PAGEDOWN : wxEVT_SCROLL_PAGEUP;
         }
         {
             eventType = isDown ? wxEVT_SCROLL_PAGEDOWN : wxEVT_SCROLL_PAGEUP;
         }

-        else if (wxIsSameDouble(adj->value, 0))
+        else if (wxIsSameDouble(value, 0))

         {
             eventType = wxEVT_SCROLL_PAGEUP;
         }
         {
             eventType = wxEVT_SCROLL_PAGEUP;
         }

-        else if (wxIsSameDouble(adj->value, adj->upper))
+        else if (wxIsSameDouble(value, gtk_adjustment_get_upper(adj)))

         {
             eventType = wxEVT_SCROLL_PAGEDOWN;
         }
         {
             eventType = wxEVT_SCROLL_PAGEDOWN;
         }


@@ -178,7 +179,7 @@ gtk_value_changed(GtkRange* range, wxSlider* win)
     win->m_scrollEventType = GTK_SCROLL_NONE;
 
     // If integral position has changed
     win->m_scrollEventType = GTK_SCROLL_NONE;
 
     // If integral position has changed

-    if (wxRound(oldPos) != pos)
+    if (wxRound(oldPos) != wxRound(value))

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


@@ -272,8 +273,6 @@ static gchar* gtk_format_value(GtkScale*, double value, void*)
 // wxSlider
 //-----------------------------------------------------------------------------
 
 // wxSlider
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl)
-

 wxSlider::wxSlider()
 {
     m_pos = 0;
 wxSlider::wxSlider()
 {
     m_pos = 0;


@@ -440,6 +439,8 @@ void wxSlider::GTKSetValue(int value)
 {
     GTKDisableEvents();
     gtk_range_set_value(GTK_RANGE (m_scale), value);
 {
     GTKDisableEvents();
     gtk_range_set_value(GTK_RANGE (m_scale), value);

+    // GTK only updates value label if handle moves at least 1 pixel
+    gtk_widget_queue_draw(m_scale);

     GTKEnableEvents();
 }
 
     GTKEnableEvents();
 }
 


@@ -473,12 +474,14 @@ void wxSlider::SetRange( int minValue, int maxValue )
 
 int wxSlider::GetMin() const
 {
 
 int wxSlider::GetMin() const
 {

-    return int(gtk_range_get_adjustment (GTK_RANGE (m_scale))->lower);
+    GtkAdjustment* adj = gtk_range_get_adjustment(GTK_RANGE(m_scale));
+    return int(gtk_adjustment_get_lower(adj));

 }
 
 int wxSlider::GetMax() const
 {
 }
 
 int wxSlider::GetMax() const
 {

-    return int(gtk_range_get_adjustment (GTK_RANGE (m_scale))->upper);
+    GtkAdjustment* adj = gtk_range_get_adjustment(GTK_RANGE(m_scale));
+    return int(gtk_adjustment_get_upper(adj));

 }
 
 void wxSlider::SetPageSize( int pageSize )
 }
 
 void wxSlider::SetPageSize( int pageSize )


@@ -490,7 +493,8 @@ void wxSlider::SetPageSize( int pageSize )
 
 int wxSlider::GetPageSize() const
 {
 
 int wxSlider::GetPageSize() const
 {

-    return int(gtk_range_get_adjustment (GTK_RANGE (m_scale))->page_increment);
+    GtkAdjustment* adj = gtk_range_get_adjustment(GTK_RANGE(m_scale));
+    return int(gtk_adjustment_get_page_increment(adj));

 }
 
 // GTK does not support changing the size of the slider
 }
 
 // GTK does not support changing the size of the slider


@@ -512,7 +516,8 @@ void wxSlider::SetLineSize( int lineSize )
 
 int wxSlider::GetLineSize() const
 {
 
 int wxSlider::GetLineSize() const
 {

-    return int(gtk_range_get_adjustment (GTK_RANGE (m_scale))->step_increment);
+    GtkAdjustment* adj = gtk_range_get_adjustment(GTK_RANGE(m_scale));
+    return int(gtk_adjustment_get_step_increment(adj));

 }
 
 GdkWindow *wxSlider::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
 }
 
 GdkWindow *wxSlider::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const