From bbf902065175c38f19cf55786e408bd2a7bb70c0 Mon Sep 17 00:00:00 2001 From: "John F. Fay" Date: Sun, 5 Feb 2012 04:18:13 +0000 Subject: [PATCH] Splitting the X11-specific "freeglut_structure.c" code into its own file git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1061 7f0cb862-5218-0410-a997-914c9d46530a --- src/Common/freeglut_structure.c | 9 --------- src/x11/freeglut_structure_x11.c | 40 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 9 deletions(-) diff --git a/src/Common/freeglut_structure.c b/src/Common/freeglut_structure.c index 59a8b83..cc64817 100644 --- a/src/Common/freeglut_structure.c +++ b/src/Common/freeglut_structure.c @@ -60,15 +60,6 @@ static void fghClearCallBacks( SFG_Window *window ) } } -#if TARGET_HOST_POSIX_X11 -void fgPlatformCreateWindow ( SFG_Window *window ) -{ - window->Window.pContext.FBConfig = NULL; - - window->State.pWState.OldHeight = window->State.pWState.OldWidth = -1; -} -#endif - /* * This private function creates, opens and adds to the hierarchy * a freeglut window complete with OpenGL context and stuff... diff --git a/src/x11/freeglut_structure_x11.c b/src/x11/freeglut_structure_x11.c index e69de29..6fc0eda 100644 --- a/src/x11/freeglut_structure_x11.c +++ b/src/x11/freeglut_structure_x11.c @@ -0,0 +1,40 @@ +/* + * freeglut_structure.c + * + * Windows and menus need tree structure + * + * Copyright (c) 1999-2000 Pawel W. Olszta. All Rights Reserved. + * Written by Pawel W. Olszta, + * Copied for Platform code by Evan Felix + * Creation date: Thur Feb 2 2012 + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#include +#include "../Common/freeglut_internal.h" + +extern SFG_Structure fgStructure; + +void fgPlatformCreateWindow ( SFG_Window *window ) +{ + window->Window.pContext.FBConfig = NULL; + + window->State.pWState.OldHeight = window->State.pWState.OldWidth = -1; +} + -- 1.7.10.4