added layout_manager as optional value.

default value is nil.
bakkdoor · Oct 8, 2008 · 92d2b71 · 92d2b71
1 parent 4375a59
commit 92d2b71
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/lib/rswing/components/container.rb b/lib/rswing/components/container.rb
@@ -8,11 +8,11 @@ def add(component, options = {})
           self.add_to_content_pane(component, options)
         else
 #          this should be handled somehow later on:
-#          if(layout = Options.value_for(options => :layout))
-#            super(component, layout)
-#          else
+          if(layout = Options.value_for(options => :layout))
+            super(component, layout)
+          else
              super(component)
-#          end
+          end
         end
 
         # if :name given, add with name

diff --git a/lib/rswing/components/options.rb b/lib/rswing/components/options.rb
@@ -17,6 +17,7 @@ def self.gui_options
           :icon => nil,
           :belongs_to => nil,
           :layout => nil,
+          :layout_manager => nil,
           :title => nil,
           :name => nil,
           :font => nil,

diff --git a/lib/rswing/components/panel.rb b/lib/rswing/components/panel.rb
@@ -8,8 +8,8 @@ class Panel < JPanel
       include Events::MouseEvents
       include Events::FocusEvents
 
-      def initialize(layout_manager, options = {}, &block)
-        super(layout_manager, Options.value_for(options => :double_buffer))
+      def initialize(options = {}, &block)
+        super(Options.value_for(options => :layout_manager), Options.value_for(options => :double_buffer))
 
         if (border_title = Options.value_for(options => :title))
           border = BorderFactory.createTitledBorder(border_title)