filechooserbutton: Update the button/combo whenever the selection is changed programm...

[~andy/gtk] / gtk / gtkmenu.h

diff --git a/gtk/gtkmenu.h b/gtk/gtkmenu.h
index fb5e1970a262d6a7e8fbccb5cd4688dc00096ea3..d6843eba21595de962d28528a1bc236f5c0f3e81 100644 (file)
--- a/gtk/gtkmenu.h
+++ b/gtk/gtkmenu.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -24,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_MENU_H__
 #define __GTK_MENU_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkaccelgroup.h>
 #include <gtk/gtkmenushell.h>
 
@@ -57,7 +55,7 @@ typedef struct _GtkMenuPrivate GtkMenuPrivate;
  *     position where the menu shall be drawn.
  * @y: (out): address of the #gint representing the vertical position
  *     where the menu shall be drawn.  This is an output parameter.
- * @push_in: (inout): This parameter controls how menus placed outside
+ * @push_in: (out): This parameter controls how menus placed outside
  *     the monitor are handled.  If this is set to %TRUE and part of
  *     the menu is outside the monitor then GTK+ pushes the window
  *     into the visible area, effectively modifying the popup
@@ -117,6 +115,8 @@ struct _GtkMenuClass
 
 GType     gtk_menu_get_type              (void) G_GNUC_CONST;
 GtkWidget* gtk_menu_new                          (void);
+GDK_AVAILABLE_IN_3_4
+GtkWidget* gtk_menu_new_from_model        (GMenuModel *model);
 
 /* Display the menu onscreen */
 void      gtk_menu_popup                 (GtkMenu             *menu,