revert slop from previous commit

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index e5a5cd7ab11a8fa075aebbcb2ee5bb65a9a5ef17..1df7e832647b7fde2d1e794502f303af45ef5af2 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -1570,7 +1570,7 @@ window_scroll_event_hscrollbar(GtkWidget*, GdkEventScroll* gdk_event, wxWindow*
             delta = -delta;
 
         gdouble new_value = CLAMP (adj->value + delta, adj->lower, adj->upper - adj->page_size);
             delta = -delta;
 
         gdouble new_value = CLAMP (adj->value + delta, adj->lower, adj->upper - adj->page_size);

-      
+

         gtk_adjustment_set_value (adj, new_value);
 
         return TRUE;
         gtk_adjustment_set_value (adj, new_value);
 
         return TRUE;


@@ -1601,7 +1601,7 @@ window_scroll_event(GtkWidget*, GdkEventScroll* gdk_event, wxWindow* win)
 
     if (win->GTKProcessEvent(event))
       return TRUE;
 
     if (win->GTKProcessEvent(event))
       return TRUE;

-      
+

     GtkRange *range = win->m_scrollBar[wxWindow::ScrollDir_Vert];
     if (!range) return FALSE;
 
     GtkRange *range = win->m_scrollBar[wxWindow::ScrollDir_Vert];
     if (!range) return FALSE;
 


@@ -1613,7 +1613,7 @@ window_scroll_event(GtkWidget*, GdkEventScroll* gdk_event, wxWindow* win)
           delta = -delta;
 
         gdouble new_value = CLAMP (adj->value + delta, adj->lower, adj->upper - adj->page_size);
           delta = -delta;
 
         gdouble new_value = CLAMP (adj->value + delta, adj->lower, adj->upper - adj->page_size);

-      
+

         gtk_adjustment_set_value (adj, new_value);
 
         return TRUE;
         gtk_adjustment_set_value (adj, new_value);
 
         return TRUE;


@@ -1759,7 +1759,7 @@ gtk_scrollbar_value_changed(GtkRange* range, wxWindow* win)
 
         // find the scrollbar which generated the event
         wxWindowGTK::ScrollDir dir = win->ScrollDirFromRange(range);
 
         // find the scrollbar which generated the event
         wxWindowGTK::ScrollDir dir = win->ScrollDirFromRange(range);

-        
+

         // generate the corresponding wx event
         const int orient = wxWindow::OrientFromScrollDir(dir);
         wxScrollWinEvent event(eventType, win->GetScrollPos(orient), orient);
         // generate the corresponding wx event
         const int orient = wxWindow::OrientFromScrollDir(dir);
         wxScrollWinEvent event(eventType, win->GetScrollPos(orient), orient);


@@ -2408,7 +2408,7 @@ void wxWindowGTK::ConnectWidget( GtkWidget *widget )
                       G_CALLBACK (gtk_window_button_release_callback), this);
     g_signal_connect (widget, "motion_notify_event",
                       G_CALLBACK (gtk_window_motion_notify_callback), this);
                       G_CALLBACK (gtk_window_button_release_callback), this);
     g_signal_connect (widget, "motion_notify_event",
                       G_CALLBACK (gtk_window_motion_notify_callback), this);

-                      
+

     g_signal_connect (widget, "scroll_event",
                       G_CALLBACK (window_scroll_event), this);
     if (m_scrollBar[ScrollDir_Horz])
     g_signal_connect (widget, "scroll_event",
                       G_CALLBACK (window_scroll_event), this);
     if (m_scrollBar[ScrollDir_Horz])


@@ -2417,7 +2417,7 @@ void wxWindowGTK::ConnectWidget( GtkWidget *widget )
     if (m_scrollBar[ScrollDir_Vert])
         g_signal_connect (m_scrollBar[ScrollDir_Vert], "scroll_event",
                       G_CALLBACK (window_scroll_event), this);
     if (m_scrollBar[ScrollDir_Vert])
         g_signal_connect (m_scrollBar[ScrollDir_Vert], "scroll_event",
                       G_CALLBACK (window_scroll_event), this);

-                      
+

     g_signal_connect (widget, "popup_menu",
                      G_CALLBACK (wxgtk_window_popup_menu_callback), this);
     g_signal_connect (widget, "enter_notify_event",
     g_signal_connect (widget, "popup_menu",
                      G_CALLBACK (wxgtk_window_popup_menu_callback), this);
     g_signal_connect (widget, "enter_notify_event",


@@ -4157,7 +4157,7 @@ void wxWindowGTK::SetScrollbar(int orient,
 
     GtkAdjustment * const adj = sb->adjustment;
     adj->step_increment = 1;
 
     GtkAdjustment * const adj = sb->adjustment;
     adj->step_increment = 1;

-    adj->page_increment = 
+    adj->page_increment =

     adj->page_size = thumbVisible;
     adj->value = pos;
 
     adj->page_size = thumbVisible;
     adj->value = pos;
 


@@ -4276,7 +4276,7 @@ void wxWindowGTK::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
 
     // No scrolling requested.
     if ((dx == 0) && (dy == 0)) return;
 
     // No scrolling requested.
     if ((dx == 0) && (dy == 0)) return;

-    
+

     m_clipPaintRegion = true;
 
     WX_PIZZA(m_wxwindow)->scroll(dx, dy);
     m_clipPaintRegion = true;
 
     WX_PIZZA(m_wxwindow)->scroll(dx, dy);