diff --git a/makefile.gaz b/makefile.gaz index 467d42b9e..8c7892321 100644 --- a/makefile.gaz +++ b/makefile.gaz @@ -220,8 +220,7 @@ gfx_src := prim \ bubicles \ actor -gui_src := gbubbles \ - gbutton \ +gui_src := gbutton \ gfactory \ gframe \ greadout \ diff --git a/source/gui/gfactory.cpp b/source/gui/gfactory.cpp index 655ba9c5d..2ae341acf 100644 --- a/source/gui/gfactory.cpp +++ b/source/gui/gfactory.cpp @@ -38,10 +38,6 @@ #include "gui\greadout.h" #endif -#ifndef __GUI_GBUBBLEs_H__ -#include "gui\gbubbles.h" -#endif - #ifndef __MEMORY_HEADER__ #include "mem\memory.h" #endif @@ -83,7 +79,6 @@ void CGUIFactory::createValueButtonFrame(class CGUIObject *_parent, CGUIGroupFrame *fr; CGUITextBox *tb; CGUIValueButton *vb; - CGUIBubbles *bu; int x,y,w,h; fr=new ("frame") CGUIGroupFrame(); @@ -102,9 +97,6 @@ void CGUIFactory::createValueButtonFrame(class CGUIObject *_parent, h=tb->getTextHeight(); x=(_w-w)/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; CGUICycleButton *cb; CGUITextReadout *tr; - CGUIBubbles *bu; int x,y,w,h; fr=new ("frame") CGUIGroupFrame(); @@ -146,9 +137,6 @@ void CGUIFactory::createCycleButtonFrame(class CGUIObject *_parent, h=tb->getTextHeight(); x=(_w-w)/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; CGUISliderButton *sb; CGUIBarReadout *br; - CGUIBubbles *bu; int x,y,w,h; fr=new ("frame") CGUIGroupFrame(); @@ -190,9 +177,6 @@ void CGUIFactory::createSliderButtonFrame(class CGUIObject *_parent, h=tb->getTextHeight(); x=(_w-w)/2; y=(_h-h)/2; - bu=new ("bubbles") CGUIBubbles(); - bu->init(fr); - bu->setObjectXYWH(x,y,w,h); }