licence issues

diff --git a/lib/glcomp/glcomp.vcproj b/lib/glcomp/glcomp.vcproj
index 6a0d70bc9e98af6837f4c9254aeb7666ce47a6c5..469cf7e23c1a5424d0d340d21bd24d4ecffdeabf 100644 (file)
--- a/lib/glcomp/glcomp.vcproj
+++ b/lib/glcomp/glcomp.vcproj
@@ -160,19 +160,19 @@
                                >
                        </File>
                        <File
-                               RelativePath=".\glcomptexture.h"
+                               RelativePath=".\glcomptext.h"
                                >
                        </File>
                        <File
-                               RelativePath=".\glCompTrackBar.h"
+                               RelativePath=".\glcomptexture.h"
                                >
                        </File>
                        <File
-                               RelativePath=".\glpangofont.h"
+                               RelativePath=".\glcomptrackbar.h"
                                >
                        </File>
                        <File
-                               RelativePath=".\glTexFont.h"
+                               RelativePath=".\glpangofont.h"
                                >
                        </File>
                        <File
@@ -208,23 +208,23 @@
                                >
                        </File>
                        <File
-                               RelativePath=".\glcomptextpng.c"
+                               RelativePath=".\glcomptext.c"
                                >
                        </File>
                        <File
-                               RelativePath=".\glcomptexture.c"
+                               RelativePath=".\glcomptextpng.c"
                                >
                        </File>
                        <File
-                               RelativePath=".\glCompTrackBar.c"
+                               RelativePath=".\glcomptexture.c"
                                >
                        </File>
                        <File
-                               RelativePath=".\glpangofont.c"
+                               RelativePath=".\glcomptrackbar.c"
                                >
                        </File>
                        <File
-                               RelativePath=".\glTexFont.c"
+                               RelativePath=".\glpangofont.c"
                                >
                        </File>
                        <File

diff --git a/lib/glcomp/glcompbutton.c b/lib/glcomp/glcompbutton.c
index dea3d3df82751c48ea60b33b7e766808b11757d7..996f0a2b4228e9dbbb3d740f91db4fa1769422e3 100644 (file)
--- a/lib/glcomp/glcompbutton.c
+++ b/lib/glcomp/glcompbutton.c
@@ -1,6 +1,19 @@
+/**********************************************************
+*      This software is part of the graphviz package      *
+*                http://www.graphviz.org/                 *
+*                                                         *
+*            Copyright (c) 1994-2007 AT&T Corp.           *
+*                and is licensed under the                *
+*            Common Public License, Version 1.0           *
+*                      by AT&T Corp.                      *
+*                                                         *
+*        Information and Software Systems Research        *
+*              AT&T Research, Florham Park NJ             *
+**********************************************************/
+
 #include "glcompbutton.h"
 #include "glcomptexture.h"
-#include "glTexFont.h"
+#include "glcomptext.h"
 #include <string.h>
 
 glCompButton *glCompButtonNew(GLfloat x, GLfloat y, GLfloat w, GLfloat h,
@@ -182,10 +195,10 @@ int glCompDrawButton(glCompButton * p)
        fonty =
            (p->height - p->thickness * (GLfloat) 2 -
             p->fontsize) / (GLfloat) 2.0 + p->pos.y + p->thickness;
-       fontSize(p->font,p->fontsize);
+       p->font->fontheight=p->fontsize;
 //              fontColorA (p->fontcolor.R,p->fontcolor.B,p->fontcolor.G,p->fontcolor.A);
        fontColor(p->font,0, 0, 0, 1);
-       fontDrawString(p->font,(GLfloat) fontx, (GLfloat) fonty,
+       glprintf(p->font,(GLfloat) fontx, (GLfloat) fonty,
                        (p->fontsize *(GLfloat) strlen(p->caption) *
                              GLCOMPSET_FONT_SIZE_FACTOR), p->caption);
     }