Improve validation of wxCheckBox styles.

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

diff --git a/src/gtk1/scrolbar.cpp b/src/gtk1/scrolbar.cpp
index 9a0098b3bded8f082c93188f81848f478787d5fb..82ad187aa693439d8a565dad63287d883eca91b7 100644 (file)
--- a/src/gtk1/scrolbar.cpp
+++ b/src/gtk1/scrolbar.cpp
@@ -1,216 +1,368 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence

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

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

 
 

-#ifdef __GNUG__
-#pragma implementation "scrolbar.h"
-#endif
+#if wxUSE_SCROLLBAR

 
 #include "wx/scrolbar.h"
 
 #include "wx/scrolbar.h"

-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/math.h"
+#endif
+
+#include "wx/gtk1/private.h"

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

-// wxScrollBar
+// idle system

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

-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;
-    
-  float diff = win->m_adjust->value - win->m_oldPos;
-  if (fabs(diff) < 0.2) return;
-  
-  wxEventType command = wxEVT_NULL;
-  
-  float line_step = win->m_adjust->step_increment;
-  float page_step = win->m_adjust->page_increment;
-  
-  if (fabs(diff-line_step) < 0.2) command = wxEVT_SCROLL_LINEDOWN;
-  else if (fabs(diff+line_step) < 0.2) command = wxEVT_SCROLL_LINEUP;
-  else if (fabs(diff-page_step) < 0.2) command = wxEVT_SCROLL_PAGEDOWN;
-  else if (fabs(diff+page_step) < 0.2) command = wxEVT_SCROLL_PAGEUP;
-  else command = wxEVT_SCROLL_THUMBTRACK;
-
-  int value = (int)(win->m_adjust->value+0.5);
-      
-  int orient = wxHORIZONTAL;
-  if (win->GetWindowStyleFlag() & wxSB_VERTICAL == wxSB_VERTICAL) orient = wxHORIZONTAL;
-  
-  wxScrollEvent event( command, win->GetId(), value, orient );
-  event.SetEventObject( win );
-  win->ProcessEvent( event );
-  
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+
+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------
+
+extern bool   g_blockEventsOnDrag;
+static wxEventType g_currentUpDownEvent = wxEVT_NULL;
+
+static const float sensitivity = 0.02;
+
+//-----------------------------------------------------------------------------
+// "value_changed"
+//-----------------------------------------------------------------------------
+
+// FIXME: is GtkScrollType really passed to us as 2nd argument?
+
+extern "C" {
+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;
+
+    float diff = adjust->value - win->m_oldPos;
+    if (fabs(diff) < sensitivity) return;
+
+    win->m_oldPos = adjust->value;
+
+    wxEventType command = GtkScrollTypeToWx(GET_SCROLL_TYPE(win->m_widget));
+
+    double dvalue = adjust->value;
+    int value = (int)(dvalue < 0 ? dvalue - 0.5 : dvalue + 0.5);
+
+    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->HandleWindowEvent( event );
+    }
+
+    // throw other event (wxEVT_SCROLL_THUMBTRACK)
+    wxScrollEvent event( command, win->GetId(), value, orient );
+    event.SetEventObject( win );
+    win->HandleWindowEvent( 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
+//-----------------------------------------------------------------------------
+extern "C" {
+static gint gtk_scrollbar_button_press_callback( GtkRange *widget,
+                                                 GdkEventButton *gdk_event,
+                                                 wxScrollBar *win )
+{
+    if (g_isIdle) wxapp_install_idle_handler();

 
 

-wxScrollBar::wxScrollBar(wxWindow *parent, const wxWindowID id,
-           const wxPoint& pos, const wxSize& size,
-           const long style, const wxString& name )
+    // 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;
+      }
+
+    // There is no slider field any more
+    win->m_isScrolling = (gdk_event->window == widget->slider);
+
+    return FALSE;
+}
+}
+
+//-----------------------------------------------------------------------------
+// "button_release_event" from slider
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static gint
+gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
+                                       GdkEventButton *WXUNUSED(gdk_event),
+                                       wxScrollBar *win )

 {
 {

-  Create( parent, id, pos, size, style, name );
-};
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    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->HandleWindowEvent( event );
+    }
+
+    win->m_isScrolling = false;

 
 

-wxScrollBar::~wxScrollBar(void)
+    // reset the LINEUP/LINEDOWN flag when the mouse button is released
+    g_currentUpDownEvent = wxEVT_NULL;
+
+    return FALSE;
+}
+}
+
+//-----------------------------------------------------------------------------
+// wxScrollBar
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl)
+
+wxScrollBar::~wxScrollBar()

 {
 {

-};
+}

 
 

