put multihead stuff in HAVE_GTK_MULTIHEAD, reported by John Palmieri

2002-10-20  Havoc Pennington  <hp@pobox.com>

	* src/ui.c (meta_image_window_new): put multihead stuff in
	HAVE_GTK_MULTIHEAD, reported by John Palmieri
This commit is contained in:
Havoc Pennington 2002-10-20 17:17:16 +00:00 committed by Havoc Pennington
parent 95e5a13131
commit 0c5cacf7cc
2 changed files with 18 additions and 6 deletions

View File

@ -1,3 +1,8 @@
2002-10-20 Havoc Pennington <hp@pobox.com>
* src/ui.c (meta_image_window_new): put multihead stuff in
HAVE_GTK_MULTIHEAD, reported by John Palmieri
2002-10-20 Havoc Pennington <hp@pobox.com> 2002-10-20 Havoc Pennington <hp@pobox.com>
* src/keybindings.c (handle_raise_or_lower): check above->mapped * src/keybindings.c (handle_raise_or_lower): check above->mapped

View File

@ -309,15 +309,22 @@ meta_image_window_new (Display *xdisplay,
int max_height) int max_height)
{ {
MetaImageWindow *iw; MetaImageWindow *iw;
GdkDisplay *gdisplay;
GdkScreen *gscreen;
gdisplay = gdk_x11_lookup_xdisplay (xdisplay);
gscreen = gdk_display_get_screen (gdisplay, screen_number);
iw = g_new (MetaImageWindow, 1); iw = g_new (MetaImageWindow, 1);
iw->window = gtk_window_new (GTK_WINDOW_POPUP); iw->window = gtk_window_new (GTK_WINDOW_POPUP);
gtk_window_set_screen (GTK_WINDOW (iw->window), gscreen);
#ifdef HAVE_GTK_MULTIHEAD
{
GdkDisplay *gdisplay;
GdkScreen *gscreen;
gdisplay = gdk_x11_lookup_xdisplay (xdisplay);
gscreen = gdk_display_get_screen (gdisplay, screen_number);
gtk_window_set_screen (GTK_WINDOW (iw->window), gscreen);
}
#endif
gtk_widget_realize (iw->window); gtk_widget_realize (iw->window);
iw->pixmap = gdk_pixmap_new (iw->window->window, iw->pixmap = gdk_pixmap_new (iw->window->window,
max_width, max_height, max_width, max_height,