stop usign a deprecated method, and ensure that the imagelist

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

diff --git a/src/gtk1/scrolbar.cpp b/src/gtk1/scrolbar.cpp
index 4d21168158e29f2f77e32cae189071cc2ccf3c03..42fa93452df1121c0b1f2688c68a1176cec51ff7 100644 (file)
--- a/src/gtk1/scrolbar.cpp
+++ b/src/gtk1/scrolbar.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        scrolbar.cpp
+// Name:        src/gtk/scrolbar.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

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

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


@@ -12,15 +12,17 @@
 #pragma implementation "scrolbar.h"
 #endif
 
 #pragma implementation "scrolbar.h"
 #endif
 

-#include "wx/scrolbar.h"
+#include "wx/defs.h"

 
 #if wxUSE_SCROLLBAR
 
 
 #if wxUSE_SCROLLBAR
 

+#include "wx/scrolbar.h"
+

 #include "wx/utils.h"
 #include "wx/utils.h"

+

 #include <math.h>
 
 #include <math.h>
 

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

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -36,38 +38,39 @@ extern bool g_isIdle;
 extern bool   g_blockEventsOnDrag;
 extern bool   g_blockEventsOnScroll;
 
 extern bool   g_blockEventsOnDrag;
 extern bool   g_blockEventsOnScroll;
 

+static const float sensitivity = 0.02;
+

 //-----------------------------------------------------------------------------
 // "value_changed"
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // "value_changed"
 //-----------------------------------------------------------------------------
 

