/[classpath]/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c
ViewVC logotype

Diff of /classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c

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

revision 1.8 by fitzsim, Thu Jul 14 22:07:02 2005 UTC revision 1.9 by fitzsim, Wed Aug 17 04:24:38 2005 UTC
# Line 85  Java_gnu_java_awt_peer_gtk_GtkFramePeer_ Line 85  Java_gnu_java_awt_peer_gtk_GtkFramePeer_
85    gdk_threads_enter ();    gdk_threads_enter ();
86    
87    ptr = NSA_GET_PTR (env, obj);    ptr = NSA_GET_PTR (env, obj);
   mptr = NSA_GET_PTR (env, menubar);  
88    
89    fixed = gtk_container_get_children (GTK_CONTAINER (ptr))->data;    if (menubar)
90    gtk_fixed_put (GTK_FIXED (fixed), mptr, 0, 0);      {
91    gtk_widget_show (mptr);        mptr = NSA_GET_PTR (env, menubar);
92    
93          fixed = gtk_container_get_children (GTK_CONTAINER (ptr))->data;
94          gtk_fixed_put (GTK_FIXED (fixed), mptr, 0, 0);
95          gtk_widget_show (mptr);
96        }
97    
98    gdk_threads_leave ();    gdk_threads_leave ();
99  }  }
# Line 121  Java_gnu_java_awt_peer_gtk_GtkFramePeer_ Line 125  Java_gnu_java_awt_peer_gtk_GtkFramePeer_
125    
126    gdk_threads_enter ();    gdk_threads_enter ();
127    
128    ptr = NSA_GET_PTR (env, menubar);    if (menubar)
129        {
130    /* Get the menubar's natural size request. */        ptr = NSA_GET_PTR (env, menubar);
131    gtk_widget_set_size_request (GTK_WIDGET (ptr), -1, -1);  
132    gtk_widget_size_request (GTK_WIDGET (ptr), &natural_req);        /* Get the menubar's natural size request. */
133          gtk_widget_set_size_request (GTK_WIDGET (ptr), -1, -1);
134    /* Set the menubar's size request to width by natural_req.height. */        gtk_widget_size_request (GTK_WIDGET (ptr), &natural_req);
135    gtk_widget_set_size_request (GTK_WIDGET (ptr),  
136                                 width, natural_req.height);        /* Set the menubar's size request to width by natural_req.height. */
137          gtk_widget_set_size_request (GTK_WIDGET (ptr),
138                                       width, natural_req.height);
139        }
140    
141    gdk_threads_leave ();    gdk_threads_leave ();
142  }  }

Legend:
Removed from v.1.8  
changed lines
  Added in v.1.9

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