replace the mismatched new[]/delete (bug #10234) with a wxVector

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

diff --git a/src/gtk1/scrolbar.cpp b/src/gtk1/scrolbar.cpp
index 9172d9b8b9e0c3cbceb2f64aee6e3c205b78a30d..ea6a98e71ff8f5027fa2df08bd5fef84ce3c6ee4 100644 (file)
--- a/src/gtk1/scrolbar.cpp
+++ b/src/gtk1/scrolbar.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -14,9 +14,12 @@
 
 #include "wx/scrolbar.h"
 
 
 #include "wx/scrolbar.h"
 

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

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -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() );


@@ -118,10 +121,8 @@ static gint gtk_scrollbar_button_press_callback( GtkRange *widget,
             g_currentUpDownEvent = wxEVT_SCROLL_LINEUP;
       }
 
             g_currentUpDownEvent = wxEVT_SCROLL_LINEUP;
       }
 

-#ifndef __WXGTK20__

     // There is no slider field any more
     win->m_isScrolling = (gdk_event->window == widget->slider);
     // There is no slider field any more
     win->m_isScrolling = (gdk_event->window == widget->slider);

-#endif

 
     return FALSE;
 }
 
     return FALSE;
 }


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


@@ -345,12 +346,10 @@ bool wxScrollBar::IsOwnGtkWindow( GdkWindow *window )
 {
     GtkRange *range = GTK_RANGE(m_widget);
     return ( (window == GTK_WIDGET(range)->window)
 {
     GtkRange *range = GTK_RANGE(m_widget);
     return ( (window == GTK_WIDGET(range)->window)

-#ifndef __WXGTK20__

                 || (window == range->trough)
                 || (window == range->slider)
                 || (window == range->step_forw)
                 || (window == range->step_back)
                 || (window == range->trough)
                 || (window == range->slider)
                 || (window == range->step_forw)
                 || (window == range->step_back)

-#endif // GTK+ 1.x

            );
 }
 
            );
 }
 


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

-#endif
+#endif // wxUSE_SCROLLBAR