Further sorting work using the sorting data model.

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

diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp
index dc081675c15aca6f631f09b9357348bd4a3d4222..3a44d755f05e2c5f8cf49d593dd0358904e4b5c2 100644 (file)
--- a/src/gtk/scrolbar.cpp
+++ b/src/gtk/scrolbar.cpp
@@ -42,7 +42,6 @@ static const float sensitivity = 0.02;
 
 extern "C" {
 static void gtk_scrollbar_callback( GtkAdjustment *adjust,
 
 extern "C" {
 static void gtk_scrollbar_callback( GtkAdjustment *adjust,

-                                    SCROLLBAR_CBACK_ARG

                                     wxScrollBar *win )
 {
     if (g_isIdle) wxapp_install_idle_handler();
                                     wxScrollBar *win )
 {
     if (g_isIdle) wxapp_install_idle_handler();


@@ -55,7 +54,7 @@ static void gtk_scrollbar_callback( GtkAdjustment *adjust,
 
     win->m_oldPos = adjust->value;
 
 
     win->m_oldPos = adjust->value;
 

-    wxEventType command = GtkScrollTypeToWx(GET_SCROLL_TYPE(win->m_widget));
+    wxEventType command = GtkScrollTypeToWx(GTK_SCROLL_JUMP);

 
     double dvalue = adjust->value;
     int value = (int)(dvalue < 0 ? dvalue - 0.5 : dvalue + 0.5);
 
     double dvalue = adjust->value;
     int value = (int)(dvalue < 0 ? dvalue - 0.5 : dvalue + 0.5);


@@ -187,19 +186,19 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
         m_widget = gtk_hscrollbar_new( (GtkAdjustment *) NULL );
 
     m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) );
         m_widget = gtk_hscrollbar_new( (GtkAdjustment *) NULL );
 
     m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) );

+    if ( style & wxSB_VERTICAL )
+    {
+        SetVScrollAdjustment(m_adjust);
+    }

 
 

-    gtk_signal_connect( GTK_OBJECT(m_adjust),
-                        "value_changed",
-                        (GtkSignalFunc) gtk_scrollbar_callback,
-                        (gpointer) this );
-    gtk_signal_connect( GTK_OBJECT(m_widget),
-                        "button_press_event",
-                        (GtkSignalFunc)gtk_scrollbar_button_press_callback,
-                        (gpointer) this );
-    gtk_signal_connect( GTK_OBJECT(m_widget),
-                        "button_release_event",
-                        (GtkSignalFunc)gtk_scrollbar_button_release_callback,
-                        (gpointer) this );
+    g_signal_connect (m_adjust, "value_changed",
+                      G_CALLBACK (gtk_scrollbar_callback), this);
+    g_signal_connect (m_widget, "button_press_event",
+                      G_CALLBACK (gtk_scrollbar_button_press_callback),
+                      this);
+    g_signal_connect (m_widget, "button_release_event",
+                      G_CALLBACK (gtk_scrollbar_button_release_callback),
+                      this);

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


@@ -238,16 +237,14 @@ void wxScrollBar::SetThumbPosition( int viewStart )
     if (fabs(fpos-m_adjust->value) < 0.2) return;
     m_adjust->value = fpos;
 
     if (fabs(fpos-m_adjust->value) < 0.2) return;
     m_adjust->value = fpos;
 

-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_adjust),
-                        (GtkSignalFunc) gtk_scrollbar_callback,
-                        (gpointer) this );
+    g_signal_handlers_disconnect_by_func (m_adjust,
+                                          (gpointer) gtk_scrollbar_callback,
+                                          this);

 
 

-    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
+    g_signal_emit_by_name (m_adjust, "value_changed");

 
 

-    gtk_signal_connect( GTK_OBJECT(m_adjust),
-                        "value_changed",
-                        (GtkSignalFunc) gtk_scrollbar_callback,
-                        (gpointer) this );
+    g_signal_connect (m_adjust, "value_changed",
+                      G_CALLBACK (gtk_scrollbar_callback), this);

 }
 
 void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int pageSize,
 }
 
 void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int pageSize,


@@ -275,7 +272,7 @@ void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int page
     m_adjust->page_increment = (float)(wxMax(fpage,0));
     m_adjust->page_size = fthumb;
 
     m_adjust->page_increment = (float)(wxMax(fpage,0));
     m_adjust->page_size = fthumb;
 

-    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+    g_signal_emit_by_name (m_adjust, "changed");

 }
 
 /* Backward compatibility */
 }
 
 /* Backward compatibility */