Added PushEventHandler, Pop...

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

diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp
index 9a0098b3bded8f082c93188f81848f478787d5fb..37396d960552a9eb0c100ea1fac5860fb852cb90 100644 (file)
--- a/src/gtk/scrolbar.cpp
+++ b/src/gtk/scrolbar.cpp
@@ -16,20 +16,20 @@
 #include "wx/scrolbar.h"
 #include "wx/utils.h"
 
 #include "wx/scrolbar.h"
 #include "wx/utils.h"
 

+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------
+
+extern bool   g_blockEventsOnDrag;
+

 //-----------------------------------------------------------------------------
 // wxScrollBar
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxScrollBar
 //-----------------------------------------------------------------------------
 

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


@@ -52,7 +52,7 @@ void gtk_scrollbar_callback( GtkWidget *WXUNUSED(widget), wxScrollBar *win )
   
   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() );
   
 /*
   wxCommandEvent cevent( wxEVT_COMMAND_SCROLLBAR_UPDATED, win->GetId() );


@@ -63,9 +63,9 @@ void gtk_scrollbar_callback( GtkWidget *WXUNUSED(widget), wxScrollBar *win )
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl)
 

-wxScrollBar::wxScrollBar(wxWindow *parent, const wxWindowID id,
+wxScrollBar::wxScrollBar(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 wxString& name )

 {
   Create( parent, id, pos, size, style, name );
 };
 {
   Create( parent, id, pos, size, style, name );
 };


@@ -74,9 +74,9 @@ 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 wxString& name )

 {
   m_needParent = TRUE;
   
 {
   m_needParent = TRUE;
   


@@ -121,7 +121,7 @@ int wxScrollBar::GetRange() const
   return (int)(m_adjust->upper+0.5);
 };
 
   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;
 {
   float fpos = (float)viewStart;
   m_oldPos = fpos;


@@ -131,8 +131,8 @@ void wxScrollBar::SetPosition( const int viewStart )
   gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
 };
 
   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) )
+void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int pageSize,
+      bool WXUNUSED(refresh) )

 {
   float fpos = (float)position;
   m_oldPos = fpos;
 {
   float fpos = (float)position;
   m_oldPos = fpos;


@@ -162,7 +162,7 @@ int wxScrollBar::GetValue(void) const
   return GetPosition();
 };
 
   return GetPosition();
 };
 

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

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


@@ -190,7 +190,7 @@ int wxScrollBar::GetObjectLength() const
   return (int)(m_adjust->page_size+0.5);
 };
 
   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 pos = (int)(m_adjust->value+0.5);
   int thumb = (int)(m_adjust->page_size+0.5);


@@ -198,7 +198,7 @@ void wxScrollBar::SetPageSize( const int pageLength )
   SetScrollbar( pos, thumb, range, pageLength );
 };
 
   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 pos = (int)(m_adjust->value+0.5);
   int page = (int)(m_adjust->page_increment+0.5);


@@ -206,7 +206,7 @@ void wxScrollBar::SetObjectLength( const int objectLength )
   SetScrollbar( pos, objectLength, range, page );
 };
 
   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 pos = (int)(m_adjust->value+0.5);
   int thumb = (int)(m_adjust->page_size+0.5);