2008-07-25 [colin] 3.5.0cvs33

[claws.git] / src / gtk / menu.h

diff --git a/src/gtk/menu.h b/src/gtk/menu.h
index 92943526e804d25e37493ba00ad4b5f54a0a587a..512895e9f042c171b2185c64b51098181f2e463f 100644 (file)
--- a/src/gtk/menu.h
+++ b/src/gtk/menu.h
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifndef __MENU_H__
@@ -46,6 +46,23 @@
                                  GINT_TO_POINTER(data));        \
 }
 
+#define MENUITEM_ADDUI(path, name, action, type)                \
+       gtk_ui_manager_add_ui(gtkut_ui_manager(),                \
+                       gtk_ui_manager_new_merge_id(gui_manager),\
+                       path, name, action, type, FALSE);
+
+#define MENUITEM_ADDUI_ID(path, name, action, type,id)          \
+       id = gtk_ui_manager_new_merge_id(gtkut_ui_manager());    \
+       gtk_ui_manager_add_ui(gtkut_ui_manager(),                \
+                       id,                                      \
+                       path, name, action, type, FALSE);
+
+#define MENUITEM_REMUI(action_group,name,id) {                 \
+       GtkAction *action = gtk_action_group_get_action(action_group, name); \
+       if (action) gtk_action_group_remove_action(action_group, action);       \
+       if (id) gtk_ui_manager_remove_ui(gtkut_ui_manager(), id);       \
+}
+
 #define menu_set_insensitive_all(menu_shell) \
        menu_set_sensitive_all(menu_shell, FALSE);
 
@@ -59,18 +76,13 @@ GtkWidget *menu_create_items        (GtkItemFactoryEntry    *entries,
                                 const gchar            *path,
                                 GtkItemFactory        **factory,
                                 gpointer                data);
-GtkWidget *popupmenu_create    (GtkWidget *window,
-                                GtkItemFactoryEntry *entries,
-                                guint n_entries,
-                                const gchar *path,
-                                gpointer data);
 gchar *menu_translate          (const gchar *path, gpointer data);
 
 void menu_set_sensitive                (GtkItemFactory         *ifactory,
                                 const gchar            *path,
                                 gboolean                sensitive);
-void menu_set_sensitive_all    (GtkMenuShell           *menu_shell,
-                                gboolean                sensitive);
+
+void cm_menu_set_sensitive(gchar *menu, gboolean sensitive);
 
 void menu_set_active           (GtkItemFactory         *ifactory,
                                 const gchar            *path,
@@ -84,12 +96,7 @@ void menu_button_position    (GtkMenu                *menu,
 gint menu_find_option_menu_index(GtkOptionMenu         *optmenu,
                                 gpointer                data,
                                 GCompareFunc            func);
-
-gpointer menu_get_option_menu_active_user_data
-                               (GtkOptionMenu          *optmenu);
+void menu_set_sensitive_all(GtkMenuShell *menu_shell, gboolean sensitive);
 void menu_connect_identical_items(void);
 
-void menu_select_by_data       (GtkMenu                *menu,
-                                gpointer                data);
-
 #endif /* __MENU_H__ */