Add new wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED event. Implement for all backends, exten...

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

diff --git a/src/gtk1/scrolbar.cpp b/src/gtk1/scrolbar.cpp
index bc2977ba69f2f99be70f2c7b414c4adece742773..e6dd46e299df16569bb18e4536cf853c87e919f7 100644 (file)
--- a/src/gtk1/scrolbar.cpp
+++ b/src/gtk1/scrolbar.cpp
@@ -14,8 +14,11 @@
 
 #include "wx/scrolbar.h"
 
 
 #include "wx/scrolbar.h"
 

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

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


@@ -67,13 +70,13 @@ 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_COMMAND_SCROLLBAR_UPDATED, win->GetId() );


@@ -146,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;


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

-IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl)
-

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


@@ -185,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) );
 


@@ -362,4 +363,4 @@ wxScrollBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
     return GetDefaultAttributesFromGTKWidget(gtk_vscrollbar_new);
 }
 
     return GetDefaultAttributesFromGTKWidget(gtk_vscrollbar_new);
 }
 

-#endif
+#endif // wxUSE_SCROLLBAR