X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_display.c;h=8faa4a5a3a164c7a51f050cbfe0f94f8dc5669ec;hb=9807c5fdb2f20f098c7046786908a7f3ce1dc2d4;hp=fe0ff137c75d04e858179556127cab63f7b75056;hpb=074fe7a4ceb20811af83f735d5db74d69d11442c;p=freeglut

diff --git a/src/freeglut_display.c b/src/freeglut_display.c
index fe0ff13..8faa4a5 100644
--- a/src/freeglut_display.c
+++ b/src/freeglut_display.c
@@ -25,14 +25,9 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
-
 /* -- INTERFACE FUNCTIONS -------------------------------------------------- */
 
 /*
@@ -40,9 +35,9 @@
  */
 void FGAPIENTRY glutPostRedisplay( void )
 {
-    freeglut_assert_ready;
-    freeglut_assert_window;
-    fgStructure.Window->State.Redisplay = GL_TRUE;
+    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutPostRedisplay" );
+    FREEGLUT_EXIT_IF_NO_WINDOW ( "glutPostRedisplay" );
+    fgStructure.CurrentWindow->State.Redisplay = GL_TRUE;
 }
 
 /*
@@ -50,17 +45,17 @@ void FGAPIENTRY glutPostRedisplay( void )
  */
 void FGAPIENTRY glutSwapBuffers( void )
 {
-    freeglut_assert_ready;
-    freeglut_assert_window;
+    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSwapBuffers" );
+    FREEGLUT_EXIT_IF_NO_WINDOW ( "glutSwapBuffers" );
 
     glFlush( );
-    if( ! fgStructure.Window->Window.DoubleBuffered )
+    if( ! fgStructure.CurrentWindow->Window.DoubleBuffered )
         return;
 
 #if TARGET_HOST_UNIX_X11
-    glXSwapBuffers( fgDisplay.Display, fgStructure.Window->Window.Handle );
-#elif TARGET_HOST_WIN32
-    SwapBuffers( fgStructure.Window->Window.Device );
+    glXSwapBuffers( fgDisplay.Display, fgStructure.CurrentWindow->Window.Handle );
+#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
+    SwapBuffers( fgStructure.CurrentWindow->Window.Device );
 #endif
 
     /* GLUT_FPS env var support */
@@ -90,7 +85,7 @@ void FGAPIENTRY glutPostWindowRedisplay( int windowID )
 {
     SFG_Window* window;
 
-    freeglut_assert_ready;
+    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutPostWindowRedisplay" );
     window = fgWindowByID( windowID );
     freeglut_return_if_fail( window );
     window->State.Redisplay = GL_TRUE;