cosmetics

[bbtk.git] / packages / wx / src / bbwxSizer.cxx

diff --git a/packages/wx/src/bbwxSizer.cxx b/packages/wx/src/bbwxSizer.cxx
index 4648dd6c33b2e4b615bb1df6b16622e7c0c6c87a..c213d41483b22402ec8d49d8d20fe4fb2e593204 100644 (file)
--- a/packages/wx/src/bbwxSizer.cxx
+++ b/packages/wx/src/bbwxSizer.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxSizer.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/02/04 16:42:10 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/02/14 20:55:52 $
+  Version:   $Revision: 1.5 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,75 +16,26 @@
                                                                                 
 =========================================================================*/
 /**
- *  \file 
- *  \brief 
+ *  \file
+ *  \brief
  */
 
 
 #ifdef _USE_WXWIDGETS_
 
-
 #include "bbwxSizer.h"
 #include "bbwxPackage.h"
-
-
-
+#include "bbtkUtilities.h"
 
 
 namespace bbwx
 {
-  BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx , Sizer);
-  
-/*  
-  wxWidgetSizer::wxWidgetSizer(wxWindow *parent,int orientation)
-    : wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL)
-  {
-    wxPanel                    *panel  = this;
-
-       if (orientation==0)
-       {
-               mwxSizer        = new wxBoxSizer(wxHORIZONTAL);
-       } else {
-               mwxSizer        = new wxBoxSizer(wxVERTICAL);
-       } 
-
-       panel   -> SetSizer(mwxSizer);
-   panel       -> SetAutoLayout(true);
-   panel       -> Layout();
-    
-    mbbtkSizer=NULL;
-  }
-  //-------------------------------------------------------------------------
-  void  wxWidgetSizer::AddChild(wxWindow* child)
-  {
-    mwxSizer->Add(child, 1, wxEXPAND, 0);
-  }
-  
-  wxWidgetSizer::~wxWidgetSizer()
-  {
-  }
-  
-  //-------------------------------------------------------------------------
-  
-  void wxWidgetSizer::SetSizer(Sizer* bbtksizer)
-  {
-    mbbtkSizer = bbtksizer;
-  }
-  
-
-  
-  //--------------------------------------------------------------------------
-  //-------------------------------------------------------------------------
-  //--------------------------------------------------------------------------
-  //--------------------------------------------------------------------------
-
-*/
-
+  BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx, Sizer);
   BBTK_USER_BLACK_BOX_IMPLEMENTATION(Sizer,bbtk::WxBlackBox);
-  
-       void Sizer::bbUserConstructor() 
-       { 
-               bbSetInputOrientation(1);
+
+       void Sizer::bbUserConstructor()
+       {
+               bbSetInputOrientation("VERTICAL");
                bbSetInputWidget1(NULL);
                bbSetInputWidget2(NULL);
                bbSetInputWidget3(NULL);
@@ -94,34 +45,32 @@ namespace bbwx
                bbSetInputWidget7(NULL);
                bbSetInputWidget8(NULL);
                bbSetInputWidget9(NULL);
-               bbSetInputWidget10(NULL);
        }
 
+         void Sizer::Process()
+         {
+         }
+
        void Sizer::TryInsertWindow(wxWindow *parent, wxWindow *w,wxBoxSizer *sizer)
        {
                  if (w!=NULL)
                  {
                          w->Reparent(parent);
-                         sizer->Add(w, 1, wxEXPAND, 0);                  
-                 }             
+                         sizer->Add(w, 1, wxEXPAND, 0);
+                 }
        }
 
-
-         void Sizer::Process() 
-         { 
-         }
-
-         
-         void Sizer::CreateWidget() 
-         { 
+         void Sizer::CreateWidget()
+         {
          wxBoxSizer *sizer;
          wxPanel *w=new wxPanel(bbGetWxParent(), -1);
-         if (bbGetInputOrientation()==0)
-         {
-                 sizer = new wxBoxSizer(wxHORIZONTAL);
-         } else {
-                 sizer = new wxBoxSizer(wxVERTICAL);
-         } 
+         w->SetName( bbtk::std2wx( bbGetInputWinTitle() ) );
+
+         int style=0;
+      if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"0|H|HORIZONTAL")==true)  { style=wxHORIZONTAL; }
+         if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"1|V|VERTICAL")==true)        { style=wxVERTICAL;   }
+
+         sizer = new wxBoxSizer(style);
 
          TryInsertWindow(w,bbGetInputWidget1(),sizer);
          TryInsertWindow(w,bbGetInputWidget2(),sizer);
@@ -132,64 +81,12 @@ namespace bbwx
          TryInsertWindow(w,bbGetInputWidget7(),sizer);
          TryInsertWindow(w,bbGetInputWidget8(),sizer);
          TryInsertWindow(w,bbGetInputWidget9(),sizer);
-         TryInsertWindow(w,bbGetInputWidget10(),sizer);
-         
+
          w     -> SetSizer(sizer);
-//       w     -> SetAutoLayout(true);
-//       w     -> Layout();
          bbSetOutputWidget( w );
   }
-  
-
-/*  
-  wxWindow *Sizer::CreateWxWindow(wxWindow *parent)
-  {
-    bbtkDebugMessageInc("Core",9,"Sizer::CreateWxWindow("<<parent<<")"<<std::endl);
-    
-    wxWidgetSizer *wxwidgetsizer = new wxWidgetSizer(parent,bbGetInputOrientation() );
-
-//    OutputConnectorMapType::iterator i = GetOutputConnectorMap().find("Child");  
-       OutputConnectorMapType::iterator i;
-       for (i=GetOutputConnectorMap().begin() ; i!=GetOutputConnectorMap().end(); ++i ){
-               if (i->first=="Child")
-               {
-                       const std::vector<Connection*>& C = i->second->GetConnectionVector();
-                       std::vector<Connection*>::const_iterator j;
-                       for (j=C.begin(); j!=C.end(); ++j) 
-                       {
-//                             WxBlackBox* to = ((WxBlackBox*)((*j)->GetBlackBoxTo()));
-//                             wxWindow* cw = ((WxBlackBox*)((*j)->GetBlackBoxTo()))->GetWxWindow(wxwidgetsizer);
-                               wxPanel *cw = new wxPanel(wxwidgetsizer,-1);
-                               cw->SetName( wxString( (*j)->GetBlackBoxTo()->bbGetName().c_str(), wxConvUTF8 ) );
-                               wxwidgetsizer->AddChild(cw);
-                       } // for j
-                       break;
-               } // if Child
-       } // for i
-    //
-    wxwidgetsizer->SetSizer(this);
-    
-    bbtkDebugDecTab("Core",9);
-    
-       Setmwxcontainer(wxwidgetsizer);
-
-    return wxwidgetsizer;
-  }
-
-  void Sizer::AddWxBBChild(WxBlackBox *wxblackbox)  // virtual
-  {
-       wxWindow *subparent = GetSubParent( wxString(wxblackbox->bbGetName().c_str(),wxConvUTF8 ) );
-       wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
-       sizer -> Add( wxblackbox->GetWxWindow( subparent ) , 1, wxALL|wxEXPAND, 2);
-       subparent -> SetAutoLayout(true);
-       subparent -> SetSizer(sizer);
-       subparent -> Layout();
-  }
-*/
-
-
 
 }//namespace bbwx
 
-#endif
+#endif // _USE_WXWIDGETS_