[dia] [option-menu] Move DiaDynamicMenu in it's own file to tackle deprecations

[Hans Breuer <hans src gnome org>]

commit ce357c63f5a9d8ebbf770d283f1274b7d1ce2c00
Author: Hans Breuer <hans breuer org>
Date:   Fri Oct 29 12:23:29 2010 +0200

    [option-menu] Move DiaDynamicMenu in it's own file to tackle deprecations
    
    DiaDynamicMenu currently depends on long-time deprecated GtkOptionMenu.
    To ease porting of lib/widget.[ch] and itself move it in own files.

 app/interface.c      |    1 +
 lib/Makefile.am      |    2 +
 lib/diadynamicmenu.c |  452 ++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/diadynamicmenu.h |   56 ++++++
 lib/makefile.msc     |    1 +
 lib/widgets.c        |  416 +---------------------------------------------
 lib/widgets.h        |   47 -----
 7 files changed, 516 insertions(+), 459 deletions(-)
---
diff --git a/app/interface.c b/app/interface.c
index dd9cb0c..dcb01b2 100644
--- a/app/interface.c
+++ b/app/interface.c
@@ -44,6 +44,7 @@
 #include "persistence.h"
 #include "diaarrowchooser.h"
 #include "dialinechooser.h"
+#include "diadynamicmenu.h"
 #include "widgets.h"
 #include "message.h"
 #include "attributes.h"
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 94a9c75..cbb89af 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -163,6 +163,8 @@ libdia_la_SOURCES =  \
 		diaarrowchooser.c \
 		dialinechooser.h \
 		dialinechooser.c \
+		diadynamicmenu.h \
+		diadynamicmenu.c \
 		persistence.c \
 		persistence.h \
 		diaerror.c \
