Get rid of confusing g_signal_connect_swapped()v0.6.65

3 files changed, 24 insertions, 24 deletions

diff --git a/UConfig.pas b/UConfig.pas
index d0e536f..a58363a 100644
--- a/UConfig.pas
+++ b/UConfig.pas
@@ -25,8 +25,8 @@ uses Classes, ULocale;
 
 resourcestring
   ConstAppTitle = 'Tux Commander';
-  ConstAboutVersion = '0.6.64-dev';
-  ConstAboutBuildDate = '2009-10-01';
+  ConstAboutVersion = '0.6.65-dev';
+  ConstAboutBuildDate = '2009-10-03';
   
 {$IFDEF FPC}
   {$INCLUDE fpcver.inc}
diff --git a/UToolTips.pas b/UToolTips.pas
index d7d2a42..3da438b 100644
--- a/UToolTips.pas
+++ b/UToolTips.pas
@@ -162,10 +162,10 @@ begin
   end;
 end;
 
-function gtk_tooltips_paint_window(tip_window: PGtkWidget): gboolean; cdecl;
+function gtk_tooltips_paint_window(widget: PGtkWidget; event: PGdkEventExpose; user_data: gpointer): gboolean; cdecl;
 begin
-  gtk_paint_flat_box(tip_window^.style, tip_window^.window, GTK_STATE_NORMAL, GTK_SHADOW_OUT,
-                     nil, GTK_WIDGET(tip_window), 'tooltip', 0, 0, -1, -1);
+  gtk_paint_flat_box(widget^.style, widget^.window, GTK_STATE_NORMAL, GTK_SHADOW_OUT,
+                     nil, widget, 'tooltip', 0, 0, -1, -1);
   Result := False;
 end;
 
@@ -180,8 +180,8 @@ begin
   gtk_container_set_border_width(GTK_CONTAINER(tip_window), 4);
   gtk_widget_set_events(GTK_WIDGET(tip_window), GDK_POINTER_MOTION_MASK or GDK_BUTTON_PRESS_MASK or GDK_KEY_PRESS_MASK or GDK_FOCUS_CHANGE_MASK or GDK_SCROLL_MASK);
   g_signal_connect(tip_window, 'event', G_CALLBACK(@tip_event_handler), nil);
-  g_signal_connect_swapped(tip_window, 'expose_event', G_CALLBACK(@gtk_tooltips_paint_window), tip_window);
-  g_signal_connect_swapped(tip_window, 'button-press-event', G_CALLBACK(@tips_button_press_event), tip_window);
+  g_signal_connect(tip_window, 'expose_event', G_CALLBACK(@gtk_tooltips_paint_window), tip_window);
+  g_signal_connect(tip_window, 'button-press-event', G_CALLBACK(@tips_button_press_event), tip_window);
 
   tip_label := GTK_LABEL(gtk_label_new(nil));
   gtk_misc_set_alignment(GTK_MISC(tip_label), 0, 0.5);
diff --git a/libgtk_kylix/GTKControls.pas b/libgtk_kylix/GTKControls.pas
index 158e55b..a5d6734 100644
--- a/libgtk_kylix/GTKControls.pas
+++ b/libgtk_kylix/GTKControls.pas
@@ -434,16 +434,16 @@ begin
   if event^.state and GDK_CONTROL_MASK = GDK_CONTROL_MASK then Include(Shift, ssCtrl);
   if event^.state and GDK_MOD1_MASK = GDK_MOD1_MASK then Include(Shift, ssAlt);
   Accept := True;
-  if Assigned(TGTKControl(widget).FOnMouseDown) and (event^._type = GDK_BUTTON_PRESS)
-    then TGTKControl(widget).FOnMouseDown(TGTKControl(widget), TGDKMouseButton(event^.button - 1), Shift, Trunc(event^.x), Trunc(event^.y), Accept);
-  if Assigned(TGTKControl(widget).FOnDblClick) and (event^._type = GDK_2BUTTON_PRESS)
-    then TGTKControl(widget).FOnDblClick(TGTKControl(widget), TGDKMouseButton(event^.button - 1), Shift, Trunc(event^.x), Trunc(event^.y), Accept);
+  if Assigned(TGTKControl(user_data).FOnMouseDown) and (event^._type = GDK_BUTTON_PRESS)
+    then TGTKControl(user_data).FOnMouseDown(TGTKControl(user_data), TGDKMouseButton(event^.button - 1), Shift, Trunc(event^.x), Trunc(event^.y), Accept);
+  if Assigned(TGTKControl(user_data).FOnDblClick) and (event^._type = GDK_2BUTTON_PRESS)
+    then TGTKControl(user_data).FOnDblClick(TGTKControl(user_data), TGDKMouseButton(event^.button - 1), Shift, Trunc(event^.x), Trunc(event^.y), Accept);
   Result := not Accept;
   if Accept then 
