Revision: 75447
http://sourceforge.net/p/brlcad/code/75447
Author: starseeker
Date: 2020-04-17 21:14:38 +0000 (Fri, 17 Apr 2020)
Log Message:
-----------
Eliminate dm_xvars.h
Modified Paths:
--------------
brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt
Removed Paths:
-------------
brlcad/branches/dm-fb-merge/src/libdm/include/dm_xvars.h
Modified: brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt 2020-04-17
21:12:51 UTC (rev 75446)
+++ brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt 2020-04-17
21:14:38 UTC (rev 75447)
@@ -163,7 +163,6 @@
X/dm-X.c
X/dm-X.h
X/if_X24.c
- include/dm_xvars.h
include/private.h
fontstash/LICENSE.fontstash
fontstash/README.md
Deleted: brlcad/branches/dm-fb-merge/src/libdm/include/dm_xvars.h
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/include/dm_xvars.h 2020-04-17
21:12:51 UTC (rev 75446)
+++ brlcad/branches/dm-fb-merge/src/libdm/include/dm_xvars.h 2020-04-17
21:14:38 UTC (rev 75447)
@@ -1,90 +0,0 @@
-/* D M _ X V A R S . H
- * BRL-CAD
- *
- * Copyright (c) 1993-2020 United States Government as represented by
- * the U.S. Army Research Laboratory.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this file; see the file named COPYING for more
- * information.
- */
-/** @addtogroup libstruct dm */
-/** @{ */
-/** @file dm_xvars.h
- *
- */
-#ifndef DM_DM_XVARS_H
-#define DM_DM_XVARS_H
-
-#include "common.h"
-
-#ifdef HAVE_X11_XLIB_H
-# include <X11/Xlib.h>
-# include <X11/Xutil.h>
-#endif
-
-#ifdef HAVE_TK
-# include "tk.h"
-# define HAVE_X11_TYPES 1
-#endif
-#ifdef IF_WGL
-#include "tkWinInt.h"
-#endif
-
-#if !defined(HAVE_TK) && !defined(TK_WINDOW_TYPEDEF)
-typedef void *Tk_Window;
-# define TK_WINDOW_TYPEDEF 1
-#endif
-
-#if !defined(HAVE_X11_TYPES) && !defined(HAVE_X11_XLIB_H)
-typedef long Display;
-typedef long Window;
-typedef long Colormap;
-#endif
-
-#define XVARS_MV_O(_m) offsetof(struct dm_xvars, _m)
-
-/* FIXME: this structure really should not be variable-width and it
- * does not allow multiple interfaces to be simultaneously compiled.
- */
-struct dm_xvars {
- Display *dpy;
- Window win;
- Tk_Window top;
- Tk_Window xtkwin;
- int depth;
- Colormap cmap;
-#ifdef IF_WGL
- PIXELFORMATDESCRIPTOR *vip;
- HFONT fontstruct;
- HDC hdc; /* device context of device that OpenGL calls are to be
drawn on */
-#endif
-#if defined(DM_X) || defined (DM_OGL)
- XVisualInfo *vip;
- XFontStruct *fontstruct;
-#endif
- int devmotionnotify;
- int devbuttonpress;
- int devbuttonrelease;
-};
-
-#endif /* DM_DM_XVARS_H */
-/** @} */
-/*
- * Local Variables:
- * mode: C
- * tab-width: 8
- * indent-tabs-mode: t
- * c-file-style: "stroustrup"
- * End:
- * ex: shiftwidth=4 tabstop=8
- */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
