/[classpath]/classpath/gnu/java/awt/peer/qt/QtFramePeer.java
ViewVC logotype

Diff of /classpath/gnu/java/awt/peer/qt/QtFramePeer.java

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.1 by smarothy, Thu Aug 11 17:06:48 2005 UTC revision 1.2 by smarothy, Tue Aug 16 23:22:09 2005 UTC
# Line 61  public class QtFramePeer extends QtWindo Line 61  public class QtFramePeer extends QtWindo
61    {    {
62      super.setup();      super.setup();
63      setTitle( ((Frame)owner).getTitle() );      setTitle( ((Frame)owner).getTitle() );
64        if( ((Frame)owner).getMenuBar() != null )
65          setMenuBar( ((Frame)owner).getMenuBar() );
66    }    }
67    
68    private native void setIcon(QtImage image);    private native void setIcon(QtImage image);
# Line 86  public class QtFramePeer extends QtWindo Line 88  public class QtFramePeer extends QtWindo
88    
89    public Insets getInsets()    public Insets getInsets()
90    {    {
91      int mbHeight;      int mbHeight = ( ((Frame)owner).getMenuBar() != null ) ?
92      if( ((Frame)owner).getMenuBar() != null )        menuBarHeight() : 0;
       mbHeight = menuBarHeight();  
     else  
       mbHeight = 0;  
93    
94      // FIXME : more accurate?      return new Insets(mbHeight, 0, 0, 0);
     return new Insets(0, 0, mbHeight, 0);  
95    }    }
96    
97    public void setIconImage(Image im)    public void setIconImage(Image im)
# Line 110  public class QtFramePeer extends QtWindo Line 108  public class QtFramePeer extends QtWindo
108    
109    public void setMenuBar(MenuBar mb)    public void setMenuBar(MenuBar mb)
110    {    {
111      if( mb != null)      if( mb != null )
112        {        {
113          QtMenuBarPeer mbpeer = (QtMenuBarPeer)mb.getPeer();          QtMenuBarPeer mbpeer = (QtMenuBarPeer)mb.getPeer();
114          if( mbpeer != null)          if( mbpeer == null )
115            {            {
116              mbpeer.addMenus();              mb.addNotify();
117              setMenu( mbpeer );              mbpeer = (QtMenuBarPeer)mb.getPeer();
118                if( mbpeer == null )
119                  throw new IllegalStateException("No menu bar peer.");
120            }            }
121            mbpeer.addMenus();
122            setMenu( mbpeer );
123        }        }
124      else      else
125        setMenu( null );        setMenu( null );

Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26