forked from AuroraMiddleware/gtk
remove unused variable.
Thu Jun 16 15:33:42 2005 Manish Singh <yosh@gimp.org> * gdk/x11/gdkcursor-x11.c (update_cursor): remove unused variable. * gdk/x11/gdkwindow-x11.c (_gdk_x11_window_get_cursor): use g_return_val_if_fail. * gtk/gtkdnd.c (gtk_drag_get_cursor): initialize hot_x and hot_y for all cases. * gtk/gtkfilechooserdefault.c (button_new): gtk_button_set_image takes a GtkWidget, not a GtkImage.
This commit is contained in:
parent
2ee17f4875
commit
be53636ec1
13
ChangeLog
13
ChangeLog
@ -1,3 +1,16 @@
|
||||
Thu Jun 16 15:33:42 2005 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* gdk/x11/gdkcursor-x11.c (update_cursor): remove unused variable.
|
||||
|
||||
* gdk/x11/gdkwindow-x11.c (_gdk_x11_window_get_cursor): use
|
||||
g_return_val_if_fail.
|
||||
|
||||
* gtk/gtkdnd.c (gtk_drag_get_cursor): initialize hot_x and hot_y
|
||||
for all cases.
|
||||
|
||||
* gtk/gtkfilechooserdefault.c (button_new): gtk_button_set_image
|
||||
takes a GtkWidget, not a GtkImage.
|
||||
|
||||
2005-06-16 Matthias Clasen <mclasen@redhat.com>
|
||||
|
||||
* gtk/gtkfilechooserdefault.c (button_new): Simplify
|
||||
|
@ -1,3 +1,16 @@
|
||||
Thu Jun 16 15:33:42 2005 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* gdk/x11/gdkcursor-x11.c (update_cursor): remove unused variable.
|
||||
|
||||
* gdk/x11/gdkwindow-x11.c (_gdk_x11_window_get_cursor): use
|
||||
g_return_val_if_fail.
|
||||
|
||||
* gtk/gtkdnd.c (gtk_drag_get_cursor): initialize hot_x and hot_y
|
||||
for all cases.
|
||||
|
||||
* gtk/gtkfilechooserdefault.c (button_new): gtk_button_set_image
|
||||
takes a GtkWidget, not a GtkImage.
|
||||
|
||||
2005-06-16 Matthias Clasen <mclasen@redhat.com>
|
||||
|
||||
* gtk/gtkfilechooserdefault.c (button_new): Simplify
|
||||
|
@ -1,3 +1,16 @@
|
||||
Thu Jun 16 15:33:42 2005 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* gdk/x11/gdkcursor-x11.c (update_cursor): remove unused variable.
|
||||
|
||||
* gdk/x11/gdkwindow-x11.c (_gdk_x11_window_get_cursor): use
|
||||
g_return_val_if_fail.
|
||||
|
||||
* gtk/gtkdnd.c (gtk_drag_get_cursor): initialize hot_x and hot_y
|
||||
for all cases.
|
||||
|
||||
* gtk/gtkfilechooserdefault.c (button_new): gtk_button_set_image
|
||||
takes a GtkWidget, not a GtkImage.
|
||||
|
||||
2005-06-16 Matthias Clasen <mclasen@redhat.com>
|
||||
|
||||
* gtk/gtkfilechooserdefault.c (button_new): Simplify
|
||||
|
@ -396,7 +396,6 @@ update_cursor (gpointer key,
|
||||
gpointer data)
|
||||
{
|
||||
Display *xdisplay;
|
||||
GdkWindow *window;
|
||||
GdkCursor *cursor;
|
||||
GdkCursorPrivate *private;
|
||||
Cursor new_cursor = None;
|
||||
|
@ -2896,7 +2896,7 @@ _gdk_x11_window_get_cursor (GdkWindow *window)
|
||||
GdkWindowObject *private;
|
||||
GdkWindowImplX11 *impl;
|
||||
|
||||
g_return_if_fail (GDK_IS_WINDOW (window));
|
||||
g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
|
||||
|
||||
private = (GdkWindowObject *)window;
|
||||
impl = GDK_WINDOW_IMPL_X11 (private->impl);
|
||||
|
@ -593,7 +593,8 @@ gtk_drag_get_cursor (GdkDisplay *display,
|
||||
gint width, height;
|
||||
GdkPixbuf *cursor_pixbuf, *pixbuf;
|
||||
GtkAnchorType icon_anchor;
|
||||
gint hot_x, hot_y, icon_x, icon_y, ref_x, ref_y;
|
||||
gint hot_x = 0, hot_y = 0;
|
||||
gint icon_x, icon_y, ref_x, ref_y;
|
||||
gboolean found;
|
||||
|
||||
if (info->drag_cursors[i] != NULL)
|
||||
@ -609,7 +610,6 @@ gtk_drag_get_cursor (GdkDisplay *display,
|
||||
if (!cursor_pixbuf)
|
||||
{
|
||||
cursor_pixbuf = g_object_ref (drag_cursors[i].pixbuf);
|
||||
hot_x = hot_y = 0;
|
||||
icon_anchor = GTK_ANCHOR_NORTH;
|
||||
icon_x = icon_y = -2;
|
||||
}
|
||||
|
@ -1878,7 +1878,7 @@ button_new (GtkFileChooserDefault *impl,
|
||||
|
||||
button = gtk_button_new_with_mnemonic (text);
|
||||
image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON);
|
||||
gtk_button_set_image (GTK_BUTTON (button), GTK_IMAGE (image));
|
||||
gtk_button_set_image (GTK_BUTTON (button), image);
|
||||
|
||||
gtk_widget_set_sensitive (button, sensitive);
|
||||
g_signal_connect (button, "clicked", callback, impl);
|
||||
|
Loading…
Reference in New Issue
Block a user