X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxLayoutLine.h;h=010fe2018943fc00cbb9623c2607155ea126b873;hb=b7dd1ccf2db9c018dabadd835739aba15f3664ba;hp=50ee0c04b26c77c2cc1ce1ba7954b498e86c6b83;hpb=236a8e2fee9937c050e2d16c7222e1caa993f01c;p=bbtk.git diff --git a/packages/wx/src/bbwxLayoutLine.h b/packages/wx/src/bbwxLayoutLine.h index 50ee0c0..010fe20 100644 --- a/packages/wx/src/bbwxLayoutLine.h +++ b/packages/wx/src/bbwxLayoutLine.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbwxLayoutLine.h,v $ Language: C++ - Date: $Date: 2008/11/13 14:46:46 $ - Version: $Revision: 1.6 $ + Date: $Date: 2009/05/15 14:58:03 $ + Version: $Revision: 1.10 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -45,14 +45,14 @@ */ -#ifdef _USE_WXWIDGETS_ +#ifdef USE_WXWIDGETS #ifndef __bbWxLayoutLine_h__ #define __bbWxLayoutLine_h__ #include "bbtkWxBlackBox.h" - +#include "bbwx_EXPORT.h" namespace bbwx @@ -60,8 +60,8 @@ namespace bbwx - - class /*BBTK_EXPORT*/ LayoutLine : public bbtk::WxBlackBox + //=========================================================== + class bbwx_EXPORT LayoutLine : public bbtk::WxBlackBox { BBTK_BLACK_BOX_INTERFACE(LayoutLine,bbtk::WxBlackBox); @@ -80,24 +80,23 @@ namespace bbwx BBTK_ON_SHOW_WIDGET(OnShowWidget); void Process(); - void CreateWidget(); + void CreateWidget(wxWindow*); void OnShowWidget(); protected: - virtual void bbUserConstructor(); void TryInsertWindow(wxWindow *parent, wxWindow *w,wxBoxSizer *sizer); }; + //=========================================================== -//================================================================= -// BlackBox description + //================================================================= + // BlackBox description BBTK_BEGIN_DESCRIBE_BLACK_BOX(LayoutLine,bbtk::WxBlackBox); BBTK_NAME("LayoutLine"); BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr"); BBTK_DESCRIPTION("LayoutLine widget (wxBoxSizer)"); - // Already inserted for any WxBlackBox BBTK_CATEGORY("widget"); - + // Already inserted for any WxBlackBox BBTK_CATEGORY("widget"); BBTK_INPUT(LayoutLine,Widget1,"widget 1",wxWindow*,""); BBTK_INPUT(LayoutLine,Widget2,"widget 2",wxWindow*,""); BBTK_INPUT(LayoutLine,Widget3,"widget 3",wxWindow*,""); @@ -111,8 +110,8 @@ namespace bbwx BBTK_END_DESCRIBE_BLACK_BOX(LayoutLine); //================================================================= - - + + } @@ -120,4 +119,4 @@ namespace bbwx //namespace bbtk #endif //__bbtkWxLayoutLine_h__ -#endif //_USE_WXWIDGETS_ +#endif //USE_WXWIDGETS