callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gdk/gdkdraw.c #include gdkcairo.h for gdk_cairo_create() declaration.

Browse Source 
Sat May 14 00:07:46 2005  Manish Singh  <yosh@gimp.org>

        * gdk/gdkdraw.c
        * gdk/gdkpango.c: #include gdkcairo.h for gdk_cairo_create()
        declaration.

        * gtk/gtkiconview.c (gtk_icon_view_create_drag_icon): actually
        call gdk_cairo_set_source_color() with a color.

        * gtk/gtkimage.c (gtk_image_expose): remove unused stock_id variable.

        * tests/testiconview.c (main): cast args of drag functions to the
        appropriate type.
This commit is contained in:
Manish Singh
2005-05-14 07:19:48 +00:00
committed by Manish Singh
parent c2bd238e88
commit 4849c70543
8 changed files with 51 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,17 @@
Sat May 14 00:07:46 2005 Manish Singh <yosh@gimp.org>
* gdk/gdkdraw.c
* gdk/gdkpango.c: #include gdkcairo.h for gdk_cairo_create()
declaration.
* gtk/gtkiconview.c (gtk_icon_view_create_drag_icon): actually
call gdk_cairo_set_source_color() with a color.
* gtk/gtkimage.c (gtk_image_expose): remove unused stock_id variable.
* tests/testiconview.c (main): cast args of drag functions to the
appropriate type.
2005-05-13 Owen Taylor <otaylor@redhat.com> 2005-05-13 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdrawable-x11.c: Update for cairo-xlib API change. * gdk/x11/gdkdrawable-x11.c: Update for cairo-xlib API change.

14
ChangeLog.pre-2-10
View File

@ -1,3 +1,17 @@
Sat May 14 00:07:46 2005 Manish Singh <yosh@gimp.org>
* gdk/gdkdraw.c
* gdk/gdkpango.c: #include gdkcairo.h for gdk_cairo_create()
declaration.
* gtk/gtkiconview.c (gtk_icon_view_create_drag_icon): actually
call gdk_cairo_set_source_color() with a color.
* gtk/gtkimage.c (gtk_image_expose): remove unused stock_id variable.
* tests/testiconview.c (main): cast args of drag functions to the
appropriate type.
2005-05-13 Owen Taylor <otaylor@redhat.com> 2005-05-13 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdrawable-x11.c: Update for cairo-xlib API change. * gdk/x11/gdkdrawable-x11.c: Update for cairo-xlib API change.

14
ChangeLog.pre-2-8
View File

@ -1,3 +1,17 @@
Sat May 14 00:07:46 2005 Manish Singh <yosh@gimp.org>
* gdk/gdkdraw.c
* gdk/gdkpango.c: #include gdkcairo.h for gdk_cairo_create()
declaration.
* gtk/gtkiconview.c (gtk_icon_view_create_drag_icon): actually
call gdk_cairo_set_source_color() with a color.
* gtk/gtkimage.c (gtk_image_expose): remove unused stock_id variable.
* tests/testiconview.c (main): cast args of drag functions to the
appropriate type.
2005-05-13 Owen Taylor <otaylor@redhat.com> 2005-05-13 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdrawable-x11.c: Update for cairo-xlib API change. * gdk/x11/gdkdrawable-x11.c: Update for cairo-xlib API change.

1
gdk/gdkdraw.c
View File

@ -27,6 +27,7 @@
#include <config.h> #include <config.h>
#include <math.h> #include <math.h>
#include <pango/pangocairo.h> #include <pango/pangocairo.h>
#include "gdkcairo.h"
#include "gdkdrawable.h" #include "gdkdrawable.h"
#include "gdkinternals.h" #include "gdkinternals.h"
#include "gdkwindow.h" #include "gdkwindow.h"

1
gdk/gdkpango.c
View File

@ -20,6 +20,7 @@
#include <config.h> #include <config.h>
#include <math.h> #include <math.h>
#include <pango/pangocairo.h> #include <pango/pangocairo.h>
#include "gdkcairo.h"
#include "gdkcolor.h" #include "gdkcolor.h"
#include "gdkgc.h" #include "gdkgc.h"
#include "gdkinternals.h" #include "gdkinternals.h"

3
gtk/gtkiconview.c
View File

@ -6463,7 +6463,8 @@ gtk_icon_view_create_drag_icon (GtkIconView *icon_view,
cr = gdk_cairo_create (drawable); cr = gdk_cairo_create (drawable);
cairo_set_line_width (cr, 1.); cairo_set_line_width (cr, 1.);
gdk_cairo_set_source_color (cr, &widget->style->base_gc); gdk_cairo_set_source_color
(cr, &widget->style->base[GTK_WIDGET_STATE (widget)]);
cairo_rectangle (cr, 0, 0, item->width + 2, item->height + 2); cairo_rectangle (cr, 0, 0, item->width + 2, item->height + 2);
cairo_fill (cr); cairo_fill (cr);

2
gtk/gtkimage.c
View File

@ -1547,8 +1547,6 @@ gtk_image_expose (GtkWidget *widget,
GdkBitmap *mask; GdkBitmap *mask;
GdkPixbuf *pixbuf; GdkPixbuf *pixbuf;
gboolean needs_state_transform; gboolean needs_state_transform;
gchar *stock_id;
image = GTK_IMAGE (widget); image = GTK_IMAGE (widget);
misc = GTK_MISC (widget); misc = GTK_MISC (widget);

8
tests/testiconview.c
View File

@ -502,22 +502,22 @@ main (gint argc, gchar **argv)
#endif #endif
/* Allow DND between the icon view and the tree view */ /* Allow DND between the icon view and the tree view */
gtk_icon_view_enable_model_drag_source (icon_list, gtk_icon_view_enable_model_drag_source (GTK_ICON_VIEW (icon_list),
GDK_BUTTON1_MASK, GDK_BUTTON1_MASK,
item_targets, item_targets,
G_N_ELEMENTS (item_targets), G_N_ELEMENTS (item_targets),
GDK_ACTION_MOVE); GDK_ACTION_MOVE);
gtk_icon_view_enable_model_drag_dest (icon_list, gtk_icon_view_enable_model_drag_dest (GTK_ICON_VIEW (icon_list),
item_targets, item_targets,
G_N_ELEMENTS (item_targets), G_N_ELEMENTS (item_targets),
GDK_ACTION_MOVE); GDK_ACTION_MOVE);
gtk_tree_view_enable_model_drag_source (tv, gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (tv),
GDK_BUTTON1_MASK, GDK_BUTTON1_MASK,
item_targets, item_targets,
G_N_ELEMENTS (item_targets), G_N_ELEMENTS (item_targets),
GDK_ACTION_MOVE); GDK_ACTION_MOVE);
gtk_tree_view_enable_model_drag_dest (tv, gtk_tree_view_enable_model_drag_dest (GTK_TREE_VIEW (tv),
item_targets, item_targets,
G_N_ELEMENTS (item_targets), G_N_ELEMENTS (item_targets),
GDK_ACTION_MOVE); GDK_ACTION_MOVE);