diff --git a/lib/diadynamicmenu.c b/lib/diadynamicmenu.c
new file mode 100644
index 0000000..8223efb
--- /dev/null
+++ b/lib/diadynamicmenu.c
@@ -0,0 +1,452 @@
+/* Dia -- an diagram creation/manipulation program
+ * Copyright (C) 1998 Alexander Larsson
+ *
+ * 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
+ * (at your option) any later version.
+ *
+ * This program 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 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <config.h>
+#include <string.h>
+#include "intl.h"
+#undef GTK_DISABLE_DEPRECATED /* GtkOptionMenu, ... */
+#include <gtk/gtk.h>
+#include "diadynamicmenu.h"
+#include "persistence.h"
+
+/* hidden internals for two reasosn: 
+ * - noone is supposed to mess with the internals 
+ * - it uses deprecated stuff
+ */
+struct _DiaDynamicMenu {
+  GtkOptionMenu parent;
+
+  GList *default_entries;
+
+  DDMCreateItemFunc create_func;
+  DDMCallbackFunc activate_func;
+  gpointer userdata;
+
+  GtkMenuItem *other_item;
+
+  gchar *persistent_name;
+  gint cols;
+
+  gchar *active;
+  /** For the list-based versions, these are the options */
+  GList *options;
+
+};
+
+struct _DiaDynamicMenuClass {
+  GtkOptionMenuClass parent_class;
+};
+
+
+/* ************************ Dynamic menus ************************ */
+
+static void dia_dynamic_menu_class_init(DiaDynamicMenuClass *class);
+static void dia_dynamic_menu_init(DiaDynamicMenu *self);
+static void dia_dynamic_menu_create_sublist(DiaDynamicMenu *ddm,
+					    GList *items, 
+					    DDMCreateItemFunc create);
+static void dia_dynamic_menu_create_menu(DiaDynamicMenu *ddm);
+static void dia_dynamic_menu_destroy(GtkObject *object);
+
+enum {
+    DDM_VALUE_CHANGED,
+    DDM_LAST_SIGNAL
+};
+
+static guint ddm_signals[DDM_LAST_SIGNAL] = { 0 };
+
+GtkType
+dia_dynamic_menu_get_type(void)
+{
+  static GtkType us_type = 0;
+
+  if (!us_type) {
+    static const GtkTypeInfo us_info = {
+      "DiaDynamicMenu",
+      sizeof(DiaDynamicMenu),
+      sizeof(DiaDynamicMenuClass),
+      (GtkClassInitFunc) dia_dynamic_menu_class_init,
+      (GtkObjectInitFunc) dia_dynamic_menu_init,
+      NULL,
+      NULL,
+      (GtkClassInitFunc) NULL,
+    };
+    us_type = gtk_type_unique(gtk_option_menu_get_type(), &us_info);
+  }
+  return us_type;
+}
+
+static void
+dia_dynamic_menu_class_init(DiaDynamicMenuClass *class)
+{
+  GtkObjectClass *object_class = (GtkObjectClass*)class;
+
+  object_class->destroy = dia_dynamic_menu_destroy;
+  
+  ddm_signals[DDM_VALUE_CHANGED]
+      = g_signal_new("value-changed",
+		     G_TYPE_FROM_CLASS(class),
+		     G_SIGNAL_RUN_FIRST,
+		     0, NULL, NULL,
+		     g_cclosure_marshal_VOID__VOID,
+		     G_TYPE_NONE, 0);
+}
+
+static void
+dia_dynamic_menu_init(DiaDynamicMenu *self)
+{
+}
+
+void 
+dia_dynamic_menu_destroy(GtkObject *object)
+{
+  DiaDynamicMenu *ddm = DIA_DYNAMIC_MENU(object);
+  GtkObjectClass *parent_class = GTK_OBJECT_CLASS(g_type_class_peek_parent(GTK_OBJECT_GET_CLASS(object)));
+
+  if (ddm->active)
+    g_free(ddm->active);
+  ddm->active = NULL;
+
+  if (parent_class->destroy)
+    (* parent_class->destroy) (object);
+}
+
+/** Create a new dynamic menu.  The entries are represented with
+ * gpointers.
+ * @param create A function that creates menuitems from gpointers.
+ * @param otheritem A menuitem that can be selected by the user to
+ * add more entries, for instance making a dialog box or a submenu.
+ * @param persist A string naming this menu for persistence purposes, or NULL.
+
+ * @return A new menu
+ */
+GtkWidget *
+dia_dynamic_menu_new(DDMCreateItemFunc create, 
+		     gpointer userdata,
+		     GtkMenuItem *otheritem, gchar *persist)
+{
+  DiaDynamicMenu *ddm;
+
+  g_assert(persist != NULL);
+
+  ddm = DIA_DYNAMIC_MENU ( gtk_type_new (dia_dynamic_menu_get_type ()));
+  
+  ddm->create_func = create;
+  ddm->userdata = userdata;
+  ddm->other_item = otheritem;
+  ddm->persistent_name = persist;
+  ddm->cols = 1;
+
+  persistence_register_list(persist);
+
+  dia_dynamic_menu_create_menu(ddm);
+
+  return GTK_WIDGET(ddm);
+}
+
+/** Select the given entry, adding it if necessary */
+void
+dia_dynamic_menu_select_entry(DiaDynamicMenu *ddm, const gchar *name)
+{
+  gint add_result = dia_dynamic_menu_add_entry(ddm, name);
+  if (add_result == 0) {
+      GList *tmp;
+      int i = 0;
+      for (tmp = ddm->default_entries; tmp != NULL;
+	   tmp = g_list_next(tmp), i++) {
+	if (!g_ascii_strcasecmp(tmp->data, name))
+	  gtk_option_menu_set_history(GTK_OPTION_MENU(ddm), i);
+      }
+      /* Not there after all? */
+  } else {
+    if (ddm->default_entries != NULL)
+      gtk_option_menu_set_history(GTK_OPTION_MENU(ddm),
+				  g_list_length(ddm->default_entries)+1);
+    else
+      gtk_option_menu_set_history(GTK_OPTION_MENU(ddm), 0);
+  }
+  
+  g_free(ddm->active);
+  ddm->active = g_strdup(name);
+  g_signal_emit(GTK_OBJECT(ddm), ddm_signals[DDM_VALUE_CHANGED], 0);
+}
+
+static void
+dia_dynamic_menu_activate(GtkWidget *item, gpointer userdata)
+{
+  DiaDynamicMenu *ddm = DIA_DYNAMIC_MENU(userdata);
+  gchar *name = g_object_get_data(G_OBJECT(item), "ddm_name");
+  dia_dynamic_menu_select_entry(ddm, name);
+}
+
+static GtkWidget *
+dia_dynamic_menu_create_string_item(DiaDynamicMenu *ddm, gchar *string)
+{
+  GtkWidget *item = gtk_menu_item_new_with_label(gettext(string));
+  return item;
+}
+
+/** Utility function for dynamic menus that are entirely based on the
+ * labels in the menu.
+ */
+GtkWidget *
+dia_dynamic_menu_new_stringbased(GtkMenuItem *otheritem, 
+				 gpointer userdata,
+				 gchar *persist)
+{
+  GtkWidget *ddm = dia_dynamic_menu_new(dia_dynamic_menu_create_string_item,
+					userdata,
+					otheritem, persist);
+  return ddm;
+}
+
+/** Utility function for dynamic menus that are based on a submenu with
+ * many entries.  This is useful for allowing the user to get a smaller 
+ * subset menu out of a set too large to be easily handled by a menu.
+ */
+GtkWidget *
+dia_dynamic_menu_new_listbased(DDMCreateItemFunc create,
+			       gpointer userdata,
+			       gchar *other_label, GList *items, 
+			       gchar *persist)
+{
+  GtkWidget *item = gtk_menu_item_new_with_label(other_label);
+  GtkWidget *ddm = dia_dynamic_menu_new(create, userdata,
+					GTK_MENU_ITEM(item), persist);
+  dia_dynamic_menu_create_sublist(DIA_DYNAMIC_MENU(ddm), items,  create);
+
+  gtk_widget_show(item);
+  return ddm;
+}
+
+/** Utility function for dynamic menus that allow selection from a large
+ * number of strings.
+ */
+GtkWidget *
+dia_dynamic_menu_new_stringlistbased(gchar *other_label, 
+				     GList *items,
+				     gpointer userdata,
+				     gchar *persist)
+{
+  return dia_dynamic_menu_new_listbased(dia_dynamic_menu_create_string_item,
+					userdata,
+					other_label, items, persist);
+}
+
+static void
+dia_dynamic_menu_create_sublist(DiaDynamicMenu *ddm,
+				GList *items, DDMCreateItemFunc create)
+{
+  GtkWidget *item = GTK_WIDGET(ddm->other_item);
+
+  GtkWidget *submenu = gtk_menu_new();
+
+  for (; items != NULL; items = g_list_next(items)) {
+    GtkWidget *submenuitem = (create)(ddm, items->data);
+    /* Set callback function to cause addition of item */
+    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), submenuitem);
+    g_object_set_data(G_OBJECT(submenuitem), "ddm_name", items->data);
+    g_signal_connect(submenuitem, "activate",
+		     G_CALLBACK(dia_dynamic_menu_activate), ddm);
+    gtk_widget_show(submenuitem);
+  }
+
+  gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
+  gtk_widget_show(submenu);
+}
+
+/** Add a new default entry to this menu.
+ * The default entries are always shown, also after resets, above the
+ * other entries.  Possible uses are standard fonts or common colors.
+ * The entry is added at the end of the default entries section.
+ * Do not add too many default entries.
+ *
+ * @param ddm A dynamic menu to add the entry to.
+ * @param entry An entry for the menu.
+ */
+void
+dia_dynamic_menu_add_default_entry(DiaDynamicMenu *ddm, const gchar *entry)
+{
+  ddm->default_entries = g_list_append(ddm->default_entries,
+				       g_strdup(entry));
+
+  dia_dynamic_menu_create_menu(ddm);
+}
+
+/** Set the number of columns this menu uses (default 1)
+ * @param cols Desired # of columns (>= 1)
+ */
+void
+dia_dynamic_menu_set_columns(DiaDynamicMenu *ddm, gint cols)
+{
+  ddm->cols = cols;
+
+  dia_dynamic_menu_create_menu(ddm);
+}
+
+/** Add a new entry to this menu.  The placement depends on what sorting
+ * system has been chosen with dia_dynamic_menu_set_sorting_method().
+ *
+ * @param ddm A dynamic menu to add the entry to.
+ * @param entry An entry for the menu.
+ *
+ * @returns 0 if the entry was one of the default entries.
+ * 1 if the entry was already there.
+ * 2 if the entry got added.
+ */
+gint
+dia_dynamic_menu_add_entry(DiaDynamicMenu *ddm, const gchar *entry)
+{
+  GList *tmp;
+  gboolean existed;
+
+  for (tmp = ddm->default_entries; tmp != NULL; tmp = g_list_next(tmp)) {
+    if (!g_ascii_strcasecmp(tmp->data, entry))
+      return 0;
+  }
+  existed = persistent_list_add(ddm->persistent_name, entry);
+
+  dia_dynamic_menu_create_menu(ddm);
+  
+  return existed?1:2;
+}
+
+/** Returns the currently selected entry. 
+ * @returns The name of the entry that is currently selected.  This
+ * string should be freed by the caller. */
+gchar *
+dia_dynamic_menu_get_entry(DiaDynamicMenu *ddm)
+{
+  return g_strdup(ddm->active);
+}
+
+/** Rebuild the actual menu of a DDM.
+ * Ignores columns for now.
+ */
+static void
+dia_dynamic_menu_create_menu(DiaDynamicMenu *ddm)
+{
+  GtkWidget *sep;
+  GList *tmplist;
+  GtkWidget *menu;
+  GtkWidget *item;
+
+  g_object_ref(G_OBJECT(ddm->other_item));
+  menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(ddm));
+  if (menu != NULL) {
+    gtk_container_remove(GTK_CONTAINER(menu), GTK_WIDGET(ddm->other_item));
+    gtk_container_foreach(GTK_CONTAINER(menu),
+			  (GtkCallback)gtk_widget_destroy, NULL);
+    gtk_option_menu_remove_menu(GTK_OPTION_MENU(ddm));
+  }
+
+  menu = gtk_menu_new();
+
+  if (ddm->default_entries != NULL) {
+    for (tmplist = ddm->default_entries; tmplist != NULL; tmplist = g_list_next(tmplist)) {
+      GtkWidget *item =  (ddm->create_func)(ddm, tmplist->data);
+      g_object_set_data(G_OBJECT(item), "ddm_name", tmplist->data);
+      g_signal_connect(G_OBJECT(item), "activate", 
+		       G_CALLBACK(dia_dynamic_menu_activate), ddm);
+      gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+      gtk_widget_show(item);
+    }
+    sep = gtk_separator_menu_item_new();
+    gtk_widget_show(sep);
+    gtk_menu_shell_append(GTK_MENU_SHELL(menu), sep);
+  }
+
+  for (tmplist = persistent_list_get_glist(ddm->persistent_name);
+       tmplist != NULL; tmplist = g_list_next(tmplist)) {
+    GtkWidget *item = (ddm->create_func)(ddm, tmplist->data);
+    g_object_set_data(G_OBJECT(item), "ddm_name", tmplist->data);
+    g_signal_connect(G_OBJECT(item), "activate", 
+		     G_CALLBACK(dia_dynamic_menu_activate), ddm);
+    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+    gtk_widget_show(item);
+  }
+  sep = gtk_separator_menu_item_new();
+  gtk_widget_show(sep);
+  gtk_menu_shell_append(GTK_MENU_SHELL(menu), sep);
+
+  gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(ddm->other_item));
+  g_object_unref(G_OBJECT(ddm->other_item));
+  /* Eventually reset item here */
+  gtk_widget_show(menu);
+
+  item = gtk_menu_item_new_with_label(_("Reset menu"));
+  gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+  g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(dia_dynamic_menu_reset), ddm);
+  gtk_widget_show(item);
+
+  gtk_option_menu_set_menu(GTK_OPTION_MENU(ddm), menu);
+
+  gtk_option_menu_set_history(GTK_OPTION_MENU(ddm), 0);
+}
+
+/** Select the method used for sorting the non-default entries.
+ * @param ddm A dynamic menu
+ * @param sort The way the non-default entries in the menu should be sorted.
+ */
+void
+dia_dynamic_menu_set_sorting_method(DiaDynamicMenu *ddm, DdmSortType sort)
+{
+}
+
+/** Reset the non-default entries of a menu
+ */
+void
+dia_dynamic_menu_reset(GtkWidget *item, gpointer userdata)
+{
+  DiaDynamicMenu *ddm = DIA_DYNAMIC_MENU(userdata);
+  PersistentList *plist = persistent_list_get(ddm->persistent_name);
+  gchar *active = dia_dynamic_menu_get_entry(ddm);
+  g_list_foreach(plist->glist, (GFunc)g_free, NULL);
+  g_list_free(plist->glist);
+  plist->glist = NULL;
+  dia_dynamic_menu_create_menu(ddm);
+  if (active)
+    dia_dynamic_menu_select_entry(ddm, active);
+  g_free(active);
+}
+
+/** Set the maximum number of non-default entries.
+ * If more than this number of entries are added, the least recently
+ * selected ones are removed. */
+void
+dia_dynamic_menu_set_max_entries(DiaDynamicMenu *ddm, gint max)
+{
+}
+
+/**
+ * Deliver the list of default entries, NULL for empty list
+ */
+GList *
+dia_dynamic_menu_get_default_entries(DiaDynamicMenu *ddm)
+{
+  return ddm->default_entries;
+}
+
+/**
+ * Delivers the name used for persitence
+ */
+const gchar *
+dia_dynamic_menu_get_persistent_name(DiaDynamicMenu *ddm)
+{
+  return ddm->persistent_name;
+}
diff --git a/lib/diadynamicmenu.h b/lib/diadynamicmenu.h
new file mode 100644
index 0000000..436b6c9
--- /dev/null
+++ b/lib/diadynamicmenu.h
@@ -0,0 +1,56 @@
+
+#ifndef DIA_DYNAMIC_MENU_H
+#define DIA_DYNAMIC_MENU_H
+
+#include <gtk/gtk.h>
+
+/* DiaDynamicMenu */
+
+#define DIA_DYNAMIC_MENU(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, dia_dynamic_menu_get_type(), DiaDynamicMenu)
+#define DIA_DYNAMIC_MENU_CLASS(klass) G_TYPE_CHECK_CLASS_CAST(klass, dia_dynamic_menu_get_type(), DiaDynamicMenuClass)
+#define DIA_IS_DYNAMIC_MENU(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, dia_dynamic_menu_get_type())
+
+typedef struct _DiaDynamicMenu DiaDynamicMenu;
+typedef struct _DiaDynamicMenuClass DiaDynamicMenuClass;
+
+/** The ways the non-default entries in the menu can be sorted:
+ * DDM_SORT_TOP: Just add new ones at the top, removing them from the middle.
+ * Not currently implemented.
+ * DDM_SORT_NEWEST:  Add new ones to the top, and move selected ones to the
+ * top as well.
+ * DDM_SORT_SORT:  Sort the entries according to the CompareFunc order.
+ */
+typedef enum { DDM_SORT_TOP, DDM_SORT_NEWEST, DDM_SORT_SORT } DdmSortType;
+
+typedef GtkWidget *(* DDMCreateItemFunc)(DiaDynamicMenu *, gchar *);
+typedef void (* DDMCallbackFunc)(DiaDynamicMenu *, const gchar *, gpointer);
+
+GType      dia_dynamic_menu_get_type  (void);
+
+GtkWidget *dia_dynamic_menu_new(DDMCreateItemFunc create,
+				gpointer userdata,
+				GtkMenuItem *otheritem, gchar *persist);
+GtkWidget *dia_dynamic_menu_new_stringbased(GtkMenuItem *otheritem, 
+					    gpointer userdata,
+					    gchar *persist);
+GtkWidget *dia_dynamic_menu_new_listbased(DDMCreateItemFunc create,
+					  gpointer userdata,
+					  gchar *other_label,
+					  GList *items, gchar *persist);
+GtkWidget *dia_dynamic_menu_new_stringlistbased(gchar *other_label,
+						GList *items, 
+						gpointer userdata,
+						gchar *persist);
+void dia_dynamic_menu_add_default_entry(DiaDynamicMenu *ddm, const gchar *entry);
+gint dia_dynamic_menu_add_entry(DiaDynamicMenu *ddm, const gchar *entry);
+void dia_dynamic_menu_set_sorting_method(DiaDynamicMenu *ddm, DdmSortType sort);
+void dia_dynamic_menu_reset(GtkWidget *widget, gpointer userdata);
+void dia_dynamic_menu_set_max_entries(DiaDynamicMenu *ddm, gint max);
+void dia_dynamic_menu_set_columns(DiaDynamicMenu *ddm, gint cols);
+gchar *dia_dynamic_menu_get_entry(DiaDynamicMenu *ddm);
+void dia_dynamic_menu_select_entry(DiaDynamicMenu *ddm, const gchar *entry);
+
+GList *dia_dynamic_menu_get_default_entries(DiaDynamicMenu *ddm);
+const gchar *dia_dynamic_menu_get_persistent_name(DiaDynamicMenu *ddm);
+
+#endif /* DIA_DYNAMIC_MENU_H */
diff --git a/lib/makefile.msc b/lib/makefile.msc
index 950d2e3..80b796e 100644
--- a/lib/makefile.msc
+++ b/lib/makefile.msc
@@ -114,6 +114,7 @@ OBJECTS = \
 	utils.obj \
 	widgets.obj \
 	diaoptionmenu.obj \
