Bug 658082 - Fix the user data type of the callback of gtk's signals; r=karlt
authorHiroyuki Ikezoe <hiikezoe@mozilla-japan.org>
Thu, 19 May 2011 12:51:11 +0200
changeset 69714 970f93ab763f77846ad84bdbe7356b84c05f0162
parent 69713 41f93610ff0c73f06476ca1bf9c43efdbd70344e
child 69715 7642608ac4a5a322a30a3d0149209e4f2eed3b32
push idunknown
push userunknown
push dateunknown
reviewerskarlt
bugs658082
milestone6.0a1
Bug 658082 - Fix the user data type of the callback of gtk's signals; r=karlt
widget/src/gtk2/nsWindow.cpp
widget/src/gtk2/nsWindow.h
--- a/widget/src/gtk2/nsWindow.cpp
+++ b/widget/src/gtk2/nsWindow.cpp
@@ -250,17 +250,17 @@ static void     drag_leave_event_cb     
                                            GdkDragContext *aDragContext,
                                            guint aTime,
                                            gpointer aData);
 static gboolean drag_drop_event_cb        (GtkWidget *aWidget,
                                            GdkDragContext *aDragContext,
                                            gint aX,
                                            gint aY,
                                            guint aTime,
-                                           gpointer *aData);
+                                           gpointer aData);
 static void    drag_data_received_event_cb(GtkWidget *aWidget,
                                            GdkDragContext *aDragContext,
                                            gint aX,
                                            gint aY,
                                            GtkSelectionData  *aSelectionData,
                                            guint aInfo,
                                            guint32 aTime,
                                            gpointer aData);
@@ -3614,17 +3614,17 @@ nsWindow::OnDragLeaveEvent(GtkWidget *aW
 }
 
 gboolean
 nsWindow::OnDragDropEvent(GtkWidget *aWidget,
                           GdkDragContext *aDragContext,
                           gint aX,
                           gint aY,
                           guint aTime,
-                          gpointer *aData)
+                          gpointer aData)
 
 {
     LOGDRAG(("nsWindow::OnDragDropSignal\n"));
 
     // get our drag context
     nsCOMPtr<nsIDragService> dragService = do_GetService(kCDragServiceCID);
     nsCOMPtr<nsIDragSessionGTK> dragSessionGTK = do_QueryInterface(dragService);
 
@@ -6111,17 +6111,17 @@ drag_leave_event_cb(GtkWidget *aWidget,
 
 
 static gboolean
 drag_drop_event_cb(GtkWidget *aWidget,
                    GdkDragContext *aDragContext,
                    gint aX,
                    gint aY,
                    guint aTime,
-                   gpointer *aData)
+                   gpointer aData)
 {
     nsRefPtr<nsWindow> window = get_window_for_gtk_widget(aWidget);
     if (!window)
         return FALSE;
 
     return window->OnDragDropEvent(aWidget,
                                    aDragContext,
                                    aX, aY, aTime, aData);
--- a/widget/src/gtk2/nsWindow.h
+++ b/widget/src/gtk2/nsWindow.h
@@ -236,27 +236,27 @@ public:
                                                GdkEventVisibility *aEvent);
     void               OnWindowStateEvent(GtkWidget *aWidget,
                                           GdkEventWindowState *aEvent);
     gboolean           OnDragMotionEvent(GtkWidget       *aWidget,
                                          GdkDragContext  *aDragContext,
                                          gint             aX,
                                          gint             aY,
                                          guint            aTime,
-                                         void            *aData);
+                                         gpointer         aData);
     void               OnDragLeaveEvent(GtkWidget *      aWidget,
                                         GdkDragContext   *aDragContext,
                                         guint            aTime,
                                         gpointer         aData);
     gboolean           OnDragDropEvent(GtkWidget        *aWidget,
                                        GdkDragContext   *aDragContext,
                                        gint             aX,
                                        gint             aY,
                                        guint            aTime,
-                                       gpointer         *aData);
+                                       gpointer         aData);
     void               OnDragDataReceivedEvent(GtkWidget       *aWidget,
                                                GdkDragContext  *aDragContext,
                                                gint             aX,
                                                gint             aY,
                                                GtkSelectionData*aSelectionData,
                                                guint            aInfo,
                                                guint            aTime,
                                                gpointer         aData);