diff options
| author | monsta <[email protected]> | 2016-11-21 21:14:26 +0300 |
|---|---|---|
| committer | monsta <[email protected]> | 2016-11-21 21:14:26 +0300 |
| commit | d0ddaedffa7d417a699cafce73c1e418515c4a28 (patch) | |
| tree | 645b7a86e32b21113e1ce14f563bfb8d8900fa53 /mate-panel/panel-background.h | |
| parent | 7dfeb78328039cf92a9f45d64c9b3662d967a1fe (diff) | |
| download | mate-panel-d0ddaedffa7d417a699cafce73c1e418515c4a28.tar.bz2 mate-panel-d0ddaedffa7d417a699cafce73c1e418515c4a28.tar.xz | |
move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option
and require libmate-desktop >= 1.17
WARNING: use GTK+3 build of libmateweather for this build.
that lib is not migrated to GTK+3 only as we will possibly
use libgweather instead of it.
Diffstat (limited to 'mate-panel/panel-background.h')
| -rw-r--r-- | mate-panel/panel-background.h | 44 |
1 files changed, 1 insertions, 43 deletions
diff --git a/mate-panel/panel-background.h b/mate-panel/panel-background.h index 2ca1c451..aa0183ed 100644 --- a/mate-panel/panel-background.h +++ b/mate-panel/panel-background.h @@ -44,38 +44,23 @@ struct _PanelBackground { PanelBackgroundChangedNotify notify_changed; gpointer user_data; -#if GTK_CHECK_VERSION (3, 0, 0) GdkRGBA color; -#else - PanelColor color; -#endif + char *image; GdkPixbuf *loaded_image; GtkOrientation orientation; GdkRectangle region; GdkPixbuf *transformed_image; -#if GTK_CHECK_VERSION (3, 0, 0) cairo_pattern_t *composited_pattern; -#else - GdkPixbuf *composited_image; -#endif PanelBackgroundMonitor *monitor; GdkPixbuf *desktop; gulong monitor_signal; GdkWindow *window; -#if GTK_CHECK_VERSION (3, 0, 0) cairo_pattern_t *default_pattern; GdkRGBA default_color; -#else - GdkPixmap *pixmap; - GdkColormap *colormap; - GdkGC *gc; - GdkPixmap *default_pixmap; - GdkColor default_color; -#endif guint fit_image : 1; guint stretch_image : 1; @@ -94,29 +79,17 @@ void panel_background_init (PanelBackground *background, void panel_background_free (PanelBackground *background); void panel_background_set (PanelBackground *background, PanelBackgroundType type, -#if GTK_CHECK_VERSION (3, 0, 0) const GdkRGBA *color, -#else - PanelColor *color, -#endif const char *image, gboolean fit_image, gboolean stretch_image, gboolean rotate_image); void panel_background_set_type (PanelBackground *background, PanelBackgroundType type); -#if !GTK_CHECK_VERSION (3, 0, 0) -void panel_background_set_gdk_color (PanelBackground *background, - GdkColor *gdk_color); -#endif void panel_background_set_opacity (PanelBackground *background, guint16 opacity); void panel_background_set_color (PanelBackground *background, -#if GTK_CHECK_VERSION (3, 0, 0) const GdkRGBA *color); -#else - PanelColor *color); -#endif void panel_background_set_image (PanelBackground *background, const char *image); void panel_background_set_fit (PanelBackground *background, @@ -126,13 +99,8 @@ void panel_background_set_stretch (PanelBackground *background, void panel_background_set_rotate (PanelBackground *background, gboolean rotate_image); void panel_background_set_default_style (PanelBackground *background, -#if GTK_CHECK_VERSION (3, 0, 0) GdkRGBA *color, cairo_pattern_t *pattern); -#else - GdkColor *color, - GdkPixmap *pixmap); -#endif void panel_background_realized (PanelBackground *background, GdkWindow *window); void panel_background_unrealized (PanelBackground *background); @@ -147,21 +115,11 @@ char *panel_background_make_string (PanelBackground *background, int y); PanelBackgroundType panel_background_get_type (PanelBackground *background); -#if GTK_CHECK_VERSION (3, 0, 0) const GdkRGBA *panel_background_get_color (PanelBackground *background); -#else -const PanelColor *panel_background_get_color (PanelBackground *background); -const GdkPixmap *panel_background_get_pixmap (PanelBackground *background); -#endif PanelBackgroundType panel_background_effective_type (PanelBackground *background); -#if GTK_CHECK_VERSION (3, 0, 0) void panel_background_apply_css(PanelBackground *background, GtkWidget *widget); -#else -void panel_background_change_background_on_widget (PanelBackground *background, - GtkWidget *widget); -#endif #endif /* __PANEL_BACKGROUND_H__ */ |