+	diadynamicmenu.obj \
 	\
 	diacellrendererproperty.obj \
 	\
diff --git a/lib/widgets.c b/lib/widgets.c
index 5dd7dbc..82cfae3 100644
--- a/lib/widgets.c
+++ b/lib/widgets.c
@@ -27,6 +27,7 @@
 #include "arrows.h"
 #include "diaarrowchooser.h"
 #include "dialinechooser.h"
+#include "diadynamicmenu.h"
 #include "persistence.h"
 #include "dia-lib-icons.h"
 
@@ -39,35 +40,6 @@
 #include <time.h>
 #include <gdk/gdkkeysyms.h>
 
-/* hidden internals for two reasosn: 
- * - noone is supposed to mess with the internals 
- * - it uses deprecated stuff
- */
-struct _DiaDynamicMenu {
-  GtkOptionMenu parent;
-
-  GList *default_entries;
-
-  DDMCreateItemFunc create_func;
-  DDMCallbackFunc activate_func;
-  gpointer userdata;
-
-  GtkMenuItem *other_item;
-
-  gchar *persistent_name;
-  gint cols;
-
-  gchar *active;
-  /** For the list-based versions, these are the options */
-  GList *options;
-
-};
-
-struct _DiaDynamicMenuClass {
-  GtkOptionMenuClass parent_class;
-};
-
-
 /************* DiaSizeSelector: ***************/
 /* A widget that selects two sizes, width and height, optionally keeping
  * aspect ratio.  When created, aspect ratio is locked, but the user can
@@ -1070,12 +1042,12 @@ dia_color_selector_more_callback(GtkWidget *widget, gpointer userdata)
     gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
   }
 
-  if (ddm->default_entries != NULL) {
+  if (dia_dynamic_menu_get_default_entries(ddm) != NULL) {
     GList *tmplist;
     int index = 0;
     gboolean advance = TRUE;
 
-    for (tmplist = ddm->default_entries; 
+    for (tmplist = dia_dynamic_menu_get_default_entries(ddm); 
          tmplist != NULL || advance; 
          tmplist = g_list_next(tmplist)) {
       const gchar* spec;
@@ -1084,7 +1056,7 @@ dia_color_selector_more_callback(GtkWidget *widget, gpointer userdata)
       /* handle both lists */
       if (!tmplist && advance) {
         advance = FALSE;
-        tmplist = persistent_list_get_glist(ddm->persistent_name);
+        tmplist = persistent_list_get_glist(dia_dynamic_menu_get_persistent_name(ddm));
         if (!tmplist)
           break;
       }
