diff libvo/vo_dxr3.c @ 27343:5fe6a8adf569

Rename two GUI-related preprocessor directives: HAVE_NEW_GUI --> CONFIG_GUI, HAVE_GTK2_GUI --> CONFIG_GTK2

--- a/libvo/vo_dxr3.c	Wed Jul 30 12:03:30 2008 +0000
+++ b/libvo/vo_dxr3.c	Wed Jul 30 13:44:59 2008 +0000
@@ -32,7 +32,7 @@
 #include "aspect.h"
 #include "spuenc.h"
 #include "sub.h"
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 #include "gui/interface.h"
 #endif
 #ifdef HAVE_X11
@@ -487,7 +487,7 @@
 		vo_dy = (vo_screenheight - d_height) / 2;
 		vo_dwidth = d_width;
 		vo_dheight = d_height;
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 		if (use_gui) {
 			guiGetEvent(guiSetShVideo, 0);
 			XSetWindowBackground(mDisplay, vo_window, KEY_COLOR);
@@ -704,12 +704,12 @@
 		overlay_set_mode(overlay_data, EM8300_OVERLAY_MODE_OFF);
 		overlay_release(overlay_data);
 		
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 		if (!use_gui) {
 #endif
 			vo_x11_uninit();
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 		}
 #endif
 	}
@@ -886,14 +886,14 @@
 		
 		/* Initialize overlay and X11 */
 		overlay_data = overlay_init(fd_control);
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 		if (!use_gui) {
 #endif
 			if (!vo_init()) {
 				mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_DXR3_UnableToInitX11);
 				return -1;
 			}
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 		}
 #endif
 	}