added WXMAC default font sizes

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

diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp
index 4d21168158e29f2f77e32cae189071cc2ccf3c03..5aa22195f87d1ccf6567a77e79cabb8e46ef6152 100644 (file)
--- a/src/gtk/scrolbar.cpp
+++ b/src/gtk/scrolbar.cpp
@@ -17,10 +17,11 @@
 #if wxUSE_SCROLLBAR
 
 #include "wx/utils.h"
+
 #include <math.h>
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // idle system
@@ -36,6 +37,8 @@ extern bool g_isIdle;
 extern bool   g_blockEventsOnDrag;
 extern bool   g_blockEventsOnScroll;
 
+static const float sensitivity = 0.02;
+
 //-----------------------------------------------------------------------------
 // "value_changed"
 //-----------------------------------------------------------------------------
@@ -48,7 +51,7 @@ static void gtk_scrollbar_callback( GtkAdjustment *adjust, wxScrollBar *win )
     if (g_blockEventsOnDrag) return;
     
     float diff = adjust->value - win->m_oldPos;
-    if (fabs(diff) < 0.2) return;
+    if (fabs(diff) < sensitivity) return;
     
     win->m_oldPos = adjust->value;
 
@@ -85,7 +88,7 @@ static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget),
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
-    win->SetScrolling(TRUE);
+    win->m_isScrolling = TRUE;
 //  g_blockEventsOnScroll = TRUE;  doesn't work in DialogEd
   
     return FALSE;
@@ -100,11 +103,20 @@ static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
                                                    wxScrollBar *win )
 {
     if (g_isIdle) wxapp_install_idle_handler();
+    
+    wxASSERT( win->m_isScrolling );
 
-    win->SetScrolling(FALSE);
+    win->m_isScrolling = FALSE;
 //  g_blockEventsOnScroll = FALSE;
   
-    gtk_signal_emit_by_name( GTK_OBJECT(win->m_adjust), "value_changed" );
+    wxEventType command = wxEVT_SCROLL_THUMBTRACK;
+    int value = (int)ceil(win->m_adjust->value);
+    int dir = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
+
+    wxScrollEvent event( command, value, dir );
+    event.SetScrolling( FALSE );
+    event.SetEventObject( win );
+    win->GetEventHandler()->ProcessEvent( event );
       
     return FALSE;
 }
@@ -129,7 +141,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
-        wxFAIL_MSG( T("wxScrollBar creation failed") );
+        wxFAIL_MSG( wxT("wxScrollBar creation failed") );
        return FALSE;
     }