This commit is contained in:
parent
ae7416cfc2
commit
df1fc00b65
2 changed files with 1 additions and 18 deletions
|
@ -220,8 +220,7 @@ gfx_src := prim \
|
||||||
bubicles \
|
bubicles \
|
||||||
actor
|
actor
|
||||||
|
|
||||||
gui_src := gbubbles \
|
gui_src := gbutton \
|
||||||
gbutton \
|
|
||||||
gfactory \
|
gfactory \
|
||||||
gframe \
|
gframe \
|
||||||
greadout \
|
greadout \
|
||||||
|
|
|
@ -38,10 +38,6 @@
|
||||||
#include "gui\greadout.h"
|
#include "gui\greadout.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __GUI_GBUBBLEs_H__
|
|
||||||
#include "gui\gbubbles.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef __MEMORY_HEADER__
|
#ifndef __MEMORY_HEADER__
|
||||||
#include "mem\memory.h"
|
#include "mem\memory.h"
|
||||||
#endif
|
#endif
|
||||||
|
@ -83,7 +79,6 @@ void CGUIFactory::createValueButtonFrame(class CGUIObject *_parent,
|
||||||
CGUIGroupFrame *fr;
|
CGUIGroupFrame *fr;
|
||||||
CGUITextBox *tb;
|
CGUITextBox *tb;
|
||||||
CGUIValueButton *vb;
|
CGUIValueButton *vb;
|
||||||
CGUIBubbles *bu;
|
|
||||||
int x,y,w,h;
|
int x,y,w,h;
|
||||||
|
|
||||||
fr=new ("frame") CGUIGroupFrame();
|
fr=new ("frame") CGUIGroupFrame();
|
||||||
|
@ -102,9 +97,6 @@ void CGUIFactory::createValueButtonFrame(class CGUIObject *_parent,
|
||||||
h=tb->getTextHeight();
|
h=tb->getTextHeight();
|
||||||
x=(_w-w)/2;
|
x=(_w-w)/2;
|
||||||
y=(_h-h)/2;
|
y=(_h-h)/2;
|
||||||
bu=new ("bubbles") CGUIBubbles();
|
|
||||||
bu->init(fr);
|
|
||||||
bu->setObjectXYWH(x,y,w,h);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*----------------------------------------------------------------------
|
/*----------------------------------------------------------------------
|
||||||
|
@ -122,7 +114,6 @@ void CGUIFactory::createCycleButtonFrame(class CGUIObject *_parent,
|
||||||
CGUITextBox *tb;
|
CGUITextBox *tb;
|
||||||
CGUICycleButton *cb;
|
CGUICycleButton *cb;
|
||||||
CGUITextReadout *tr;
|
CGUITextReadout *tr;
|
||||||
CGUIBubbles *bu;
|
|
||||||
int x,y,w,h;
|
int x,y,w,h;
|
||||||
|
|
||||||
fr=new ("frame") CGUIGroupFrame();
|
fr=new ("frame") CGUIGroupFrame();
|
||||||
|
@ -146,9 +137,6 @@ void CGUIFactory::createCycleButtonFrame(class CGUIObject *_parent,
|
||||||
h=tb->getTextHeight();
|
h=tb->getTextHeight();
|
||||||
x=(_w-w)/2;
|
x=(_w-w)/2;
|
||||||
y=(_h-h)/2;
|
y=(_h-h)/2;
|
||||||
bu=new ("bubbles") CGUIBubbles();
|
|
||||||
bu->init(fr);
|
|
||||||
bu->setObjectXYWH(x,y,w,h);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*----------------------------------------------------------------------
|
/*----------------------------------------------------------------------
|
||||||
|
@ -166,7 +154,6 @@ void CGUIFactory::createSliderButtonFrame(class CGUIObject *_parent,
|
||||||
CGUITextBox *tb;
|
CGUITextBox *tb;
|
||||||
CGUISliderButton *sb;
|
CGUISliderButton *sb;
|
||||||
CGUIBarReadout *br;
|
CGUIBarReadout *br;
|
||||||
CGUIBubbles *bu;
|
|
||||||
int x,y,w,h;
|
int x,y,w,h;
|
||||||
|
|
||||||
fr=new ("frame") CGUIGroupFrame();
|
fr=new ("frame") CGUIGroupFrame();
|
||||||
|
@ -190,9 +177,6 @@ void CGUIFactory::createSliderButtonFrame(class CGUIObject *_parent,
|
||||||
h=tb->getTextHeight();
|
h=tb->getTextHeight();
|
||||||
x=(_w-w)/2;
|
x=(_w-w)/2;
|
||||||
y=(_h-h)/2;
|
y=(_h-h)/2;
|
||||||
bu=new ("bubbles") CGUIBubbles();
|
|
||||||
bu->init(fr);
|
|
||||||
bu->setObjectXYWH(x,y,w,h);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue