cleanup - more reformatting; fixed bug introduced in prior commit

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

diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp
index 46ebc7ca4def9c2ec92fdc582a09a8442dd12e32..aadb7d0086e89f296a963efcb17f32f79b625ccc 100644 (file)
--- a/src/gtk/scrolbar.cpp
+++ b/src/gtk/scrolbar.cpp
@@ -4,14 +4,9 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "scrolbar.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -20,9 +15,7 @@
 #include "wx/scrolbar.h"
 
 #include "wx/utils.h"
 #include "wx/scrolbar.h"
 
 #include "wx/utils.h"

-
-#include <math.h>
-
+#include "wx/math.h"

 #include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------


@@ -37,7 +30,7 @@ extern bool g_isIdle;
 //-----------------------------------------------------------------------------
 
 extern bool   g_blockEventsOnDrag;
 //-----------------------------------------------------------------------------
 
 extern bool   g_blockEventsOnDrag;

-extern bool   g_blockEventsOnScroll;
+static wxEventType g_currentUpDownEvent = wxEVT_NULL;

 
 static const float sensitivity = 0.02;
 
 
 static const float sensitivity = 0.02;
 


@@ -47,6 +40,7 @@ static const float sensitivity = 0.02;
 
 // FIXME: is GtkScrollType really passed to us as 2nd argument?
 
 
 // FIXME: is GtkScrollType really passed to us as 2nd argument?
 

+extern "C" {

 static void gtk_scrollbar_callback( GtkAdjustment *adjust,
                                     SCROLLBAR_CBACK_ARG
                                     wxScrollBar *win )
 static void gtk_scrollbar_callback( GtkAdjustment *adjust,
                                     SCROLLBAR_CBACK_ARG
                                     wxScrollBar *win )


@@ -68,6 +62,15 @@ static void gtk_scrollbar_callback( GtkAdjustment *adjust,
 
     int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
 
 
     int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
 

+    // throw a LINEUP / LINEDOWN event if necessary
+    if (g_currentUpDownEvent != wxEVT_NULL)
+    {
+        wxScrollEvent event( g_currentUpDownEvent, win->GetId(), value, orient );
+        event.SetEventObject( win );
+        win->GetEventHandler()->ProcessEvent( event );
+    }
+
+    // throw other event (wxEVT_SCROLL_THUMBTRACK)

     wxScrollEvent event( command, win->GetId(), value, orient );
     event.SetEventObject( win );
     win->GetEventHandler()->ProcessEvent( event );
     wxScrollEvent event( command, win->GetId(), value, orient );
     event.SetEventObject( win );
     win->GetEventHandler()->ProcessEvent( event );


@@ -78,31 +81,52 @@ static void gtk_scrollbar_callback( GtkAdjustment *adjust,
     win->ProcessEvent( cevent );
 */
 }
     win->ProcessEvent( cevent );
 */
 }

+}

 
 //-----------------------------------------------------------------------------
 // "button_press_event" from slider
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // "button_press_event" from slider
 //-----------------------------------------------------------------------------

-
+extern "C" {

 static gint gtk_scrollbar_button_press_callback( GtkRange *widget,
                                                  GdkEventButton *gdk_event,
                                                  wxScrollBar *win )
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
 static gint gtk_scrollbar_button_press_callback( GtkRange *widget,
                                                  GdkEventButton *gdk_event,
                                                  wxScrollBar *win )
 {
     if (g_isIdle) wxapp_install_idle_handler();
 

-//  g_blockEventsOnScroll = TRUE;  doesn't work in DialogEd
-
-    // FIXME: there is no slider field any more, what was meant here?
-#ifndef __WXGTK20__
-    win->m_isScrolling = (gdk_event->window == widget->slider);
-#endif
+    // check if a LINEUP/LINEDOWN event must be thrown
+    // I suppose here the size of scrollbar top/bottom buttons is 16px height
+    if (gdk_event->type == GDK_BUTTON_PRESS && gdk_event->button == 1)
+    {
+        int scroll_height, mouse_pos;
+
+        // get the mouse position when the click is done
+        if (win->HasFlag(wxSB_VERTICAL))
+        {
+            scroll_height = GTK_WIDGET(widget)->allocation.height - 16;
+            mouse_pos = (int)gdk_event->y;
+        }
+        else
+        {
+            scroll_height = GTK_WIDGET(widget)->allocation.width - 16;
+            mouse_pos = (int)gdk_event->x;
+        }
+
+        // compare mouse position to scrollbar height
+        if  (mouse_pos > scroll_height)
+            g_currentUpDownEvent = wxEVT_SCROLL_LINEDOWN;
+        else if (mouse_pos < 16)
+            g_currentUpDownEvent = wxEVT_SCROLL_LINEUP;
+      }

 
     return FALSE;
 }
 
     return FALSE;
 }

