-#if TARGET_HOST_UNIX_X11
- glXSwapBuffers( fgDisplay.Display, fgStructure.Window->Window.Handle );
-#elif TARGET_HOST_WIN32
- SwapBuffers( fgStructure.Window->Window.Device );
+#if TARGET_HOST_POSIX_X11
+ glXSwapBuffers( fgDisplay.Display, fgStructure.CurrentWindow->Window.Handle );
+#elif TARGET_HOST_MS_WINDOWS
+ SwapBuffers( fgStructure.CurrentWindow->Window.Device );