summaryrefslogtreecommitdiff
path: root/src/ui/frames.c
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-10-25 12:35:42 +0200
committerinfirit <[email protected]>2014-10-25 12:35:42 +0200
commit20615934a9d4faf8cd45de56c51357d985461267 (patch)
treeadbb76e5fb32a72f51b0e4a6163c52b6a3d140b7 /src/ui/frames.c
parent4134fe7aaf52512403e5a1319ed61fab0ce288d8 (diff)
downloadmarco-20615934a9d4faf8cd45de56c51357d985461267.tar.bz2
marco-20615934a9d4faf8cd45de56c51357d985461267.tar.xz
Cleanup GTK_CHECK_VERSION and unify where possible
gdk_x11_window_lookup_for_display since 2.24 GDK_WINDOW_XID since always gtk_widget_get_visible since 2.18 gtk_widget_set_mapped since 2.20 gdk_event_new since 2.2 gdk_x11_window_lookup_for_display since 2.24 gdk_text_property_to_utf8_list_for_display since 2.2 gtk_widget_get_realized since 2.20 gdk_visual_get_depth since 2.22 gtk_widget_get_window since 2.14 gtk_widget_set_allocation since 2.18
Diffstat (limited to 'src/ui/frames.c')
-rw-r--r--src/ui/frames.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/ui/frames.c b/src/ui/frames.c
index a131a921..54ad369c 100644
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -48,7 +48,6 @@
#define gdk_region_intersect cairo_region_intersect
G_DEFINE_TYPE (MetaFrames, meta_frames, GTK_TYPE_INVISIBLE);
#define parent_class meta_frames_parent_class
- #define GTK_WIDGET_REALIZED gtk_widget_get_realized
#endif
#define DEFAULT_INNER_BUTTON_BORDER 3
@@ -523,7 +522,7 @@ meta_frames_ensure_layout (MetaFrames *frames,
MetaFrameType type;
MetaFrameStyle *style;
- g_return_if_fail (GTK_WIDGET_REALIZED (GTK_WIDGET(frames)));
+ g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET(frames)));
widget = GTK_WIDGET (frames);
@@ -2898,11 +2897,7 @@ meta_frames_set_window_background (MetaFrames *frames,
/* Set A in ARGB to window_background_alpha, if we have ARGB */
visual = gtk_widget_get_visual (GTK_WIDGET (frames));
- #if GTK_CHECK_VERSION(3, 0, 0)
if (gdk_visual_get_depth(visual) == 32) /* we have ARGB */
- #else
- if (visual->depth == 32) /* we have ARGB */
- #endif
{
color.pixel = (color.pixel & 0xffffff) &
style->window_background_alpha << 24;