Fixed the files so they compile...

Had to add an argument to Create_window... (it was missing the sterio flag)

Also cleaned up some variable overloading warnings...
(i.e. window shadows previous def)

Kent

2 files changed, 25 insertions, 24 deletions

diff --git a/intern/ghost/test/gears/GHOST_C-Test.c b/intern/ghost/test/gears/GHOST_C-Test.c
index 731e711b1c3..bb4ecd0082e 100644
--- a/intern/ghost/test/gears/GHOST_C-Test.c
+++ b/intern/ghost/test/gears/GHOST_C-Test.c
@@ -46,6 +46,8 @@
 #include <string.h>
 #include <math.h>
 
+#define FALSE 0
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -66,6 +68,7 @@
 
 
 static void gearsTimerProc(GHOST_TimerTaskHandle task, GHOST_TUns64 time);
+int processEvent(GHOST_EventHandle hEvent, GHOST_TUserDataPtr userData);
 
 static GLfloat view_rotx=20.0, view_roty=30.0, view_rotz=0.0;
 static GLfloat fAngle = 0.0;
@@ -78,7 +81,6 @@ static GHOST_WindowHandle sFullScreenWindow = NULL;
 static GHOST_TimerTaskHandle sTestTimer;
 static GHOST_TimerTaskHandle sGearsTimer;
 
-
 static void testTimerProc(GHOST_TimerTaskHandle task, GHOST_TUns64 time)
 {
 	printf("timer1, time=%d\n", (int)time);
@@ -345,7 +347,7 @@ int processEvent(GHOST_EventHandle hEvent, GHOST_TUserDataPtr userData)
 					*/
 
 					sFullScreenWindow = GHOST_BeginFullScreen(shSystem, &setting,
-						false /* stereo flag */);
+						FALSE /* stereo flag */);
 				}
 				else
 				{
@@ -400,8 +402,8 @@ int processEvent(GHOST_EventHandle hEvent, GHOST_TUserDataPtr userData)
 		
 	case GHOST_kEventWindowClose:
 		{
-			GHOST_WindowHandle window = GHOST_GetEventWindow(hEvent);
-			if (window == sMainWindow)
+			GHOST_WindowHandle window2 = GHOST_GetEventWindow(hEvent);
+			if (window2 == sMainWindow)
 			{
 				sExitRequested = 1;
 			}
@@ -412,7 +414,7 @@ int processEvent(GHOST_EventHandle hEvent, GHOST_TUserDataPtr userData)
 					GHOST_RemoveTimer(shSystem, sGearsTimer);
 					sGearsTimer = 0;
 				}
-				GHOST_DisposeWindow(shSystem, window);
+				GHOST_DisposeWindow(shSystem, window2);
 			}
 		}
 		break;
@@ -425,15 +427,12 @@ int processEvent(GHOST_EventHandle hEvent, GHOST_TUserDataPtr userData)
 		break;
 	case GHOST_kEventWindowUpdate:
 		{
-			GHOST_WindowHandle window = GHOST_GetEventWindow(hEvent);
-			if (!GHOST_ValidWindow(shSystem, window))
+			GHOST_WindowHandle window2 = GHOST_GetEventWindow(hEvent);
+			if (!GHOST_ValidWindow(shSystem, window2))
 				break;
-			//if (!m_fullScreenWindow)
-			{
-				setViewPortGL(window);
-				drawGL();
-				GHOST_SwapWindowBuffers(window);
-			}
+			setViewPortGL(window2);
+			drawGL();
+			GHOST_SwapWindowBuffers(window2);
 		}
 		break;
 		
@@ -465,7 +464,8 @@ int main(int argc, char** argv)
 			320,
 			200,
 			GHOST_kWindowStateNormal,
-			GHOST_kDrawingContextTypeOpenGL);
+			GHOST_kDrawingContextTypeOpenGL,
+			FALSE);
 		if (!sMainWindow)
 		{
 			printf("could not create main window\n");
@@ -480,7 +480,8 @@ int main(int argc, char** argv)
 			320,
 			200,
 			GHOST_kWindowStateNormal,
-			GHOST_kDrawingContextTypeOpenGL);
+			GHOST_kDrawingContextTypeOpenGL,
+			FALSE);
 		if (!sSecondaryWindow)
 		{
 			printf("could not create secondary window\n");
diff --git a/intern/ghost/test/gears/GHOST_Test.cpp b/intern/ghost/test/gears/GHOST_Test.cpp
index 40e980531ae..5c030931162 100755
--- a/intern/ghost/test/gears/GHOST_Test.cpp
+++ b/intern/ghost/test/gears/GHOST_Test.cpp
@@ -606,12 +606,12 @@ bool Application::processEvent(GHOST_IEvent* event)
 
 	case GHOST_kEventWindowClose:
 		{
-		GHOST_IWindow* window = event->getWindow();
-		if (window == m_mainWindow) {
+		GHOST_IWindow* window2 = event->getWindow();
+		if (window2 == m_mainWindow) {
 			m_exitRequested = true;
 		}
 		else {
-			m_system->disposeWindow(window);
+			m_system->disposeWindow(window2);
 		}
 		}
 		break;
@@ -626,21 +626,21 @@ bool Application::processEvent(GHOST_IEvent* event)
 
 	case GHOST_kEventWindowUpdate:
 		{
-			GHOST_IWindow* window = event->getWindow();
-			if(!m_system->validWindow(window))
+			GHOST_IWindow* window2 = event->getWindow();
+			if(!m_system->validWindow(window2))
 				break;
 
 			glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
 			if(stereo)
 			{
-				View(window, stereo, LEFT_EYE);
+				View(window2, stereo, LEFT_EYE);
 				glPushMatrix();
 				RenderCamera();
 				RenderScene();
 				glPopMatrix();
 
-				View(window, stereo, RIGHT_EYE);
+				View(window2, stereo, RIGHT_EYE);
 				glPushMatrix();
 				RenderCamera();
 				RenderScene();
@@ -648,13 +648,13 @@ bool Application::processEvent(GHOST_IEvent* event)
 			}
 			else
 			{
-				View(window, stereo);
+				View(window2, stereo);
 				glPushMatrix();
 				RenderCamera();
 				RenderScene();
 				glPopMatrix();
 			}
-			window->swapBuffers();
+			window2->swapBuffers();
 		}
 		break;