Merge remote-tracking branch 'origin/5.5' 56/16456/1
Vincent COUVERT [Thu, 7 May 2015 08:06:03 +0000 (10:06 +0200)]
Change-Id: I1ff3668b0dc4b4bbb7a4cdb8e6995c3f9269914d

1  2 
scilab/configure
scilab/configure.ac
scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/frame/SwingScilabScrollableFrame.java

Simple merge
Simple merge
@@@ -724,8 -725,8 +724,14 @@@ public final class SwingView implement
                      bar.close();
                      break;
                  case Frame:
-                     SwingScilabFrame frame = (SwingScilabFrame) requestedObject.getValue();
-                     frame.destroy();
 -                    SimpleFrame frame = (SimpleFrame) requestedObject.getValue();
 -                    frame.destroy();
++                    Boolean scrollable = (Boolean) GraphicController.getController().getProperty(id, __GO_UI_SCROLLABLE__);
++                    if (scrollable) {
++                        SwingScilabScrollableFrame frame = (SwingScilabScrollableFrame) requestedObject.getValue();
++                        frame.destroy();
++                    } else {
++                        SwingScilabFrame frame = (SwingScilabFrame) requestedObject.getValue();
++                        frame.destroy();
++                    }
                      break;
                  default:
                      // Nothing to do