missing commit

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

diff --git a/src/gtk1/scrolbar.cpp b/src/gtk1/scrolbar.cpp
index 4fcc4eb928fb6c4bddf0ff2480aa4997fedd30e8..ae2b4b8a2b9214423abfb461e86bd1ab36b544f2 100644 (file)
--- a/src/gtk1/scrolbar.cpp
+++ b/src/gtk1/scrolbar.cpp
@@ -16,9 +16,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"

+    #include "wx/math.h"

 #endif
 
 #endif
 

-#include "wx/math.h"

 #include "wx/gtk1/private.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/gtk1/private.h"
 
 //-----------------------------------------------------------------------------


@@ -70,16 +70,16 @@ static void gtk_scrollbar_callback( GtkAdjustment *adjust,
     {
         wxScrollEvent event( g_currentUpDownEvent, win->GetId(), value, orient );
         event.SetEventObject( win );
     {
         wxScrollEvent event( g_currentUpDownEvent, win->GetId(), value, orient );
         event.SetEventObject( win );

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

     }
 
     // throw other event (wxEVT_SCROLL_THUMBTRACK)
     wxScrollEvent event( command, win->GetId(), value, orient );
     event.SetEventObject( win );
     }
 
     // throw other event (wxEVT_SCROLL_THUMBTRACK)
     wxScrollEvent event( command, win->GetId(), value, orient );
     event.SetEventObject( win );

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

 
 /*
 
 /*

-    wxCommandEvent cevent( wxEVT_COMMAND_SCROLLBAR_UPDATED, win->GetId() );
+    wxCommandEvent cevent( wxEVT_SCROLLBAR, win->GetId() );

     cevent.SetEventObject( win );
     win->ProcessEvent( cevent );
 */
     cevent.SetEventObject( win );
     win->ProcessEvent( cevent );
 */


@@ -149,7 +149,7 @@ gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
 
         wxScrollEvent event( command, win->GetId(), value, orient );
         event.SetEventObject( win );
 
         wxScrollEvent event( command, win->GetId(), value, orient );
         event.SetEventObject( win );

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

     }
 
     win->m_isScrolling = false;
     }
 
     win->m_isScrolling = false;


@@ -165,8 +165,6 @@ gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
 // wxScrollBar
 //-----------------------------------------------------------------------------
 
 // wxScrollBar
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl)
-

 wxScrollBar::~wxScrollBar()
 {
 }
 wxScrollBar::~wxScrollBar()
 {
 }


@@ -188,9 +186,9 @@ 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_vscrollbar_new( (GtkAdjustment *) NULL );
+        m_widget = gtk_vscrollbar_new( NULL );

     else
     else

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

 
     m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) );
 
 
     m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) );