-  if (Event^.button = 3) and Assigned(TGTKControl(widget).FPopupMenu) then begin
-//    if Assigned(TGTKMenuItem(TGTKControl(widget).FPopupMenu).OnPopup) then TGTKMenuItem(TGTKControl(widget).FPopupMenu).OnPopup(TGTKMenuItem(TGTKControl(widget).FPopupMenu));
-    if Assigned(TGTKMenuItem(TGTKControl(widget).FPopupMenu).OnPopup) then TGTKMenuItem(TGTKControl(widget).FPopupMenu).OnPopup(TGTKControl(widget));
-    gtk_menu_popup(PGtkMenu(TGTKMenuItem(TGTKControl(widget).FPopupMenu).FMenu), nil, nil, nil, nil, event^.button, event^.time);
+  if (Event^.button = 3) and Assigned(TGTKControl(user_data).FPopupMenu) then begin
+//    if Assigned(TGTKMenuItem(TGTKControl(user_data).FPopupMenu).OnPopup) then TGTKMenuItem(TGTKControl(user_data).FPopupMenu).OnPopup(TGTKMenuItem(TGTKControl(user_data).FPopupMenu));
+    if Assigned(TGTKMenuItem(TGTKControl(user_data).FPopupMenu).OnPopup) then TGTKMenuItem(TGTKControl(user_data).FPopupMenu).OnPopup(TGTKControl(user_data));
+    gtk_menu_popup(PGtkMenu(TGTKMenuItem(TGTKControl(user_data).FPopupMenu).FMenu), nil, nil, nil, nil, event^.button, event^.time);
     Result := False;   //  Allow list views to process their events - select an item beneath the cursor
   end;
 end;
@@ -459,7 +459,7 @@ begin
       end;
     end else
       if FButtonPressSignalHandler = 0
-        then FButtonPressSignalHandler := g_signal_connect_swapped(PGtkObject(FWidget), 'button-press-event', G_CALLBACK(@TGTKControl_button_press_event), Self)
+        then FButtonPressSignalHandler := g_signal_connect(PGtkObject(FWidget), 'button-press-event', G_CALLBACK(@TGTKControl_button_press_event), Self)
   end;
 end;
 
@@ -666,7 +666,7 @@ begin
       end;
     end else
       if FButtonPressSignalHandler = 0
-        then FButtonPressSignalHandler := g_signal_connect_swapped(PGtkObject(FWidget), 'button-press-event', G_CALLBACK(@TGTKControl_button_press_event), Self)
+        then FButtonPressSignalHandler := g_signal_connect(PGtkObject(FWidget), 'button-press-event', G_CALLBACK(@TGTKControl_button_press_event), Self)
   end;
 end;
 
@@ -681,7 +681,7 @@ begin
       end;
     end else
       if FButtonPressSignalHandler = 0
-        then FButtonPressSignalHandler := g_signal_connect_swapped(PGtkObject(FWidget), 'button-press-event', G_CALLBACK(@TGTKControl_button_press_event), Self)
+        then FButtonPressSignalHandler := g_signal_connect(PGtkObject(FWidget), 'button-press-event', G_CALLBACK(@TGTKControl_button_press_event), Self)
   end;
 end;
 
@@ -694,8 +694,8 @@ begin
   if event^.state and GDK_CONTROL_MASK = GDK_CONTROL_MASK then Include(Shift, ssCtrl);
   if event^.state and GDK_MOD1_MASK = GDK_MOD1_MASK then Include(Shift, ssAlt);
   Accept := True;
-  if Assigned(TGTKControl(widget).FOnMouseUp)
-    then TGTKControl(widget).FOnMouseUp(TGTKControl(widget), TGDKMouseButton(event^.button - 1), Shift, Trunc(event^.x), Trunc(event^.y), Accept);
+  if Assigned(TGTKControl(user_data).FOnMouseUp)
+    then TGTKControl(user_data).FOnMouseUp(TGTKControl(user_data), TGDKMouseButton(event^.button - 1), Shift, Trunc(event^.x), Trunc(event^.y), Accept);
   Result := not Accept;
 end;
 
@@ -703,7 +703,7 @@ procedure TGTKControl.SetOnMouseUp(Value: TGDKMouseEvent);
 begin
   if @FOnMouseUp <> @Value then begin
     FOnMouseUp := Value;
-    if Assigned(Value) then FButtonReleaseSignalHandler := g_signal_connect_swapped(PGtkObject(FWidget), 'button-release-event', G_CALLBACK(@TGTKControl_button_release_event), Self)
+    if Assigned(Value) then FButtonReleaseSignalHandler := g_signal_connect(PGtkObject(FWidget), 'button-release-event', G_CALLBACK(@TGTKControl_button_release_event), Self)
                        else g_signal_handler_disconnect(PGtkObject(FWidget), FButtonReleaseSignalHandler);
   end;
 end;
@@ -724,8 +724,8 @@ begin
   if event^.state and GDK_BUTTON2_MASK = GDK_BUTTON2_MASK then Button := mbMiddle else
   if event^.state and GDK_BUTTON3_MASK = GDK_BUTTON3_MASK then Button := mbRight else
   Button := mbNoButton;
-  if Assigned(TGTKControl(widget).FOnMouseMove)
-    then TGTKControl(widget).FOnMouseMove(TGTKControl(widget), Button, Shift, Trunc(event^.x), Trunc(event^.y), Accept);
+  if Assigned(TGTKControl(user_data).FOnMouseMove)
+    then TGTKControl(user_data).FOnMouseMove(TGTKControl(user_data), Button, Shift, Trunc(event^.x), Trunc(event^.y), Accept);
   Result := not Accept;
 end;
 
@@ -733,7 +733,7 @@ procedure TGTKControl.SetOnMouseMove(Value: TGDKMouseEvent);
 begin
   if @FOnMouseMove <> @Value then begin
     FOnMouseMove := Value;
-    if Assigned(Value) then FMotionNotifyHandler := g_signal_connect_swapped(PGtkObject(FWidget), 'motion-notify-event', G_CALLBACK(@TGTKControl_motion_notify_event), Self)
+    if Assigned(Value) then FMotionNotifyHandler := g_signal_connect(PGtkObject(FWidget), 'motion-notify-event', G_CALLBACK(@TGTKControl_motion_notify_event), Self)
                        else g_signal_handler_disconnect(PGtkObject(FWidget), FMotionNotifyHandler);
   end;
 end;