X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxNotebook.cxx;h=d4aa4ff80c6633fe99d54722ca67c23dc169e7aa;hb=82709d667857071eb7211e7fe7d22237d3a9ddf3;hp=384224ae2df94ce4dcbe666395b04ed86230e60a;hpb=c336eef9abedc5bcea1aa1ad8cb43d53ab2e3039;p=bbtk.git

diff --git a/packages/wx/src/bbwxNotebook.cxx b/packages/wx/src/bbwxNotebook.cxx
index 384224a..d4aa4ff 100644
--- a/packages/wx/src/bbwxNotebook.cxx
+++ b/packages/wx/src/bbwxNotebook.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxNotebook.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/02/05 18:05:32 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/02/08 14:58:31 $
+  Version:   $Revision: 1.2 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -26,7 +26,7 @@
 
 #include "bbwxNotebook.h"
 #include "bbwxPackage.h"
-
+#include "bbtkUtilities.h"
 
 
 
@@ -40,8 +40,7 @@ namespace bbwx
   
 	void Notebook::bbUserConstructor() 
 	{ 
-		bbSetInputWinTitle("Notebook");
-		bbSetInputOrientation(0);
+		bbSetInputOrientation("TOP");
 		bbSetInputWidget1(NULL);
 		bbSetInputWidget2(NULL);
 		bbSetInputWidget3(NULL);
@@ -51,7 +50,6 @@ namespace bbwx
 		bbSetInputWidget7(NULL);
 		bbSetInputWidget8(NULL);
 		bbSetInputWidget9(NULL);
-		bbSetInputWidget10(NULL);
 	}
 
 	void Notebook::TryInsertWindow(wxNotebook *book, wxWindow *widgetchild )
@@ -72,14 +70,13 @@ namespace bbwx
 	void Notebook::CreateWidget() 
 	{ 
 	  long style = wxNB_TOP;
-	  if (bbGetInputOrientation()==0) { style=wxNB_TOP; }
-	  if (bbGetInputOrientation()==1) { style=wxNB_LEFT; }
-	  if (bbGetInputOrientation()==2) { style=wxNB_RIGHT; }
-	  if (bbGetInputOrientation()==3) { style=wxNB_BOTTOM; }
+	  if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"0|T|TOP")==true) 	{ style=wxNB_TOP; }
+	  if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"1|R|RIGHT")==true) 	{ style=wxNB_RIGHT; }
+	  if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"2|B|BOTTOM")==true)  { style=wxNB_BOTTOM; }
+	  if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"3|L|LEFT")==true) 	{ style=wxNB_LEFT; }
 	  wxNotebook *w = new wxNotebook(bbGetWxParent(), -1, wxDefaultPosition,wxDefaultSize,style );
 	  w->SetName( bbtk::std2wx( bbGetInputWinTitle() ) );
-	  
-	  
+	  	  
 	  TryInsertWindow(w,bbGetInputWidget1());
 	  TryInsertWindow(w,bbGetInputWidget2());
 	  TryInsertWindow(w,bbGetInputWidget3());
@@ -89,7 +86,6 @@ namespace bbwx
 	  TryInsertWindow(w,bbGetInputWidget7());
 	  TryInsertWindow(w,bbGetInputWidget8());
 	  TryInsertWindow(w,bbGetInputWidget9());
-	  TryInsertWindow(w,bbGetInputWidget10());
 	  
 	  bbSetOutputWidget( w );
 	}