From: Dennis M. <mil...@us...> - 2005-03-28 04:04:44
|
Update of /cvsroot/jmri/jmri/jmrit/throttle In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21161/src/jmri/jmrit/throttle Modified Files: ThrottleFrame.java Log Message: Temporarily remove AddressPanel automatic default width sizing to avoid display problem in MacOSX. Also change ThrottlePanel to extend JmriJFrame instead of JFrame. Index: ThrottleFrame.java =================================================================== RCS file: /cvsroot/jmri/jmri/jmrit/throttle/ThrottleFrame.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** ThrottleFrame.java 20 Mar 2005 05:52:22 -0000 1.23 --- ThrottleFrame.java 28 Mar 2005 04:04:35 -0000 1.24 *************** *** 25,28 **** --- 25,29 ---- import javax.swing.event.InternalFrameAdapter; import javax.swing.event.InternalFrameEvent; + import jmri.util.JmriJFrame; import org.jdom.Element; *************** *** 38,42 **** * @version $Revision$ */ ! public class ThrottleFrame extends JFrame implements AddressListener, ThrottleListener { private final Integer PANEL_LAYER = new Integer(1); --- 39,43 ---- * @version $Revision$ */ ! public class ThrottleFrame extends JmriJFrame implements AddressListener, ThrottleListener { private final Integer PANEL_LAYER = new Integer(1); *************** *** 171,175 **** addressPanel.setTitle("Address Panel"); addressPanel.pack(); ! if (addressPanel.getWidth()<functionPanel.getWidth()) {addressPanel.setSize(functionPanel.getWidth(),addressPanel.getHeight());} addressPanel.setLocation(controlPanel.getWidth(), functionPanel.getHeight()); addressPanel.setVisible(true); --- 172,176 ---- addressPanel.setTitle("Address Panel"); addressPanel.pack(); ! // if (addressPanel.getWidth()<functionPanel.getWidth()) {addressPanel.setSize(functionPanel.getWidth(),addressPanel.getHeight());} addressPanel.setLocation(controlPanel.getWidth(), functionPanel.getHeight()); addressPanel.setVisible(true); |