Mercurial Mercurial > hg > stx-libview / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
care for Object definition
authorClaus Gittinger <cg@exept.de>
Sat, 20 Jul 1996 12:13:11 +0200
changeset 969 61724c5ab6a5
parent 968 b042b0b62baa
child 970 1b53d2dd6e61
care for Object definition
GLXWorkstat.st file | annotate | diff | comparison | revisions
GLXWorkstation.st file | annotate | diff | comparison | revisions 
--- a/GLXWorkstat.st	Sat Jul 20 12:12:47 1996 +0200
+++ b/GLXWorkstat.st	Sat Jul 20 12:13:11 1996 +0200
@@ -118,9 +118,13 @@
  * stupid again - from now on, we need ST/X's String again
  */
 #undef String
-#ifdef __DEF_STRING
+#ifdef __DEF_String
 # define String __DEF_String
 #endif
+#undef Object
+#ifdef __DEF_Object
+# define Object __DEF_Object
+#endif
 
 /*
  * mhmh - openGL has its separate gl-context,
@@ -247,7 +251,7 @@
 #define _longVal(l)        ((long)(__intVal(l)))
 #define _deviceVal(l)      ((Device)(__intVal(l)))
 #define _tagVal(l)         ((Tag)(__intVal(l)))
-#define _objectVal(l)      ((Object)(__intVal(l)))
+#define _objectVal(l)      ((GLX_Object)(__intVal(l)))
 #define _offsetVal(l)      ((Offset)(__intVal(l)))
 #define _rgbVal(l)         ((RGBvalue)(__intVal(l)))
 #define _angleVal(c)       ((Angle)(__intVal(c)))
@@ -8780,5 +8784,5 @@
 !GLXWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Attic/GLXWorkstat.st,v 1.60 1996-07-19 16:38:40 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Attic/GLXWorkstat.st,v 1.61 1996-07-20 10:13:11 cg Exp $'
 ! !
--- a/GLXWorkstation.st	Sat Jul 20 12:12:47 1996 +0200
+++ b/GLXWorkstation.st	Sat Jul 20 12:13:11 1996 +0200
@@ -118,9 +118,13 @@
  * stupid again - from now on, we need ST/X's String again
  */
 #undef String
-#ifdef __DEF_STRING
+#ifdef __DEF_String
 # define String __DEF_String
 #endif
+#undef Object
+#ifdef __DEF_Object
+# define Object __DEF_Object
+#endif
 
 /*
  * mhmh - openGL has its separate gl-context,
@@ -247,7 +251,7 @@
 #define _longVal(l)        ((long)(__intVal(l)))
 #define _deviceVal(l)      ((Device)(__intVal(l)))
 #define _tagVal(l)         ((Tag)(__intVal(l)))
-#define _objectVal(l)      ((Object)(__intVal(l)))
+#define _objectVal(l)      ((GLX_Object)(__intVal(l)))
 #define _offsetVal(l)      ((Offset)(__intVal(l)))
 #define _rgbVal(l)         ((RGBvalue)(__intVal(l)))
 #define _angleVal(c)       ((Angle)(__intVal(c)))
@@ -8780,5 +8784,5 @@
 !GLXWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/GLXWorkstation.st,v 1.60 1996-07-19 16:38:40 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/GLXWorkstation.st,v 1.61 1996-07-20 10:13:11 cg Exp $'
 ! !
hg/stx-libview