no message

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

diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp
index 9a0098b3bded8f082c93188f81848f478787d5fb..98a3d091bcae4e51788a330e66dd0e27743d4dd3 100644 (file)
--- a/src/gtk/scrolbar.cpp
+++ b/src/gtk/scrolbar.cpp
@@ -17,19 +17,19 @@
 #include "wx/utils.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/utils.h"
 
 //-----------------------------------------------------------------------------

-// wxScrollBar
+// data
+//-----------------------------------------------------------------------------
+
+extern bool   g_blockEventsOnDrag;
+
+//-----------------------------------------------------------------------------
+// "value_changed"

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

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

 { 
 { 

-/*
-  printf( "OnScroll from " );
-  if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-    printf( win->GetClassInfo()->GetClassName() );
-  printf( ".\n" );
-*/
-  

   if (!win->HasVMT()) return;
   if (!win->HasVMT()) return;

+  if (g_blockEventsOnDrag) return;

     
   float diff = win->m_adjust->value - win->m_oldPos;
   if (fabs(diff) < 0.2) return;
     
   float diff = win->m_adjust->value - win->m_oldPos;
   if (fabs(diff) < 0.2) return;


@@ -48,124 +48,161 @@ void gtk_scrollbar_callback( GtkWidget *WXUNUSED(widget), wxScrollBar *win )
   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 );

-  win->ProcessEvent( event );
+  win->GetEventHandler()->ProcessEvent( event );

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

-};
+}

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl)
+//-----------------------------------------------------------------------------
+// "button_press_event" from slider
+//-----------------------------------------------------------------------------

 
 

-wxScrollBar::wxScrollBar(wxWindow *parent, const wxWindowID id,
-           const wxPoint& pos, const wxSize& size,
-           const long style, const wxString& name )
+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 )

 {
 {

-  Create( parent, id, pos, size, style, name );
-};
+  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)
 {
 
 wxScrollBar::~wxScrollBar(void)
 {

-};
+}

 
 

-bool wxScrollBar::Create(wxWindow *parent, const wxWindowID id,
+bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,

            const wxPoint& pos, const wxSize& size,
            const wxPoint& pos, const wxSize& size,

-           const long style, const wxString& name )
+           long style, const wxValidator& validator, const wxString& name )

 {
   m_needParent = TRUE;
   
   PreCreation( parent, id, pos, size, style, name );
   
 {
   m_needParent = TRUE;
   
   PreCreation( parent, id, pos, size, style, name );
   

+  SetValidator( validator );
+

   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 );
     
   return TRUE;
   PostCreation();
   
   Show( TRUE );
     
   return TRUE;

-};
+}

 
 int wxScrollBar::GetPosition(void) const
 {
   return (int)(m_adjust->value+0.5);
 
 int wxScrollBar::GetPosition(void) const
 {
   return (int)(m_adjust->value+0.5);

-};
+}

 
 int wxScrollBar::GetThumbSize() const
 {
   return (int)(m_adjust->page_size+0.5);
 
 int wxScrollBar::GetThumbSize() const
 {
   return (int)(m_adjust->page_size+0.5);

-};
+}

 
 int wxScrollBar::GetPageSize() const
 {
   return (int)(m_adjust->page_increment+0.5);
 
 int wxScrollBar::GetPageSize() const
 {
   return (int)(m_adjust->page_increment+0.5);

-};
+}

 
 int wxScrollBar::GetRange() const
 {
   return (int)(m_adjust->upper+0.5);
 
 int wxScrollBar::GetRange() const
 {
   return (int)(m_adjust->upper+0.5);

-};
+}

 
 

-void wxScrollBar::SetPosition( const int viewStart )
+void wxScrollBar::SetPosition( int viewStart )

 {
   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_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
-};

 
 

-void wxScrollBar::SetScrollbar( const int position, const int thumbSize, const int range, const int pageSize,
-      const bool WXUNUSED(refresh) )
+  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;
 {
   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" );

-};
+}

 
 // Backward compatibility
 int wxScrollBar::GetValue(void) const
 {
   return GetPosition();
 
 // Backward compatibility
 int wxScrollBar::GetValue(void) const
 {
   return GetPosition();

-};
+}

 
 

-void wxScrollBar::SetValue( const int viewStart )
+void wxScrollBar::SetValue( int viewStart )

 {
   SetPosition( viewStart );
 {
   SetPosition( viewStart );

-};
+}

 
 void wxScrollBar::GetValues( int *viewStart, int *viewLength, int *objectLength, int *pageLength ) const
 {
 
 void wxScrollBar::GetValues( int *viewStart, int *viewLength, int *objectLength, int *pageLength ) const
 {


@@ -178,39 +215,48 @@ void wxScrollBar::GetValues( int *viewStart, int *viewLength, int *objectLength,
   *viewLength = range;
   *objectLength = thumb;
   *pageLength = page;
   *viewLength = range;
   *objectLength = thumb;
   *pageLength = page;

-};
+}

 
 int wxScrollBar::GetViewLength() const
 {
   return (int)(m_adjust->upper+0.5);
 
 int wxScrollBar::GetViewLength() const
 {
   return (int)(m_adjust->upper+0.5);

-};
+}

 
 int wxScrollBar::GetObjectLength() const
 {
   return (int)(m_adjust->page_size+0.5);
 
 int wxScrollBar::GetObjectLength() const
 {
   return (int)(m_adjust->page_size+0.5);

-};
+}

 
 

-void wxScrollBar::SetPageSize( const int pageLength )
+void wxScrollBar::SetPageSize( int pageLength )

 {
   int pos = (int)(m_adjust->value+0.5);
   int thumb = (int)(m_adjust->page_size+0.5);
   int range = (int)(m_adjust->upper+0.5);
   SetScrollbar( pos, thumb, range, pageLength );
 {
   int pos = (int)(m_adjust->value+0.5);
   int thumb = (int)(m_adjust->page_size+0.5);
   int range = (int)(m_adjust->upper+0.5);
   SetScrollbar( pos, thumb, range, pageLength );

-};
+}

 
 

-void wxScrollBar::SetObjectLength( const int objectLength )
+void wxScrollBar::SetObjectLength( int objectLength )

 {
   int pos = (int)(m_adjust->value+0.5);
   int page = (int)(m_adjust->page_increment+0.5);
   int range = (int)(m_adjust->upper+0.5);
   SetScrollbar( pos, objectLength, range, page );
 {
   int pos = (int)(m_adjust->value+0.5);
   int page = (int)(m_adjust->page_increment+0.5);
   int range = (int)(m_adjust->upper+0.5);
   SetScrollbar( pos, objectLength, range, page );

-};
+}

 
 

-void wxScrollBar::SetViewLength( const int viewLength )
+void wxScrollBar::SetViewLength( int viewLength )

 {
   int pos = (int)(m_adjust->value+0.5);
   int thumb = (int)(m_adjust->page_size+0.5);
   int page = (int)(m_adjust->page_increment+0.5);
   SetScrollbar( pos, thumb, viewLength, page );
 {
   int pos = (int)(m_adjust->value+0.5);
   int thumb = (int)(m_adjust->page_size+0.5);
   int page = (int)(m_adjust->page_increment+0.5);
   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) );
+}