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

widget: shape_combine_mask => shape_cobine_region

Browse Source 
Replace gtk_widget_shape_combine_region() with
gtk_widget_shape_combine_mask() and
gtk_widget_input_shape_combine_region() with
gtk_widget_input_shape_combine_mask().
As GdkBitmap is going away, and the region equivalents already exist,
this seems like pretty much the default step to take.

Includes code to fix up the users.
This commit is contained in:
Benjamin Otte
2010-08-14 06:38:11 +02:00
parent 8b4d50dd1d
commit 806a7239ae
6 changed files with 83 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
gtk/gtkwidget.h
View File

@ -199,7 +199,6 @@ typedef struct _GtkSelectionData GtkSelectionData;
typedef struct _GtkWidgetPrivate GtkWidgetPrivate;
typedef struct _GtkWidgetClass GtkWidgetClass;
typedef struct _GtkWidgetAuxInfo GtkWidgetAuxInfo;
typedef struct _GtkWidgetShapeInfo GtkWidgetShapeInfo;
typedef struct _GtkClipboard GtkClipboard;
typedef struct _GtkTooltip GtkTooltip;
typedef struct _GtkWindow GtkWindow;
@ -530,13 +529,6 @@ struct _GtkWidgetAuxInfo
GtkBorder margin;
};
struct _GtkWidgetShapeInfo
{
gint16 offset_x;
gint16 offset_y;
GdkBitmap *shape_mask;
};
GType gtk_widget_get_type (void) G_GNUC_CONST;
GtkWidget* gtk_widget_new (GType type,
const gchar *first_property_name,
@ -919,16 +911,12 @@ GtkTextDirection gtk_widget_get_default_direction (void);
/* Compositing manager functionality */
gboolean gtk_widget_is_composited (GtkWidget *widget);
/* Counterpart to gdk_window_shape_combine_mask.
/* Counterpart to gdk_window_shape_combine_region.
*/
void gtk_widget_shape_combine_mask (GtkWidget *widget,
GdkBitmap *shape_mask,
gint offset_x,
gint offset_y);
void gtk_widget_input_shape_combine_mask (GtkWidget *widget,
GdkBitmap *shape_mask,
gint offset_x,
gint offset_y);
void gtk_widget_shape_combine_region (GtkWidget *widget,
cairo_region_t *region);
void gtk_widget_input_shape_combine_region (GtkWidget *widget,
cairo_region_t *region);
/* internal function */
void gtk_widget_reset_shapes (GtkWidget *widget);