X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkmenuitem.h;h=9d546d6c3dd59125a4405c5abd71c9fd9b19da09;hb=feb64f40b0f50735104da0a7fdafbe480763c180;hp=353a13b1fc5c9557afe59c315be47c9e39cd09a7;hpb=ae7521bd9daa8b389a878dc7e9b2b0a5753b6b7f;p=~andy%2Fgtk
diff --git a/gtk/gtkmenuitem.h b/gtk/gtkmenuitem.h
index 353a13b1f..9d546d6c3 100644
--- a/gtk/gtkmenuitem.h
+++ b/gtk/gtkmenuitem.h
@@ -8,121 +8,121 @@
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* 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 .
*/
/*
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef __GTK_MENU_ITEM_H__
#define __GTK_MENU_ITEM_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only can be included directly."
+#endif
-#include
-#include
+#include
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
+#define GTK_TYPE_MENU_ITEM (gtk_menu_item_get_type ())
+#define GTK_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU_ITEM, GtkMenuItem))
+#define GTK_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU_ITEM, GtkMenuItemClass))
+#define GTK_IS_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MENU_ITEM))
+#define GTK_IS_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MENU_ITEM))
+#define GTK_MENU_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MENU_ITEM, GtkMenuItemClass))
-#define GTK_TYPE_MENU_ITEM (gtk_menu_item_get_type ())
-#define GTK_MENU_ITEM(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_MENU_ITEM, GtkMenuItem))
-#define GTK_MENU_ITEM_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU_ITEM, GtkMenuItemClass))
-#define GTK_IS_MENU_ITEM(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_MENU_ITEM))
-#define GTK_IS_MENU_ITEM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MENU_ITEM))
-#define GTK_MENU_ITEM_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_MENU_ITEM, GtkMenuItemClass))
-
-typedef struct _GtkMenuItem GtkMenuItem;
-typedef struct _GtkMenuItemClass GtkMenuItemClass;
+typedef struct _GtkMenuItem GtkMenuItem;
+typedef struct _GtkMenuItemClass GtkMenuItemClass;
+typedef struct _GtkMenuItemPrivate GtkMenuItemPrivate;
struct _GtkMenuItem
{
- GtkItem item;
-
- GtkWidget *submenu;
- GdkWindow *event_window;
-
- guint16 toggle_size;
- guint16 accelerator_width;
- gchar *accel_path;
-
- guint show_submenu_indicator : 1;
- guint submenu_placement : 1;
- guint submenu_direction : 1;
- guint right_justify: 1;
- guint timer_from_keypress : 1;
- guint timer;
+ GtkBin bin;
+
+ /*< private >*/
+ GtkMenuItemPrivate *priv;
};
struct _GtkMenuItemClass
{
- GtkItemClass parent_class;
-
- /* If the following flag is true, then we should always hide
- * the menu when the MenuItem is activated. Otherwise, the
+ GtkBinClass parent_class;
+
+ /* If the following flag is true, then we should always
+ * hide the menu when the MenuItem is activated. Otherwise,
* it is up to the caller. For instance, when navigating
* a menu with the keyboard, doesn't hide, but
* does.
*/
guint hide_on_activate : 1;
-
+
void (* activate) (GtkMenuItem *menu_item);
void (* activate_item) (GtkMenuItem *menu_item);
void (* toggle_size_request) (GtkMenuItem *menu_item,
- gint *requisition);
+ gint *requisition);
void (* toggle_size_allocate) (GtkMenuItem *menu_item,
- gint allocation);
+ gint allocation);
+ void (* set_label) (GtkMenuItem *menu_item,
+ const gchar *label);
+ const gchar * (* get_label) (GtkMenuItem *menu_item);
+
+ void (* select) (GtkMenuItem *menu_item);
+ void (* deselect) (GtkMenuItem *menu_item);
+
+ /* Padding for future expansion */
+ void (*_gtk_reserved1) (void);
+ void (*_gtk_reserved2) (void);
+ void (*_gtk_reserved3) (void);
+ void (*_gtk_reserved4) (void);
};
-GtkType gtk_menu_item_get_type (void) G_GNUC_CONST;
+GType gtk_menu_item_get_type (void) G_GNUC_CONST;
+
GtkWidget* gtk_menu_item_new (void);
GtkWidget* gtk_menu_item_new_with_label (const gchar *label);
GtkWidget* gtk_menu_item_new_with_mnemonic (const gchar *label);
void gtk_menu_item_set_submenu (GtkMenuItem *menu_item,
- GtkWidget *submenu);
+ GtkWidget *submenu);
GtkWidget* gtk_menu_item_get_submenu (GtkMenuItem *menu_item);
-void gtk_menu_item_remove_submenu (GtkMenuItem *menu_item);
void gtk_menu_item_select (GtkMenuItem *menu_item);
void gtk_menu_item_deselect (GtkMenuItem *menu_item);
void gtk_menu_item_activate (GtkMenuItem *menu_item);
void gtk_menu_item_toggle_size_request (GtkMenuItem *menu_item,
- gint *requisition);
+ gint *requisition);
void gtk_menu_item_toggle_size_allocate (GtkMenuItem *menu_item,
- gint allocation);
+ gint allocation);
+GDK_DEPRECATED_IN_3_2
void gtk_menu_item_set_right_justified (GtkMenuItem *menu_item,
- gboolean right_justified);
+ gboolean right_justified);
+GDK_DEPRECATED_IN_3_2
gboolean gtk_menu_item_get_right_justified (GtkMenuItem *menu_item);
-void gtk_menu_item_set_accel_path (GtkMenuItem *menu_item,
- const gchar *accel_path);
+void gtk_menu_item_set_accel_path (GtkMenuItem *menu_item,
+ const gchar *accel_path);
+const gchar * gtk_menu_item_get_accel_path (GtkMenuItem *menu_item);
-/* private */
-void _gtk_menu_item_refresh_accel_path (GtkMenuItem *menu_item,
- const gchar *prefix,
- GtkAccelGroup *accel_group,
- gboolean group_changed);
-gboolean _gtk_menu_item_is_selectable (GtkWidget *menu_item);
+void gtk_menu_item_set_label (GtkMenuItem *menu_item,
+ const gchar *label);
+const gchar * gtk_menu_item_get_label (GtkMenuItem *menu_item);
-#ifndef GTK_DISABLE_DEPRECATED
-#define gtk_menu_item_right_justify(menu_item) gtk_menu_item_set_right_justified ((menu_item), TRUE)
-#endif /* GTK_DISABLE_DEPRECATED */
+void gtk_menu_item_set_use_underline (GtkMenuItem *menu_item,
+ gboolean setting);
+gboolean gtk_menu_item_get_use_underline (GtkMenuItem *menu_item);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+void gtk_menu_item_set_reserve_indicator (GtkMenuItem *menu_item,
+ gboolean reserve);
+gboolean gtk_menu_item_get_reserve_indicator (GtkMenuItem *menu_item);
+G_END_DECLS
#endif /* __GTK_MENU_ITEM_H__ */