+}

 
 //-----------------------------------------------------------------------------
 // "button_release_event" from slider
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "button_release_event" from slider
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static gint
 gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
                                        GdkEventButton *WXUNUSED(gdk_event),
 static gint
 gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
                                        GdkEventButton *WXUNUSED(gdk_event),


@@ -111,8 +135,6 @@ gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
     if (g_isIdle)
         wxapp_install_idle_handler();
 
     if (g_isIdle)
         wxapp_install_idle_handler();
 

-//  g_blockEventsOnScroll = FALSE;
-

     if (win->m_isScrolling)
     {
         wxEventType command = wxEVT_SCROLL_THUMBRELEASE;
     if (win->m_isScrolling)
     {
         wxEventType command = wxEVT_SCROLL_THUMBRELEASE;


@@ -124,10 +146,14 @@ gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
         win->GetEventHandler()->ProcessEvent( event );
     }
 
         win->GetEventHandler()->ProcessEvent( event );
     }
 

-    win->m_isScrolling = FALSE;
+    win->m_isScrolling = false;
+
+    // reset the LINEUP/LINEDOWN flag when the mouse button is released
+    g_currentUpDownEvent = wxEVT_NULL;

 
     return FALSE;
 }
 
     return FALSE;
 }

+}

 
 //-----------------------------------------------------------------------------
 // wxScrollBar
 
 //-----------------------------------------------------------------------------
 // wxScrollBar


@@ -143,14 +169,14 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos, const wxSize& size,
            long style, const wxValidator& validator, const wxString& name )
 {
            const wxPoint& pos, const wxSize& size,
            long style, const wxValidator& validator, const wxString& name )
 {

-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
+    m_needParent = true;
+    m_acceptsFocus = true;

 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxScrollBar creation failed") );
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxScrollBar creation failed") );

-        return FALSE;
+        return false;

     }
 
     m_oldPos = 0.0;
     }
 
     m_oldPos = 0.0;


@@ -162,26 +188,20 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
 
     m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) );
 
 
     m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) );
 

-    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 );
 
     PostCreation(size);
 
 
     m_parent->DoAddChild( this );
 
     PostCreation(size);
 

-    return TRUE;
+    return true;

 }
 
 int wxScrollBar::GetThumbPosition() const
 }
 
 int wxScrollBar::GetThumbPosition() const


@@ -214,16 +234,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,


@@ -251,7 +269,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 */


@@ -315,20 +333,7 @@ void wxScrollBar::SetViewLength( int viewLength )
 bool wxScrollBar::IsOwnGtkWindow( GdkWindow *window )
 {
     GtkRange *range = GTK_RANGE(m_widget);
 bool wxScrollBar::IsOwnGtkWindow( GdkWindow *window )
 {
     GtkRange *range = GTK_RANGE(m_widget);

-    return ( (window == GTK_WIDGET(range)->window)
-#ifndef __WXGTK20__
-                || (window == range->trough)
-                || (window == range->slider)
-                || (window == range->step_forw)
-                || (window == range->step_back)
-#endif // GTK+ 1.x
-           );
-}
-
-void wxScrollBar::ApplyWidgetStyle()
-{
-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
+    return ( (window == GTK_WIDGET(range)->window) );

 }
 
 wxSize wxScrollBar::DoGetBestSize() const
 }
 
 wxSize wxScrollBar::DoGetBestSize() const