no message

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

diff --git a/src/gtk1/scrolbar.cpp b/src/gtk1/scrolbar.cpp
index ab1482b00601f4882445bd69cda8e92f402084a0..98a3d091bcae4e51788a330e66dd0e27743d4dd3 100644 (file)
--- a/src/gtk1/scrolbar.cpp
+++ b/src/gtk1/scrolbar.cpp
@@ -23,7 +23,7 @@
 extern bool   g_blockEventsOnDrag;
 
 //-----------------------------------------------------------------------------
 extern bool   g_blockEventsOnDrag;
 
 //-----------------------------------------------------------------------------

-// wxScrollBar
+// "value_changed"

 //-----------------------------------------------------------------------------
 
 static void gtk_scrollbar_callback( GtkWidget *WXUNUSED(widget), wxScrollBar *win )
 //-----------------------------------------------------------------------------
 
 static void gtk_scrollbar_callback( GtkWidget *WXUNUSED(widget), wxScrollBar *win )


@@ -48,7 +48,7 @@ static void gtk_scrollbar_callback( GtkWidget *WXUNUSED(widget), wxScrollBar *wi
   int value = (int)(win->m_adjust->value+0.5);
       
   int orient = wxHORIZONTAL;
   int value = (int)(win->m_adjust->value+0.5);
       
   int orient = wxHORIZONTAL;

-  if (win->GetWindowStyleFlag() & wxSB_VERTICAL == wxSB_VERTICAL) orient = wxHORIZONTAL;
+  if (win->GetWindowStyleFlag() & wxSB_VERTICAL == wxSB_VERTICAL) orient = wxVERTICAL;

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


@@ -61,6 +61,38 @@ static void gtk_scrollbar_callback( GtkWidget *WXUNUSED(widget), wxScrollBar *wi
 */
 }
 
 */
 }
 

+//-----------------------------------------------------------------------------
+// "button_press_event" from slider
+//-----------------------------------------------------------------------------
+
+static gint gtk_scrollbar_button_press_callback( GtkRange *widget, GdkEventButton *gdk_event, wxScrollBar *win )
+{
+  if (gdk_event->window != widget->slider) return FALSE;
+    
+  win->m_isScrolling = TRUE;
+  
+  return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// "button_release_event" from slider
+//-----------------------------------------------------------------------------
+
+static gint gtk_scrollbar_button_release_callback( GtkRange *widget, GdkEventButton *gdk_event, wxScrollBar *win )
+{
+  if (gdk_event->window != widget->slider) return FALSE;
+
+  gtk_signal_emit_by_name( GTK_OBJECT(win->m_adjust), "value_changed" );
+      
+  win->m_isScrolling = FALSE;
+  
+  return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// wxScrollBar
+//-----------------------------------------------------------------------------
+

 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl)
 
 wxScrollBar::~wxScrollBar(void)
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl)
 
 wxScrollBar::~wxScrollBar(void)


@@ -80,15 +112,21 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
   m_oldPos = 0.0;
 
   if (style & wxSB_VERTICAL == wxSB_VERTICAL)
   m_oldPos = 0.0;
 
   if (style & wxSB_VERTICAL == wxSB_VERTICAL)

-    m_widget = gtk_hscrollbar_new( NULL );
+    m_widget = gtk_hscrollbar_new( (GtkAdjustment *) NULL );

   else
   else

-    m_widget = gtk_vscrollbar_new( NULL );
+    m_widget = gtk_vscrollbar_new( (GtkAdjustment *) NULL );

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

   PostCreation();
   
   Show( TRUE );
   PostCreation();
   
   Show( TRUE );


@@ -122,30 +160,34 @@ void wxScrollBar::SetPosition( int viewStart )
   m_oldPos = fpos;
   if (fabs(fpos-m_adjust->value) < 0.2) return;
   m_adjust->value = fpos;
   m_oldPos = fpos;
   if (fabs(fpos-m_adjust->value) < 0.2) return;
   m_adjust->value = fpos;

-  
-  gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
+
+  if (!m_isScrolling)
+    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );

 }
 
 void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int pageSize,
       bool WXUNUSED(refresh) )
 {
   float fpos = (float)position;
 }
 
 void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int pageSize,
       bool WXUNUSED(refresh) )
 {
   float fpos = (float)position;

-  m_oldPos = fpos;

   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(fpos-m_adjust->value) < 0.2) &&
-      (fabs(frange-m_adjust->upper) < 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))
       (fabs(fthumb-m_adjust->page_size) < 0.2) &&
       (fabs(fpage-m_adjust->page_increment) < 0.2))

-      return;
-      
+  {
+    SetPosition( position );
+    return;
+  }
+  
+  m_oldPos = fpos;
+  

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

-  m_adjust->page_increment = (float)(wxMax(fpage-2,0));
+  m_adjust->page_increment = (float)(wxMax(fpage,0));

   m_adjust->page_size = fthumb;
 
   gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
   m_adjust->page_size = fthumb;
 
   gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );


@@ -209,3 +251,12 @@ void wxScrollBar::SetViewLength( int viewLength )
   SetScrollbar( pos, thumb, viewLength, page );
 }
 
   SetScrollbar( pos, thumb, viewLength, page );
 }
 

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