put in the HAVE_GTK_MULTIHEAD conditionals so we build with GTK 2.0

2003-01-05  Havoc Pennington  <hp@pobox.com>

	* src/frames.c (meta_frames_apply_shapes): put in the
	HAVE_GTK_MULTIHEAD conditionals so we build with GTK 2.0
This commit is contained in:
Havoc Pennington 2003-01-05 19:15:58 +00:00 committed by Havoc Pennington
parent b799630ba5
commit aad72e575d
2 changed files with 12 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2003-01-05 Havoc Pennington <hp@pobox.com>
* src/frames.c (meta_frames_apply_shapes): put in the
HAVE_GTK_MULTIHEAD conditionals so we build with GTK 2.0
2003-01-05 Havoc Pennington <hp@pobox.com> 2003-01-05 Havoc Pennington <hp@pobox.com>
* src/window.c (meta_window_show): focus new windows even in * src/window.c (meta_window_show): focus new windows even in

View File

@ -835,15 +835,21 @@ meta_frames_apply_shapes (MetaFrames *frames,
Window shape_window; Window shape_window;
Window client_window; Window client_window;
Region client_xregion; Region client_xregion;
#ifdef HAVE_GTK_MULTIHEAD
GdkScreen *screen; GdkScreen *screen;
#endif
int screen_number; int screen_number;
meta_topic (META_DEBUG_SHAPES, meta_topic (META_DEBUG_SHAPES,
"Frame 0x%lx needs to incorporate client shape\n", "Frame 0x%lx needs to incorporate client shape\n",
frame->xwindow); frame->xwindow);
#ifdef HAVE_GTK_MULTIHEAD
screen = gtk_widget_get_screen (GTK_WIDGET (frames)); screen = gtk_widget_get_screen (GTK_WIDGET (frames));
screen_number = gdk_x11_screen_get_screen_number (screen); screen_number = gdk_x11_screen_get_screen_number (screen);
#else
screen_number = DefaultScreen (gdk_display);
#endif
attrs.override_redirect = True; attrs.override_redirect = True;