[dia] [option-menu] Replace DiaAlignmentSelector with DiaOptionMenu

[Hans Breuer <hans src gnome org>]

commit 4514e8afbd3bb0bb0b5c13cb95bf565ba965556c
Author: Hans Breuer <hans breuer org>
Date:   Fri Oct 29 13:45:38 2010 +0200

    [option-menu] Replace DiaAlignmentSelector with DiaOptionMenu

 lib/diatypes.h |    2 -
 lib/libdia.def |    1 -
 lib/widgets.c  |   99 ++++++-------------------------------------------------
 lib/widgets.h  |   11 +-----
 4 files changed, 13 insertions(+), 100 deletions(-)
---
diff --git a/lib/diatypes.h b/lib/diatypes.h
index 24f1f78..c92cb31 100644
--- a/lib/diatypes.h
+++ b/lib/diatypes.h
@@ -183,8 +183,6 @@ typedef struct _DiaSizeSelector       DiaSizeSelector;
 typedef struct _DiaSizeSelectorClass  DiaSizeSelectorClass;
 typedef struct _DiaFontSelector       DiaFontSelector;
 typedef struct _DiaFontSelectorClass  DiaFontSelectorClass;
-typedef struct _DiaAlignmentSelector       DiaAlignmentSelector;
-typedef struct _DiaAlignmentSelectorClass  DiaAlignmentSelectorClass;
 typedef struct _DiaLineStyleSelector       DiaLineStyleSelector;
 typedef struct _DiaLineStyleSelectorClass  DiaLineStyleSelectorClass;
 typedef struct _DiaColorSelector       DiaColorSelector;
diff --git a/lib/libdia.def b/lib/libdia.def
index 1748425..b60b768 100644
--- a/lib/libdia.def
+++ b/lib/libdia.def
@@ -179,7 +179,6 @@ EXPORTS
  destroy_object_list
 
  dia_alignment_selector_get_alignment
- dia_alignment_selector_get_type
  dia_alignment_selector_new
  dia_alignment_selector_set_alignment
  dia_arrow_chooser_new
diff --git a/lib/widgets.c b/lib/widgets.c
index c61563e..d9fecc0 100644
--- a/lib/widgets.c
+++ b/lib/widgets.c
@@ -28,6 +28,7 @@
 #include "diaarrowchooser.h"
 #include "dialinechooser.h"
 #include "diadynamicmenu.h"
+#include "diaoptionmenu.h"
 #include "persistence.h"
 #include "dia-lib-icons.h"
 
@@ -277,106 +278,28 @@ dia_size_selector_get_size(DiaSizeSelector *ss, real *width, real *height)
 }
 
 /************* DiaAlignmentSelector: ***************/