-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 )
-{
-  m_needParent = TRUE;
-  
-  PreCreation( parent, id, pos, size, style, name );
-  
-  m_oldPos = 0.0;
-
-  if (style & wxSB_VERTICAL == wxSB_VERTICAL)
-    m_widget = gtk_hscrollbar_new( NULL );
-  else
-    m_widget = gtk_vscrollbar_new( 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 );
-  
-  PostCreation();
-  
-  Show( TRUE );
-    
-  return TRUE;
-};
-
-int wxScrollBar::GetPosition(void) const
-{
-  return (int)(m_adjust->value+0.5);
-};
+           long style, const wxValidator& validator, const wxString& name )
+{
+    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") );
+        return false;
+    }
+
+    m_oldPos = 0.0;
+
+    if ((style & wxSB_VERTICAL) == wxSB_VERTICAL)
+        m_widget = gtk_vscrollbar_new( NULL );
+    else
+        m_widget = gtk_hscrollbar_new( 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 );
+    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 );
+
+    m_parent->DoAddChild( this );
+
+    PostCreation(size);
+
+    return true;
+}
+
+int wxScrollBar::GetThumbPosition() const
+{
+    double val = m_adjust->value;
+    return (int)(val < 0 ? val - 0.5 : val + 0.5);
+}

 
 int wxScrollBar::GetThumbSize() const
 {
 
 int wxScrollBar::GetThumbSize() const
 {

-  return (int)(m_adjust->page_size+0.5);
-};
+    return (int)(m_adjust->page_size+0.5);
+}

 
 int wxScrollBar::GetPageSize() const
 {
 
 int wxScrollBar::GetPageSize() const
 {

-  return (int)(m_adjust->page_increment+0.5);
-};
+    return (int)(m_adjust->page_increment+0.5);
+}

 
 int wxScrollBar::GetRange() const
 {
 
 int wxScrollBar::GetRange() const
 {

-  return (int)(m_adjust->upper+0.5);
-};
-
-void wxScrollBar::SetPosition( const int viewStart )
-{
-  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) )
-{
-  float fpos = (float)position;
-  m_oldPos = fpos;
-  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) &&
-      (fabs(fthumb-m_adjust->page_size) < 0.2) &&
-      (fabs(fpage-m_adjust->page_increment) < 0.2))
-      return;
-      
-  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_size = fthumb;
-
-  gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
-};
-
-// Backward compatibility
-int wxScrollBar::GetValue(void) const
-{
-  return GetPosition();
-};
-
-void wxScrollBar::SetValue( const int viewStart )
-{
-  SetPosition( viewStart );
-};
+    return (int)(m_adjust->upper+0.5);
+}
+
+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;
+
+    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_connect( GTK_OBJECT(m_adjust),
+                        "value_changed",
+                        (GtkSignalFunc) gtk_scrollbar_callback,
+                        (gpointer) this );
+}
+
+void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int pageSize,
+      bool WXUNUSED(refresh) )
+{
+    float fpos = (float)position;
+    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))
+    {
+        SetThumbPosition( 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->page_increment = (float)(wxMax(fpage,0));
+    m_adjust->page_size = fthumb;
+
+    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+}
+
+/* Backward compatibility */
+int wxScrollBar::GetValue() const
+{
+    return GetThumbPosition();
+}
+
+void wxScrollBar::SetValue( int viewStart )
+{
+    SetThumbPosition( 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
 {

-  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);
-  int range = (int)(m_adjust->upper+0.5);
-  
-  *viewStart = pos;
-  *viewLength = range;
-  *objectLength = thumb;
-  *pageLength = 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);
+    int range = (int)(m_adjust->upper+0.5);
+
+    *viewStart = pos;
+    *viewLength = range;
+    *objectLength = thumb;
+    *pageLength = page;
+}

 
 int wxScrollBar::GetViewLength() const
 {
 
 int wxScrollBar::GetViewLength() const
 {

-  return (int)(m_adjust->upper+0.5);
-};
+    return (int)(m_adjust->upper+0.5);
+}

 
 int wxScrollBar::GetObjectLength() const
 {
 
 int wxScrollBar::GetObjectLength() const
 {

-  return (int)(m_adjust->page_size+0.5);
-};
+    return (int)(m_adjust->page_size+0.5);
+}
+
+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 );
+}
+
+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 );
+}
+
+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 );
+}

 
 

-void wxScrollBar::SetPageSize( const int pageLength )
+bool wxScrollBar::IsOwnGtkWindow( GdkWindow *window )

 {
 {

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

 
 

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

 {
 {

-  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 );
-};
+    return wxControl::DoGetBestSize();
+}

 
 

-void wxScrollBar::SetViewLength( const int viewLength )
+// static
+wxVisualAttributes
+wxScrollBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))

 {
 {

-  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 );
-};
+    return GetDefaultAttributesFromGTKWidget(gtk_vscrollbar_new);
+}

 
 

+#endif // wxUSE_SCROLLBAR