-static void gtk_scrollbar_callback( GtkAdjustment *adjust, wxScrollBar *win )
-{ 
+// FIXME: is GtkScrollType really passed to us as 2nd argument?
+
+static void gtk_scrollbar_callback( GtkAdjustment *adjust,
+                                    SCROLLBAR_CBACK_ARG
+                                    wxScrollBar *win )
+{

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

-    
+

     float diff = adjust->value - win->m_oldPos;
     float diff = adjust->value - win->m_oldPos;

-    if (fabs(diff) < 0.2) return;
-    
+    if (fabs(diff) < sensitivity) return;
+

     win->m_oldPos = adjust->value;
 
     win->m_oldPos = adjust->value;
 

-    GtkRange *range = GTK_RANGE( win->m_widget );
+    wxEventType command = GtkScrollTypeToWx(GET_SCROLL_TYPE(win->m_widget));
+
+    double dvalue = adjust->value;
+    int value = (int)(dvalue < 0 ? dvalue - 0.5 : dvalue + 0.5);

 
 

-    wxEventType command = wxEVT_SCROLL_THUMBTRACK;
-    if      (range->scroll_type == GTK_SCROLL_STEP_BACKWARD) command = wxEVT_SCROLL_LINEUP;
-    else if (range->scroll_type == GTK_SCROLL_STEP_FORWARD)  command = wxEVT_SCROLL_LINEDOWN;
-    else if (range->scroll_type == GTK_SCROLL_PAGE_BACKWARD) command = wxEVT_SCROLL_PAGEUP;
-    else if (range->scroll_type == GTK_SCROLL_PAGE_FORWARD)  command = wxEVT_SCROLL_PAGEDOWN;
-    
-    int value = (int)ceil(adjust->value);
-      

     int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
     int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;

-  
+

     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 );

-  
+

 /*
     wxCommandEvent cevent( wxEVT_COMMAND_SCROLLBAR_UPDATED, win->GetId() );
     cevent.SetEventObject( win );
 /*
     wxCommandEvent cevent( wxEVT_COMMAND_SCROLLBAR_UPDATED, win->GetId() );
     cevent.SetEventObject( win );


@@ -79,15 +82,19 @@ static void gtk_scrollbar_callback( GtkAdjustment *adjust, wxScrollBar *win )
 // "button_press_event" from slider
 //-----------------------------------------------------------------------------
 
 // "button_press_event" from slider
 //-----------------------------------------------------------------------------
 

-static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget), 
-                                                 GdkEventButton *WXUNUSED(gdk_event), 
+static gint gtk_scrollbar_button_press_callback( GtkRange *widget,
+                                                 GdkEventButton *gdk_event,

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

-    win->SetScrolling(TRUE);

 //  g_blockEventsOnScroll = TRUE;  doesn't work in DialogEd
 //  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
+

     return FALSE;
 }
 
     return FALSE;
 }
 


@@ -95,17 +102,29 @@ static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget),
 // "button_release_event" from slider
 //-----------------------------------------------------------------------------
 
 // "button_release_event" from slider
 //-----------------------------------------------------------------------------
 

-static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget), 
-                                                   GdkEventButton *WXUNUSED(gdk_event), 
-                                                   wxScrollBar *win )
+static gint
+gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
+                                       GdkEventButton *WXUNUSED(gdk_event),
+                                       wxScrollBar *win )

 {
 {

-    if (g_isIdle) wxapp_install_idle_handler();
+    if (g_isIdle)
+        wxapp_install_idle_handler();

 
 

-    win->SetScrolling(FALSE);

 //  g_blockEventsOnScroll = FALSE;
 //  g_blockEventsOnScroll = FALSE;

-  
-    gtk_signal_emit_by_name( GTK_OBJECT(win->m_adjust), "value_changed" );
-      
+
+    if (win->m_isScrolling)
+    {
+        wxEventType command = wxEVT_SCROLL_THUMBRELEASE;
+        int value = (int)ceil(win->m_adjust->value);
+        int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
+
+        wxScrollEvent event( command, win->GetId(), value, orient );
+        event.SetEventObject( win );
+        win->GetEventHandler()->ProcessEvent( event );
+    }
+
+    win->m_isScrolling = FALSE;
+

     return FALSE;
 }
 
     return FALSE;
 }
 


@@ -115,7 +134,7 @@ static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl)
 

-wxScrollBar::~wxScrollBar(void)
+wxScrollBar::~wxScrollBar()

 {
 }
 
 {
 }
 


@@ -125,12 +144,12 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
 {
     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 ))
     {
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {

-        wxFAIL_MSG( T("wxScrollBar creation failed") );
-       return FALSE;
+        wxFAIL_MSG( wxT("wxScrollBar creation failed") );
+        return FALSE;

     }
 
     m_oldPos = 0.0;
     }
 
     m_oldPos = 0.0;


@@ -141,36 +160,39 @@ 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) );

-  
-    gtk_signal_connect( GTK_OBJECT(m_adjust), 
+
+    gtk_signal_connect( GTK_OBJECT(m_adjust),

                         "value_changed",
                         "value_changed",

-                        (GtkSignalFunc) gtk_scrollbar_callback, 
+                        (GtkSignalFunc) gtk_scrollbar_callback,

                         (gpointer) this );
                         (gpointer) this );

-  
-    gtk_signal_connect( GTK_OBJECT(m_widget), 
+
+    gtk_signal_connect( GTK_OBJECT(m_widget),

                         "button_press_event",
                         "button_press_event",

-                        (GtkSignalFunc)gtk_scrollbar_button_press_callback, 
+                        (GtkSignalFunc)gtk_scrollbar_button_press_callback,

                         (gpointer) this );
 
                         (gpointer) this );
 

-    gtk_signal_connect( GTK_OBJECT(m_widget), 
+    gtk_signal_connect( GTK_OBJECT(m_widget),

                         "button_release_event",
                         "button_release_event",

-                        (GtkSignalFunc)gtk_scrollbar_button_release_callback, 
+                        (GtkSignalFunc)gtk_scrollbar_button_release_callback,

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

-  
+

     PostCreation();
     PostCreation();

-  
+
+    SetBestSize(size);
+

     SetBackgroundColour( parent->GetBackgroundColour() );
 
     Show( TRUE );
     SetBackgroundColour( parent->GetBackgroundColour() );
 
     Show( TRUE );

-    
+

     return TRUE;
 }
 
     return TRUE;
 }
 

-int wxScrollBar::GetThumbPosition(void) const
+int wxScrollBar::GetThumbPosition() const

 {
 {

-    return (int)(m_adjust->value+0.5);
+    double val = m_adjust->value;
+    return (int)(val < 0 ? val - 0.5 : val + 0.5);

 }
 
 int wxScrollBar::GetThumbSize() const
 }
 
 int wxScrollBar::GetThumbSize() const


@@ -191,13 +213,22 @@ int wxScrollBar::GetRange() const
 void wxScrollBar::SetThumbPosition( int viewStart )
 {
     if (m_isScrolling) return;
 void wxScrollBar::SetThumbPosition( int viewStart )
 {
     if (m_isScrolling) return;

-  
+

     float fpos = (float)viewStart;
     m_oldPos = fpos;
     if (fabs(fpos-m_adjust->value) < 0.2) return;
     m_adjust->value = fpos;
     float fpos = (float)viewStart;
     m_oldPos = 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 );
+

     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );

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

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


@@ -207,7 +238,7 @@ void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int page
     float frange = (float)range;
     float fthumb = (float)thumbSize;
     float fpage = (float)pageSize;
     float frange = (float)range;
     float fthumb = (float)thumbSize;
     float fpage = (float)pageSize;

-      
+

     if ((fabs(frange-m_adjust->upper) < 0.2) &&
         (fabs(fthumb-m_adjust->page_size) < 0.2) &&
         (fabs(fpage-m_adjust->page_increment) < 0.2))
     if ((fabs(frange-m_adjust->upper) < 0.2) &&
         (fabs(fthumb-m_adjust->page_size) < 0.2) &&
         (fabs(fpage-m_adjust->page_increment) < 0.2))


@@ -215,9 +246,9 @@ void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int page
         SetThumbPosition( position );
         return;
     }
         SetThumbPosition( position );
         return;
     }

-  
+

     m_oldPos = fpos;
     m_oldPos = fpos;

-  
+

     m_adjust->lower = 0.0;
     m_adjust->upper = frange;
     m_adjust->value = fpos;
     m_adjust->lower = 0.0;
     m_adjust->upper = frange;
     m_adjust->value = fpos;


@@ -229,7 +260,7 @@ void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int page
 }
 
 /* Backward compatibility */
 }
 
 /* Backward compatibility */

