glcomp: remove 'borderType' that is always set to 'glBorderSolid'

diff --git a/lib/glcomp/glcompbutton.c b/lib/glcomp/glcompbutton.c
index ac463fdf55c19f197f5aba565ad49c764612c184..5c3671f3a4b88490e053df3ff16779afba032e8c 100644 (file)
--- a/lib/glcomp/glcompbutton.c
+++ b/lib/glcomp/glcompbutton.c
@@ -32,8 +32,6 @@ glCompButton *glCompButtonNew(glCompObj * par, GLfloat x, GLfloat y,
     p->common.color.B = GLCOMPSET_BUTTON_COLOR_B;
     p->common.color.A = GLCOMPSET_BUTTON_COLOR_ALPHA;
 
-    p->common.borderType = glBorderSolid;
-
     p->common.borderWidth = GLCOMPSET_BUTTON_BEVEL;
 
     p->common.width = w;

diff --git a/lib/glcomp/glcompdefs.h b/lib/glcomp/glcompdefs.h
index 0c073fec091e6012a95298b146b8fe363178dd85..3c8fb450208aeb609ac7a5ceac7d4cc66eec0f55 100644 (file)
--- a/lib/glcomp/glcompdefs.h
+++ b/lib/glcomp/glcompdefs.h
@@ -86,8 +86,6 @@ extern "C" {
            glFontVJustifyBottom, glFontVJustifyCenter } glCompVJustify;
     typedef enum { glFontHJustifyNone, glFontHJustifyLeft,
            glFontHJustifyRight, glFontHJustifyCenter } glCompHJustify;
-    typedef enum { glBorderNone, glBorderSolid, glBorderBevel,
-           glBorderCustom } glCompBorderType;
 
     typedef enum { glMouseDown, glMouseUp } glCompMouseStatus;
     typedef enum { glMouseLeftButton, glMouseRightButton,
@@ -221,7 +219,6 @@ extern "C" {
        glCompPoint refPos;     /*calculated pos after anchors and aligns */
        GLfloat width, height;
        GLfloat borderWidth;
-       glCompBorderType borderType;
        glCompColor color;
        int enabled;
        int visible;

diff --git a/lib/glcomp/glcompset.c b/lib/glcomp/glcompset.c
index b1815b1474b6ec738b4ac3b6d7d4af907473e49d..be6e30a6abcd03116ab74d65bfbc05aff993ad03 100644 (file)
--- a/lib/glcomp/glcompset.c
+++ b/lib/glcomp/glcompset.c
@@ -149,7 +149,6 @@ void glCompInitCommon(glCompObj * childObj, glCompObj * parentObj,
     c->visible = 1;
     c->pos.x = x;
     c->pos.y = y;
-    c->borderType = glBorderSolid;
     c->borderWidth = GLCOMPSET_BORDERWIDTH;
 
     /*NULL function pointers */

diff --git a/lib/glcomp/glutils.c b/lib/glcomp/glutils.c
index 7e90eafb409f68e08b8efa38d8abd995f28b2f33..6466a15baa1e19322402a45c7e0672c988ef6f7c 100644 (file)
--- a/lib/glcomp/glutils.c
+++ b/lib/glcomp/glutils.c
@@ -215,10 +215,7 @@ void glCompCalcWidget(glCompCommon * parent, glCompCommon * child,
        child->refPos.y = child->pos.y;
        return;
     }
-    if (parent->borderType == glBorderNone)
-       borderWidth = 0.0f;
-    else
-       borderWidth = parent->borderWidth;
+    borderWidth = parent->borderWidth;
     if (child->align != glAlignNone)   //if alignment, make sure width and height is no greater than parent
     {
        if (child->width > parent->width)