@@ -1760,386 +1732,6 @@ get_units_name_list(void)
   return name_list;
 }
 
-/* ************************ Dynamic menus ************************ */
-
-static void dia_dynamic_menu_class_init(DiaDynamicMenuClass *class);
-static void dia_dynamic_menu_init(DiaDynamicMenu *self);
-static void dia_dynamic_menu_create_sublist(DiaDynamicMenu *ddm,
-					    GList *items, 
-					    DDMCreateItemFunc create);
-static void dia_dynamic_menu_create_menu(DiaDynamicMenu *ddm);
-static void dia_dynamic_menu_destroy(GtkObject *object);
-
-enum {
-    DDM_VALUE_CHANGED,
-    DDM_LAST_SIGNAL
-};
-
-static guint ddm_signals[DDM_LAST_SIGNAL] = { 0 };
-
-GtkType
-dia_dynamic_menu_get_type(void)
-{
-  static GtkType us_type = 0;
-
-  if (!us_type) {
-    static const GtkTypeInfo us_info = {
-      "DiaDynamicMenu",
-      sizeof(DiaDynamicMenu),
-      sizeof(DiaDynamicMenuClass),
-      (GtkClassInitFunc) dia_dynamic_menu_class_init,
-      (GtkObjectInitFunc) dia_dynamic_menu_init,
-      NULL,
-      NULL,
-      (GtkClassInitFunc) NULL,
-    };
-    us_type = gtk_type_unique(gtk_option_menu_get_type(), &us_info);
-  }
-  return us_type;
-}
-
-static void
-dia_dynamic_menu_class_init(DiaDynamicMenuClass *class)
-{
-  GtkObjectClass *object_class = (GtkObjectClass*)class;
-
-  object_class->destroy = dia_dynamic_menu_destroy;
-  
-  ddm_signals[DDM_VALUE_CHANGED]
-      = g_signal_new("value-changed",
-		     G_TYPE_FROM_CLASS(class),
-		     G_SIGNAL_RUN_FIRST,
-		     0, NULL, NULL,
-		     g_cclosure_marshal_VOID__VOID,
-		     G_TYPE_NONE, 0);
-}
-
-static void
-dia_dynamic_menu_init(DiaDynamicMenu *self)
-{
-}
-
-void 
-dia_dynamic_menu_destroy(GtkObject *object)
-{
-  DiaDynamicMenu *ddm = DIA_DYNAMIC_MENU(object);
-  GtkObjectClass *parent_class = GTK_OBJECT_CLASS(g_type_class_peek_parent(GTK_OBJECT_GET_CLASS(object)));
-
-  if (ddm->active)
-    g_free(ddm->active);
-  ddm->active = NULL;
-
-  if (parent_class->destroy)
-    (* parent_class->destroy) (object);
-}
-
-/** Create a new dynamic menu.  The entries are represented with
- * gpointers.
- * @param create A function that creates menuitems from gpointers.
- * @param otheritem A menuitem that can be selected by the user to
- * add more entries, for instance making a dialog box or a submenu.
- * @param persist A string naming this menu for persistence purposes, or NULL.
-
- * @return A new menu
- */
-GtkWidget *
-dia_dynamic_menu_new(DDMCreateItemFunc create, 
-		     gpointer userdata,
-		     GtkMenuItem *otheritem, gchar *persist)
-{
-  DiaDynamicMenu *ddm;
-
-  g_assert(persist != NULL);
-
-  ddm = DIA_DYNAMIC_MENU ( gtk_type_new (dia_dynamic_menu_get_type ()));
-  
-  ddm->create_func = create;
-  ddm->userdata = userdata;
-  ddm->other_item = otheritem;
-  ddm->persistent_name = persist;
-  ddm->cols = 1;
-
-  persistence_register_list(persist);
-
-  dia_dynamic_menu_create_menu(ddm);
-
-  return GTK_WIDGET(ddm);
-}
-
-/** Select the given entry, adding it if necessary */
-void
-dia_dynamic_menu_select_entry(DiaDynamicMenu *ddm, const gchar *name)
-{
-  gint add_result = dia_dynamic_menu_add_entry(ddm, name);
-  if (add_result == 0) {
-      GList *tmp;
-      int i = 0;
-      for (tmp = ddm->default_entries; tmp != NULL;
-	   tmp = g_list_next(tmp), i++) {
-	if (!g_ascii_strcasecmp(tmp->data, name))
-	  gtk_option_menu_set_history(GTK_OPTION_MENU(ddm), i);
-      }
-      /* Not there after all? */
-  } else {
-    if (ddm->default_entries != NULL)
-      gtk_option_menu_set_history(GTK_OPTION_MENU(ddm),
-				  g_list_length(ddm->default_entries)+1);
-    else
-      gtk_option_menu_set_history(GTK_OPTION_MENU(ddm), 0);
-  }
-  
-  g_free(ddm->active);
-  ddm->active = g_strdup(name);
-  g_signal_emit(GTK_OBJECT(ddm), ddm_signals[DDM_VALUE_CHANGED], 0);
-}
-
-static void
-dia_dynamic_menu_activate(GtkWidget *item, gpointer userdata)
-{
-  DiaDynamicMenu *ddm = DIA_DYNAMIC_MENU(userdata);
-  gchar *name = g_object_get_data(G_OBJECT(item), "ddm_name");
-  dia_dynamic_menu_select_entry(ddm, name);
-}
-
-static GtkWidget *
-dia_dynamic_menu_create_string_item(DiaDynamicMenu *ddm, gchar *string)
-{
-  GtkWidget *item = gtk_menu_item_new_with_label(gettext(string));
-  return item;
-}
-
-/** Utility function for dynamic menus that are entirely based on the
- * labels in the menu.
- */
-GtkWidget *
-dia_dynamic_menu_new_stringbased(GtkMenuItem *otheritem, 
-				 gpointer userdata,
-				 gchar *persist)
-{
-  GtkWidget *ddm = dia_dynamic_menu_new(dia_dynamic_menu_create_string_item,
-					userdata,
-					otheritem, persist);
-  return ddm;
-}
-
-/** Utility function for dynamic menus that are based on a submenu with
- * many entries.  This is useful for allowing the user to get a smaller 
- * subset menu out of a set too large to be easily handled by a menu.
- */
-GtkWidget *
-dia_dynamic_menu_new_listbased(DDMCreateItemFunc create,
-			       gpointer userdata,
-			       gchar *other_label, GList *items, 
-			       gchar *persist)
-{
-  GtkWidget *item = gtk_menu_item_new_with_label(other_label);
-  GtkWidget *ddm = dia_dynamic_menu_new(create, userdata,
-					GTK_MENU_ITEM(item), persist);
-  dia_dynamic_menu_create_sublist(DIA_DYNAMIC_MENU(ddm), items,  create);
-
-  gtk_widget_show(item);
-  return ddm;
-}
-
-/** Utility function for dynamic menus that allow selection from a large
- * number of strings.
- */
-GtkWidget *
-dia_dynamic_menu_new_stringlistbased(gchar *other_label, 
-				     GList *items,
-				     gpointer userdata,
-				     gchar *persist)
-{
-  return dia_dynamic_menu_new_listbased(dia_dynamic_menu_create_string_item,
-					userdata,
-					other_label, items, persist);
-}
-
-static void
-dia_dynamic_menu_create_sublist(DiaDynamicMenu *ddm,
-				GList *items, DDMCreateItemFunc create)
-{
-  GtkWidget *item = GTK_WIDGET(ddm->other_item);
-
-  GtkWidget *submenu = gtk_menu_new();
-
-  for (; items != NULL; items = g_list_next(items)) {
-    GtkWidget *submenuitem = (create)(ddm, items->data);
-    /* Set callback function to cause addition of item */
-    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), submenuitem);
-    g_object_set_data(G_OBJECT(submenuitem), "ddm_name", items->data);
-    g_signal_connect(submenuitem, "activate",
-		     G_CALLBACK(dia_dynamic_menu_activate), ddm);
-    gtk_widget_show(submenuitem);
-  }
-
-  gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
-  gtk_widget_show(submenu);
-}
-
-/** Add a new default entry to this menu.
- * The default entries are always shown, also after resets, above the
- * other entries.  Possible uses are standard fonts or common colors.
- * The entry is added at the end of the default entries section.
- * Do not add too many default entries.
- *
- * @param ddm A dynamic menu to add the entry to.
- * @param entry An entry for the menu.
- */
-void
-dia_dynamic_menu_add_default_entry(DiaDynamicMenu *ddm, const gchar *entry)
-{
-  ddm->default_entries = g_list_append(ddm->default_entries,
-				       g_strdup(entry));
-
-  dia_dynamic_menu_create_menu(ddm);
-}
-
-/** Set the number of columns this menu uses (default 1)
- * @param cols Desired # of columns (>= 1)
- */
-void
-dia_dynamic_menu_set_columns(DiaDynamicMenu *ddm, gint cols)
-{
-  ddm->cols = cols;
-
-  dia_dynamic_menu_create_menu(ddm);
-}
-
-/** Add a new entry to this menu.  The placement depends on what sorting
- * system has been chosen with dia_dynamic_menu_set_sorting_method().
- *
- * @param ddm A dynamic menu to add the entry to.
- * @param entry An entry for the menu.
- *
- * @returns 0 if the entry was one of the default entries.
- * 1 if the entry was already there.
- * 2 if the entry got added.
- */
-gint
-dia_dynamic_menu_add_entry(DiaDynamicMenu *ddm, const gchar *entry)
-{
-  GList *tmp;
-  gboolean existed;
-
-  for (tmp = ddm->default_entries; tmp != NULL; tmp = g_list_next(tmp)) {
-    if (!g_ascii_strcasecmp(tmp->data, entry))
-      return 0;
-  }
-  existed = persistent_list_add(ddm->persistent_name, entry);
-
-  dia_dynamic_menu_create_menu(ddm);
-  
-  return existed?1:2;
-}
-
-/** Returns the currently selected entry. 
- * @returns The name of the entry that is currently selected.  This
- * string should be freed by the caller. */
-gchar *
-dia_dynamic_menu_get_entry(DiaDynamicMenu *ddm)
-{
-  return g_strdup(ddm->active);
-}
-
-/** Rebuild the actual menu of a DDM.
- * Ignores columns for now.
- */
-static void
-dia_dynamic_menu_create_menu(DiaDynamicMenu *ddm)
-{
-  GtkWidget *sep;
-  GList *tmplist;
-  GtkWidget *menu;
-  GtkWidget *item;
-
-  g_object_ref(G_OBJECT(ddm->other_item));
-  menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(ddm));
-  if (menu != NULL) {
-    gtk_container_remove(GTK_CONTAINER(menu), GTK_WIDGET(ddm->other_item));
-    gtk_container_foreach(GTK_CONTAINER(menu),
-			  (GtkCallback)gtk_widget_destroy, NULL);
-    gtk_option_menu_remove_menu(GTK_OPTION_MENU(ddm));
-  }
-
-  menu = gtk_menu_new();
-
-  if (ddm->default_entries != NULL) {
-    for (tmplist = ddm->default_entries; tmplist != NULL; tmplist = g_list_next(tmplist)) {
-      GtkWidget *item =  (ddm->create_func)(ddm, tmplist->data);
-      g_object_set_data(G_OBJECT(item), "ddm_name", tmplist->data);
-      g_signal_connect(G_OBJECT(item), "activate", 
-		       G_CALLBACK(dia_dynamic_menu_activate), ddm);
-      gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
-      gtk_widget_show(item);
-    }
-    sep = gtk_separator_menu_item_new();
-    gtk_widget_show(sep);
-    gtk_menu_shell_append(GTK_MENU_SHELL(menu), sep);
-  }
-
-  for (tmplist = persistent_list_get_glist(ddm->persistent_name);
-       tmplist != NULL; tmplist = g_list_next(tmplist)) {
-    GtkWidget *item = (ddm->create_func)(ddm, tmplist->data);
-    g_object_set_data(G_OBJECT(item), "ddm_name", tmplist->data);
-    g_signal_connect(G_OBJECT(item), "activate", 
-		     G_CALLBACK(dia_dynamic_menu_activate), ddm);
-    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
-    gtk_widget_show(item);
-  }
-  sep = gtk_separator_menu_item_new();
-  gtk_widget_show(sep);
-  gtk_menu_shell_append(GTK_MENU_SHELL(menu), sep);
-
-  gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(ddm->other_item));
-  g_object_unref(G_OBJECT(ddm->other_item));
-  /* Eventually reset item here */
-  gtk_widget_show(menu);
-
-  item = gtk_menu_item_new_with_label(_("Reset menu"));
-  gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
-  g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(dia_dynamic_menu_reset), ddm);
-  gtk_widget_show(item);
-
-  gtk_option_menu_set_menu(GTK_OPTION_MENU(ddm), menu);
-
-  gtk_option_menu_set_history(GTK_OPTION_MENU(ddm), 0);
-}
-
-/** Select the method used for sorting the non-default entries.
- * @param ddm A dynamic menu
- * @param sort The way the non-default entries in the menu should be sorted.
- */
-void
-dia_dynamic_menu_set_sorting_method(DiaDynamicMenu *ddm, DdmSortType sort)
-{
-}
-
-/** Reset the non-default entries of a menu
- */
-void
-dia_dynamic_menu_reset(GtkWidget *item, gpointer userdata)
-{
-  DiaDynamicMenu *ddm = DIA_DYNAMIC_MENU(userdata);
-  PersistentList *plist = persistent_list_get(ddm->persistent_name);
-  gchar *active = dia_dynamic_menu_get_entry(ddm);
-  g_list_foreach(plist->glist, (GFunc)g_free, NULL);
-  g_list_free(plist->glist);
-  plist->glist = NULL;
-  dia_dynamic_menu_create_menu(ddm);
-  if (active)
-    dia_dynamic_menu_select_entry(ddm, active);
-  g_free(active);
-}
-
-/** Set the maximum number of non-default entries.
- * If more than this number of entries are added, the least recently
- * selected ones are removed. */
-void
-dia_dynamic_menu_set_max_entries(DiaDynamicMenu *ddm, gint max)
-{
-}
-
 
 /* ************************ Misc. util functions ************************ */
 struct image_pair { GtkWidget *on; GtkWidget *off; };