-int wxScrollBar::GetValue(void) const
+int wxScrollBar::GetValue() const

 {
     return GetThumbPosition();
 }
 {
     return GetThumbPosition();
 }


@@ -245,7 +276,7 @@ void wxScrollBar::GetValues( int *viewStart, int *viewLength, int *objectLength,
     int thumb = (int)(m_adjust->page_size+0.5);
     int page = (int)(m_adjust->page_increment+0.5);
     int range = (int)(m_adjust->upper+0.5);
     int thumb = (int)(m_adjust->page_size+0.5);
     int page = (int)(m_adjust->page_increment+0.5);
     int range = (int)(m_adjust->upper+0.5);

-  
+

     *viewStart = pos;
     *viewLength = range;
     *objectLength = thumb;
     *viewStart = pos;
     *viewLength = range;
     *objectLength = thumb;


@@ -289,11 +320,14 @@ 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) ||
-             (window == range->trough) ||
-             (window == range->slider) ||
-             (window == range->step_forw) ||
-             (window == range->step_back) );
+    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()
 }
 
 void wxScrollBar::ApplyWidgetStyle()


@@ -302,4 +336,9 @@ void wxScrollBar::ApplyWidgetStyle()
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 

+wxSize wxScrollBar::DoGetBestSize() const
+{
+    return wxControl::DoGetBestSize();
+}
+

 #endif
 #endif