X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuColorBar.h;h=5adb258894e15a858cfb4fb5a8720ad8fd1700ff;hb=0cc1383dff9255c9929097bbe9f44a6f4f31c97a;hp=f1a92bf6267d9d1f4c5d575abbb37b04a55eef4a;hpb=44e4be7013ea566bd2bdefb9d48e1da0071c3d91;p=creaMaracasVisu.git diff --git a/bbtk/src/bbmaracasvisuColorBar.h b/bbtk/src/bbmaracasvisuColorBar.h index f1a92bf..5adb258 100644 --- a/bbtk/src/bbmaracasvisuColorBar.h +++ b/bbtk/src/bbmaracasvisuColorBar.h @@ -1,14 +1,13 @@ #ifdef _USE_WXWIDGETS_ -#ifndef __bbmaracasvisuColorBar_h_INCLUDED__ -#define __bbmaracasvisuColorBar_h_INCLUDED__ +#ifndef __bbcreaMaracasVisuColorBar_h_INCLUDED__ +#define __bbcreaMaracasVisuColorBar_h_INCLUDED__ #include "bbtkWxBlackBox.h" -#include "bbmaracasvisuColorBar.h" -#include "bbmaracasvisuPackage.h" +#include "bbcreaMaracasVisuPackage.h" #include "pColorBar.h" -namespace bbmaracasvisu +namespace bbcreaMaracasVisu { class /*BBTK_EXPORT*/ ColorBar @@ -16,14 +15,6 @@ class /*BBTK_EXPORT*/ ColorBar public bbtk::WxBlackBox { BBTK_BLACK_BOX_INTERFACE(ColorBar,bbtk::WxBlackBox); -//================================================================== -/// User callback called in the box contructor -virtual void bbUserConstructor(); -/// User callback called in the box copy constructor -virtual void bbUserCopyConstructor(); -/// User callback called in the box destructor -virtual void bbUserDestructor(); -//================================================================== BBTK_DECLARE_INPUT(Orientation, int ); BBTK_DECLARE_INPUT(InW, int ); BBTK_DECLARE_INPUT(InH, int ); @@ -36,7 +27,7 @@ virtual void bbUserDestructor(); BBTK_PROCESS(Process); void Process(); BBTK_CREATE_WIDGET(CreateWidget); - void CreateWidget(); + void CreateWidget(wxWindow*); private: pColorBar *mwxwidget; @@ -47,8 +38,6 @@ BBTK_NAME("ColorBar"); BBTK_AUTHOR("eduardo.davila [at] creatis.insa-lyon.fr"); BBTK_DESCRIPTION("Degrade Color Bar Window"); //BBTK_CATEGORY("__CategoryBlackBox__"); - BBTK_AUTHOR("eduardo.davila [at] creatis.insa-lyon.fr"); - BBTK_DESCRIPTION("Degrade Color Bar Window"); BBTK_INPUT(ColorBar,Orientation,"Orientation ", int,""); BBTK_INPUT(ColorBar,InW,"Width ", int,""); BBTK_INPUT(ColorBar,InH,"Height ", int,""); @@ -60,8 +49,8 @@ BBTK_DESCRIPTION("Degrade Color Bar Window"); BBTK_INPUT(ColorBar,Values, "Values ",std::vector,""); BBTK_END_DESCRIBE_BLACK_BOX(ColorBar); } -// EO namespace bbmaracasvisu +// EO namespace bbcreaMaracasVisu -#endif // __bbmaracasvisuColorBar_h_INCLUDED__ +#endif // __bbcreaMaracasVisuColorBar_h_INCLUDED__ #endif // _USE_WXWIDGETS_