From 01d52892036af77202db76fe86e808453d554533 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 8 Jul 2006 15:00:37 +0000
Subject: Improve windows gui support

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18954 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libvo/vo_gl.c  |  2 ++
 libvo/vo_gl2.c | 10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'libvo')

diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c
index 36142063ad..efce669724 100644
--- a/libvo/vo_gl.c
+++ b/libvo/vo_gl.c
@@ -334,7 +334,9 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
     vo_dwidth = d_width;
     vo_dheight= d_height;
     guiGetEvent(guiSetShVideo, 0);
+#ifndef GL_WIN32
     goto glconfig;
+#endif
   }
 #endif
 #ifdef GL_WIN32
diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c
index 37d4a8d2b1..9a9bbac2f2 100644
--- a/libvo/vo_gl2.c
+++ b/libvo/vo_gl2.c
@@ -731,6 +731,7 @@ static int config_glx(uint32_t width, uint32_t height, uint32_t d_width, uint32_
 
         return 0;
 }
+#endif
 
 #ifdef HAVE_NEW_GUI
 static int config_glx_gui(uint32_t d_width, uint32_t d_height) {
@@ -741,8 +742,6 @@ static int config_glx_gui(uint32_t d_width, uint32_t d_height) {
 }
 #endif
 
-#endif
-
 static int initGl(uint32_t d_width, uint32_t d_height)
 {
   fragprog = lookupTex = 0;
@@ -821,11 +820,14 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
 	vo_dx += xinerama_x;
 	vo_dy += xinerama_y;
 
-#if defined(HAVE_NEW_GUI) && !defined(GL_WIN32)
+#ifdef HAVE_NEW_GUI
 	if (use_gui) {
 	  if (config_glx_gui(d_width, d_height) == -1)
 	    return -1;
-	} else
+	}
+#ifndef GL_WIN32	
+	else
+#endif
 #endif
 #ifdef GL_WIN32
 	if (config_w32(width, height, d_width, d_height, flags, title, format) == -1)
-- 
cgit v1.2.3