diff --git a/lib/widgets.h b/lib/widgets.h
index 07a8dda..d7c257d 100644
--- a/lib/widgets.h
+++ b/lib/widgets.h
@@ -163,53 +163,6 @@ void       dia_unit_spinner_set_value (DiaUnitSpinner *self, gdouble val);
 gdouble    dia_unit_spinner_get_value (DiaUnitSpinner *self);
 GList *    get_units_name_list(void);
 
-/* DiaDynamicMenu */
-
-#define DIA_DYNAMIC_MENU(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, dia_dynamic_menu_get_type(), DiaDynamicMenu)
-#define DIA_DYNAMIC_MENU_CLASS(klass) G_TYPE_CHECK_CLASS_CAST(klass, dia_dynamic_menu_get_type(), DiaDynamicMenuClass)
-#define DIA_IS_DYNAMIC_MENU(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, dia_dynamic_menu_get_type())
-
-typedef struct _DiaDynamicMenu DiaDynamicMenu;
-typedef struct _DiaDynamicMenuClass DiaDynamicMenuClass;
-
-/** The ways the non-default entries in the menu can be sorted:
- * DDM_SORT_TOP: Just add new ones at the top, removing them from the middle.
- * Not currently implemented.
- * DDM_SORT_NEWEST:  Add new ones to the top, and move selected ones to the
- * top as well.
- * DDM_SORT_SORT:  Sort the entries according to the CompareFunc order.
- */
-typedef enum { DDM_SORT_TOP, DDM_SORT_NEWEST, DDM_SORT_SORT } DdmSortType;
-
-typedef GtkWidget *(* DDMCreateItemFunc)(DiaDynamicMenu *, gchar *);
-typedef void (* DDMCallbackFunc)(DiaDynamicMenu *, const gchar *, gpointer);
-
-GType      dia_dynamic_menu_get_type  (void);
-
-GtkWidget *dia_dynamic_menu_new(DDMCreateItemFunc create,
-				gpointer userdata,
-				GtkMenuItem *otheritem, gchar *persist);
-GtkWidget *dia_dynamic_menu_new_stringbased(GtkMenuItem *otheritem, 
-					    gpointer userdata,
-					    gchar *persist);
-GtkWidget *dia_dynamic_menu_new_listbased(DDMCreateItemFunc create,
-					  gpointer userdata,
-					  gchar *other_label,
-					  GList *items, gchar *persist);
-GtkWidget *dia_dynamic_menu_new_stringlistbased(gchar *other_label,
-						GList *items, 
-						gpointer userdata,
-						gchar *persist);
-void dia_dynamic_menu_add_default_entry(DiaDynamicMenu *ddm, const gchar *entry);
-gint dia_dynamic_menu_add_entry(DiaDynamicMenu *ddm, const gchar *entry);
-void dia_dynamic_menu_set_sorting_method(DiaDynamicMenu *ddm, DdmSortType sort);
-void dia_dynamic_menu_reset(GtkWidget *widget, gpointer userdata);
-void dia_dynamic_menu_set_max_entries(DiaDynamicMenu *ddm, gint max);
-void dia_dynamic_menu_set_columns(DiaDynamicMenu *ddm, gint cols);
-gchar *dia_dynamic_menu_get_entry(DiaDynamicMenu *ddm);
-void dia_dynamic_menu_select_entry(DiaDynamicMenu *ddm, const gchar *entry);
-
-
 /* **** Util functions for Gtk stuff **** */
 /** Create a toggle button with two icons (created with gdk-pixbuf-csource,
  * for instance).  The icons represent on and off.