Minor fixes/improvements

diff --git a/packages/wx/bbs/appli/exampleSimpleLayoutTDown.bbs b/packages/wx/bbs/appli/exampleSimpleLayoutTDown.bbs
index 344e48f53bf6969a30e0453bc314111697c9398f..5b5eacc512ada5ed5dc63bccc0df4dff15e091c9 100644 (file)
--- a/packages/wx/bbs/appli/exampleSimpleLayoutTDown.bbs
+++ b/packages/wx/bbs/appli/exampleSimpleLayoutTDown.bbs
@@ -1,7 +1,6 @@
-/*
 description "Simple test of wx::LayoutTDown widgets"
 author "jean-pierre.roux@creatis.univ-lyon1.fr"
-category "example"
+category "example, wx"
 
 load std
 include wx
@@ -22,4 +21,3 @@ connect s2.Widget main.Widget2
 connect s3.Widget main.Widget3
 
 exec main
-*/

diff --git a/packages/wx/bbs/appli/exampleSimpleLayoutTLeft.bbs b/packages/wx/bbs/appli/exampleSimpleLayoutTLeft.bbs
index 9f216f079c2473ccd89b9e066a32e0d6367a6e10..1dec6cbbd48cfbe1dba9a771856d373cffeabcbe 100644 (file)
--- a/packages/wx/bbs/appli/exampleSimpleLayoutTLeft.bbs
+++ b/packages/wx/bbs/appli/exampleSimpleLayoutTLeft.bbs
@@ -1,6 +1,6 @@
 description "Simple test of wx::LayoutTLeft widgets"
 author "jean-pierre.roux@creatis.univ-lyon1.fr"
-category "example"
+category "example, wx"
 
 load std
 include wx

diff --git a/packages/wx/bbs/appli/exampleSimpleLayoutTRight.bbs b/packages/wx/bbs/appli/exampleSimpleLayoutTRight.bbs
index 145189f4f03a6fb68f091ee0387e0c14d2205e1b..e3b19e81cfa17b9bf86974fec9216251654f7d0d 100644 (file)
--- a/packages/wx/bbs/appli/exampleSimpleLayoutTRight.bbs
+++ b/packages/wx/bbs/appli/exampleSimpleLayoutTRight.bbs
@@ -1,6 +1,6 @@
 description "Simple test of wx::LayoutTRight widgets"
 author "jean-pierre.roux [at] creatis [dot] univ [dash] lyon1 [dot] fr"
-category "example"
+category "example, wx"
 
 load std
 include wx

diff --git a/packages/wx/bbs/appli/exampleSimpleLayoutTUp.bbs b/packages/wx/bbs/appli/exampleSimpleLayoutTUp.bbs
index 26e5e83db6d0407dad69d0d739d5fdd4b0dade8f..5bc69c75dc39b9df8f7c400bafc8adf709fecc7a 100644 (file)
--- a/packages/wx/bbs/appli/exampleSimpleLayoutTUp.bbs
+++ b/packages/wx/bbs/appli/exampleSimpleLayoutTUp.bbs
@@ -1,6 +1,6 @@
 description "Simple test of wx::LayoutTUp widgets"
 author "jean-pierre.roux@creatis.univ-lyon1.fr"
-category "example"
+category "example, wx"
 
 load std
 include wx

diff --git a/packages/wx/bbs/appli/exampleSimpleLayoutX4.bbs b/packages/wx/bbs/appli/exampleSimpleLayoutX4.bbs
new file mode 100644 (file)
index 0000000..b1b516a
--- /dev/null
+++ b/packages/wx/bbs/appli/exampleSimpleLayoutX4.bbs
@@ -0,0 +1,27 @@
+description "Simple test of wx::LayoutX4 widgets"
+author "jean-pierre.roux@creatis.univ-lyon1.fr"
+category "example"
+
+load std
+include wx
+
+new LayoutX4 main
+
+new Slider s1
+   set s1.Title "SliderUpLeft"
+
+new Slider s2
+   set s2.Title "SliderUpRight"
+
+new Slider s3
+   set s3.Title "SliderDownLeft"
+
+new Slider s4
+   set s4.Title "SliderDownRight"
+
+connect s1.Widget main.Widget1 
+connect s2.Widget main.Widget2 
+connect s3.Widget main.Widget3
+connect s3.Widget main.Widget4
+
+exec main

diff --git a/packages/wx/bbs/boxes/bbLayoutX4.bbs b/packages/wx/bbs/boxes/bbLayoutX4.bbs
new file mode 100644 (file)
index 0000000..750274d
--- /dev/null
+++ b/packages/wx/bbs/boxes/bbLayoutX4.bbs
@@ -0,0 +1,58 @@
+
+load std
+load wx
+//                       ---------------
+//                       |      |      |
+//                       |  W1  |  W2  |
+//                       |-------------|
+//                       |      |      |
+//                       |  W3  |  W4  |
+//                       ---------------
+
+define LayoutX4 wx
+
+description "Creates a '+ like' complex container : {UpLeft, UpRight} {DownLeft, DownRigth} "
+author "jean-pierre.roux@creatis.univ-lyon1.fr"
+category "complex box, widget"
+
+new LayoutSplit currentBox
+ set currentBox.Orientation V
+ 
+new LayoutSplit up
+  set up.Orientation H
+  
+new LayoutSplit down
+  set Down.Orientation H
+  
+ connect upLeft.Widget  currentBox.Widget1 
+ connect upRight.Widget currentBox.Widget2
+
+ connect upLeft.Widget  up.Widget1 
+ connect upRight.Widget up.Widget2
+ 
+ connect downLeft.Widget  down.Widget1 
+ connect downRight.Widget down.Widget2 
+ 
+new MultipleInputs m
+ connect currentBox.BoxChange m.In1
+ connect upLeft.BoxChange     m.In2
+ connect upRight.BoxChange    m.In3 
+ connect downLeft.BoxChange   m.In5
+ connect downRight.BoxChange  m.In5 
+  
+ input  WinTitle  currentBox.WinTitle  "Title of the window (*)"
+ input  WinHeight currentBox.WinHeight "Height of the window (*)"
+ input  WinHide   currentBox.WinHide   "Any signal received hides the window (*)"
+ input  WinClose  currentBox.WinClose  "Any signal received closes the window (*)"
+ input  WinWidth  currentBox.WinWidth  "Width of the window (* : only used if the widget is not connected to a Layout box)"
+
+ input  Widget1   up.Widget1           "UpLeft container" 
+ input  Widget2   up.Widget2           "UpRight container"  
+ input  Widget3   currentBox.Widget2   "DownLeft container"
+ input  Widget4   currentBox.Widget4   "DownRight container" 
+ output Widget    currentBox.Widget    "Widget"
+ 
+ output BoxChange m.Out                "BoxChange"
+ 
+endefine
+