-struct _DiaAlignmentSelector
-{
-  GtkOptionMenu omenu;
-
-  GtkMenu *alignment_menu;
-};
-
-struct _DiaAlignmentSelectorClass
-{
-  GtkOptionMenuClass parent_class;
-};
-
-static void
-dia_alignment_selector_class_init (DiaAlignmentSelectorClass *class)
-{
-}
-
-static void
-dia_alignment_selector_init (DiaAlignmentSelector *fs)
-{
-  GtkWidget *menu;
-  GtkWidget *submenu;
-  GtkWidget *menuitem;
-  GSList *group;
-  
-  menu = gtk_menu_new ();
-  fs->alignment_menu = GTK_MENU(menu);
-  submenu = NULL;
-  group = NULL;
-
-  menuitem = gtk_radio_menu_item_new_with_label (group, _("Left"));
-  g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(ALIGN_LEFT));
-  group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-  gtk_widget_show (menuitem);
-
-  menuitem = gtk_radio_menu_item_new_with_label (group, _("Center"));
-  g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(ALIGN_CENTER));
-  group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-  gtk_widget_show (menuitem);
-
-  menuitem = gtk_radio_menu_item_new_with_label (group, _("Right"));
-  g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(ALIGN_RIGHT));
-  group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-  gtk_widget_show (menuitem);
-  
-  gtk_menu_set_active(GTK_MENU (menu), DEFAULT_ALIGNMENT);
-  gtk_option_menu_set_menu (GTK_OPTION_MENU (fs), menu);
-}
-
-GtkType
-dia_alignment_selector_get_type        (void)
-{
-  static GtkType dfs_type = 0;
-
-  if (!dfs_type) {
-    static const GtkTypeInfo dfs_info = {
-      "DiaAlignmentSelector",
-      sizeof (DiaAlignmentSelector),
-      sizeof (DiaAlignmentSelectorClass),
-      (GtkClassInitFunc) dia_alignment_selector_class_init,
-      (GtkObjectInitFunc) dia_alignment_selector_init,
-      NULL,
-      NULL,
-      (GtkClassInitFunc) NULL,
-    };
-    
-    dfs_type = gtk_type_unique (gtk_option_menu_get_type (), &dfs_info);
-  }
-  
-  return dfs_type;
-}
-
 GtkWidget *
 dia_alignment_selector_new ()
 {
-  return GTK_WIDGET ( gtk_type_new (dia_alignment_selector_get_type ()));
-}
+  GtkWidget *omenu = dia_option_menu_new ();
+  dia_option_menu_add_item(omenu, _("Left"), ALIGN_LEFT);
+  dia_option_menu_add_item(omenu, _("Center"), ALIGN_CENTER);
+  dia_option_menu_add_item(omenu, _("Right"), ALIGN_RIGHT);
 
+  return omenu;
+}
 
 Alignment 
-dia_alignment_selector_get_alignment(DiaAlignmentSelector *fs)
+dia_alignment_selector_get_alignment(GtkWidget *as)
 {
-  GtkWidget *menuitem;
-  void *align;
-  
-  menuitem = gtk_menu_get_active(fs->alignment_menu);
-  align = g_object_get_data(G_OBJECT(menuitem), "user_item");
-
-  return GPOINTER_TO_INT(align);
+  return (Alignment)dia_option_menu_get_active (GTK_WIDGET (as));
 }
 
 void
-dia_alignment_selector_set_alignment (DiaAlignmentSelector *as,
+dia_alignment_selector_set_alignment (GtkWidget *as,
 				      Alignment align)
 {
-  gtk_menu_set_active(GTK_MENU (as->alignment_menu), align);
-  gtk_option_menu_set_history (GTK_OPTION_MENU(as), align);
+  dia_option_menu_set_active (GTK_WIDGET (as), align);
 }
 
 /************* DiaLineStyleSelector: ***************/
diff --git a/lib/widgets.h b/lib/widgets.h
index 2782503..2f600a7 100644
--- a/lib/widgets.h
+++ b/lib/widgets.h
@@ -28,16 +28,9 @@
 #include "units.h"
 
 /* DiaAlignmentSelector: */
-#define DIAALIGNMENTSELECTOR(obj)          G_TYPE_CHECK_INSTANCE_CAST (obj, dia_alignment_selector_get_type (), DiaAlignmentSelector)
-#define DIAALIGNMENTSELECTOR_CLASS(klass)  G_TYPE_CHECK_CLASS_CAST (klass, dia_alignment_selector_get_type (), DiaAlignmentSelectorClass)
-#define IS_DIAALIGNMENTSELECTOR(obj)       G_TYPE_CHECK_INSTANCE_TYPE (obj, dia_alignment_selector_get_type ())
-
-
-GType      dia_alignment_selector_get_type      (void);
 GtkWidget* dia_alignment_selector_new           (void);
-Alignment  dia_alignment_selector_get_alignment (DiaAlignmentSelector *as);
-void       dia_alignment_selector_set_alignment (DiaAlignmentSelector *as,
-						 Alignment align);
+Alignment  dia_alignment_selector_get_alignment (GtkWidget *as);
+void       dia_alignment_selector_set_alignment (GtkWidget *as, Alignment align);
 
 /* DiaLineStyleSelector: */
 #define DIALINESTYLESELECTOR(obj)          G_TYPE_CHECK_INSTANCE_CAST (obj, dia_line_style_selector_get_type (), DiaLineStyleSelector)