]> Pileus Git - ~andy/gtk/commitdiff
Remove GtkOptionMenu completely
authorChristian Dywan <christian@twotoasts.de>
Wed, 7 Oct 2009 16:41:10 +0000 (18:41 +0200)
committerJavier Jardón <jjardon@gnome.org>
Sun, 2 May 2010 23:40:42 +0000 (01:40 +0200)
gtk/gtkoptionmenu.c [deleted file]
gtk/gtkoptionmenu.h [deleted file]

diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c
deleted file mode 100644 (file)
index c53018c..0000000
+++ /dev/null
@@ -1,1036 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Jsh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * 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
- * 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.
- */
-
-/*
- * 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/. 
- */
-
-#include "config.h"
-
-#include "gdk/gdkkeysyms.h"
-
-#undef GTK_DISABLE_DEPRECATED
-
-#include "gtkmenu.h"
-#include "gtkmenuitem.h"
-#include "gtkmarshalers.h"
-#include "gtkoptionmenu.h"
-#include "gtkprivate.h"
-#include "gtkintl.h"
-#include "gtkalias.h"
-
-#define CHILD_LEFT_SPACING        4
-#define CHILD_RIGHT_SPACING       1
-#define CHILD_TOP_SPACING         1
-#define CHILD_BOTTOM_SPACING      1
-
-typedef struct _GtkOptionMenuProps GtkOptionMenuProps;
-
-struct _GtkOptionMenuProps
-{
-  gboolean interior_focus;
-  GtkRequisition indicator_size;
-  GtkBorder indicator_spacing;
-  gint focus_width;
-  gint focus_pad;
-};
-
-static const GtkOptionMenuProps default_props = {
-  TRUE,
-  { 7, 13 },
-  { 7, 5, 2, 2 },              /* Left, right, top, bottom */
-  1,
-  0
-};
-
-static void gtk_option_menu_destroy         (GtkObject          *object);
-static void gtk_option_menu_set_property    (GObject            *object,
-                                            guint               prop_id,
-                                            const GValue       *value,
-                                            GParamSpec         *pspec);
-static void gtk_option_menu_get_property    (GObject            *object,
-                                            guint               prop_id,
-                                            GValue             *value,
-                                            GParamSpec         *pspec);
-static void gtk_option_menu_size_request    (GtkWidget          *widget,
-                                            GtkRequisition     *requisition);
-static void gtk_option_menu_size_allocate   (GtkWidget          *widget,
-                                            GtkAllocation      *allocation);
-static void gtk_option_menu_paint           (GtkWidget          *widget,
-                                            GdkRectangle       *area);
-static gint gtk_option_menu_expose          (GtkWidget          *widget,
-                                            GdkEventExpose     *event);
-static gint gtk_option_menu_button_press    (GtkWidget          *widget,
-                                            GdkEventButton     *event);
-static gint gtk_option_menu_key_press      (GtkWidget          *widget,
-                                            GdkEventKey        *event);
-static void gtk_option_menu_selection_done  (GtkMenuShell       *menu_shell,
-                                            GtkOptionMenu      *option_menu);
-static void gtk_option_menu_update_contents (GtkOptionMenu      *option_menu);
-static void gtk_option_menu_remove_contents (GtkOptionMenu      *option_menu);
-static void gtk_option_menu_calc_size       (GtkOptionMenu      *option_menu);
-static void gtk_option_menu_position        (GtkMenu            *menu,
-                                            gint               *x,
-                                            gint               *y,
-                                            gint               *scroll_offet,
-                                            gpointer            user_data);
-static void gtk_option_menu_show_all        (GtkWidget          *widget);
-static void gtk_option_menu_hide_all        (GtkWidget          *widget);
-static gboolean gtk_option_menu_mnemonic_activate (GtkWidget    *widget,
-                                                  gboolean      group_cycling);
-static GType gtk_option_menu_child_type   (GtkContainer       *container);
-static gint gtk_option_menu_scroll_event    (GtkWidget          *widget,
-                                            GdkEventScroll     *event);
-
-enum
-{
-  CHANGED,
-  LAST_SIGNAL
-};
-
-enum
-{
-  PROP_0,
-  PROP_MENU
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-G_DEFINE_TYPE (GtkOptionMenu, gtk_option_menu, GTK_TYPE_BUTTON)
-
-static void
-gtk_option_menu_class_init (GtkOptionMenuClass *class)
-{
-  GObjectClass *gobject_class;
-  GtkObjectClass *object_class;
-  GtkWidgetClass *widget_class;
-  GtkContainerClass *container_class;
-
-  gobject_class = (GObjectClass*) class;
-  object_class = (GtkObjectClass*) class;
-  widget_class = (GtkWidgetClass*) class;
-  container_class = (GtkContainerClass*) class;
-
-  signals[CHANGED] =
-    g_signal_new (I_("changed"),
-                  G_OBJECT_CLASS_TYPE (class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET (GtkOptionMenuClass, changed),
-                  NULL, NULL,
-                  _gtk_marshal_VOID__VOID,
-                  G_TYPE_NONE, 0);
-
-  gobject_class->set_property = gtk_option_menu_set_property;
-  gobject_class->get_property = gtk_option_menu_get_property;
-  object_class->destroy = gtk_option_menu_destroy;
-  
-  widget_class->size_request = gtk_option_menu_size_request;
-  widget_class->size_allocate = gtk_option_menu_size_allocate;
-  widget_class->expose_event = gtk_option_menu_expose;
-  widget_class->button_press_event = gtk_option_menu_button_press;
-  widget_class->key_press_event = gtk_option_menu_key_press;
-  widget_class->scroll_event = gtk_option_menu_scroll_event;
-  widget_class->show_all = gtk_option_menu_show_all;
-  widget_class->hide_all = gtk_option_menu_hide_all;
-  widget_class->mnemonic_activate = gtk_option_menu_mnemonic_activate;
-
-  container_class->child_type = gtk_option_menu_child_type;
-
-  g_object_class_install_property (gobject_class,
-                                   PROP_MENU,
-                                   g_param_spec_object ("menu",
-                                                        P_("Menu"),
-                                                        P_("The menu of options"),
-                                                        GTK_TYPE_MENU,
-                                                        GTK_PARAM_READWRITE));
-  
-  gtk_widget_class_install_style_property (widget_class,
-                                          g_param_spec_boxed ("indicator-size",
-                                                              P_("Indicator Size"),
-                                                              P_("Size of dropdown indicator"),
-                                                              GTK_TYPE_REQUISITION,
-                                                              GTK_PARAM_READABLE));
-  gtk_widget_class_install_style_property (widget_class,
-                                          g_param_spec_boxed ("indicator-spacing",
-                                                              P_("Indicator Spacing"),
-                                                              P_("Spacing around indicator"),
-                                                              GTK_TYPE_BORDER,
-                                                              GTK_PARAM_READABLE));
-}
-
-static GType
-gtk_option_menu_child_type (GtkContainer       *container)
-{
-  return G_TYPE_NONE;
-}
-
-static void
-gtk_option_menu_init (GtkOptionMenu *option_menu)
-{
-  GtkWidget *widget = GTK_WIDGET (option_menu);
-
-  gtk_widget_set_can_focus (widget, TRUE);
-  gtk_widget_set_can_default (widget, FALSE);
-  gtk_widget_set_receives_default (widget, FALSE);
-
-  option_menu->menu = NULL;
-  option_menu->menu_item = NULL;
-  option_menu->width = 0;
-  option_menu->height = 0;
-}
-
-GtkWidget*
-gtk_option_menu_new (void)
-{
-  return g_object_new (GTK_TYPE_OPTION_MENU, NULL);
-}
-
-GtkWidget*
-gtk_option_menu_get_menu (GtkOptionMenu *option_menu)
-{
-  g_return_val_if_fail (GTK_IS_OPTION_MENU (option_menu), NULL);
-
-  return option_menu->menu;
-}
-
-static void
-gtk_option_menu_detacher (GtkWidget     *widget,
-                         GtkMenu       *menu)
-{
-  GtkOptionMenu *option_menu;
-
-  g_return_if_fail (GTK_IS_OPTION_MENU (widget));
-
-  option_menu = GTK_OPTION_MENU (widget);
-  g_return_if_fail (option_menu->menu == (GtkWidget*) menu);
-
-  gtk_option_menu_remove_contents (option_menu);
-  g_signal_handlers_disconnect_by_func (option_menu->menu,
-                                       gtk_option_menu_selection_done,
-                                       option_menu);
-  g_signal_handlers_disconnect_by_func (option_menu->menu,
-                                       gtk_option_menu_calc_size,
-                                       option_menu);
-  
-  option_menu->menu = NULL;
-  g_object_notify (G_OBJECT (option_menu), "menu");
-}
-
-void
-gtk_option_menu_set_menu (GtkOptionMenu *option_menu,
-                         GtkWidget     *menu)
-{
-  g_return_if_fail (GTK_IS_OPTION_MENU (option_menu));
-  g_return_if_fail (GTK_IS_MENU (menu));
-
-  if (option_menu->menu != menu)
-    {
-      gtk_option_menu_remove_menu (option_menu);
-
-      option_menu->menu = menu;
-      gtk_menu_attach_to_widget (GTK_MENU (menu),
-                                GTK_WIDGET (option_menu),
-                                gtk_option_menu_detacher);
-
-      gtk_option_menu_calc_size (option_menu);
-
-      g_signal_connect_after (option_menu->menu, "selection-done",
-                             G_CALLBACK (gtk_option_menu_selection_done),
-                             option_menu);
-      g_signal_connect_swapped (option_menu->menu, "size-request",
-                               G_CALLBACK (gtk_option_menu_calc_size),
-                               option_menu);
-
-      if (GTK_WIDGET (option_menu)->parent)
-       gtk_widget_queue_resize (GTK_WIDGET (option_menu));
-
-      gtk_option_menu_update_contents (option_menu);
-      
-      g_object_notify (G_OBJECT (option_menu), "menu");
-    }
-}
-
-void
-gtk_option_menu_remove_menu (GtkOptionMenu *option_menu)
-{
-  g_return_if_fail (GTK_IS_OPTION_MENU (option_menu));
-
-  if (option_menu->menu)
-    {
-      if (GTK_MENU_SHELL (option_menu->menu)->active)
-       gtk_menu_shell_cancel (GTK_MENU_SHELL (option_menu->menu));
-      
-      gtk_menu_detach (GTK_MENU (option_menu->menu));
-    }
-}
-
-void
-gtk_option_menu_set_history (GtkOptionMenu *option_menu,
-                            guint          index)
-{
-  GtkWidget *menu_item;
-
-  g_return_if_fail (GTK_IS_OPTION_MENU (option_menu));
-
-  if (option_menu->menu)
-    {
-      gtk_menu_set_active (GTK_MENU (option_menu->menu), index);
-      menu_item = gtk_menu_get_active (GTK_MENU (option_menu->menu));
-
-      if (menu_item != option_menu->menu_item)
-        gtk_option_menu_update_contents (option_menu);
-    }
-}
-
-/**
- * gtk_option_menu_get_history:
- * @option_menu: a #GtkOptionMenu
- * 
- * Retrieves the index of the currently selected menu item. The menu
- * items are numbered from top to bottom, starting with 0. 
- * 
- * Return value: index of the selected menu item, or -1 if there are no menu items
- * Deprecated: 2.4: Use #GtkComboBox instead.
- **/
-gint
-gtk_option_menu_get_history (GtkOptionMenu *option_menu)
-{
-  GtkWidget *active_widget;
-  
-  g_return_val_if_fail (GTK_IS_OPTION_MENU (option_menu), -1);
-
-  if (option_menu->menu)
-    {
-      active_widget = gtk_menu_get_active (GTK_MENU (option_menu->menu));
-
-      if (active_widget)
-       return g_list_index (GTK_MENU_SHELL (option_menu->menu)->children,
-                             active_widget);
-      else
-       return -1;
-    }
-  else
-    return -1;
-}
-
-static void
-gtk_option_menu_set_property (GObject            *object,
-                             guint               prop_id,
-                             const GValue       *value,
-                             GParamSpec         *pspec)
-{
-  GtkOptionMenu *option_menu = GTK_OPTION_MENU (object);
-
-  switch (prop_id)
-    {
-    case PROP_MENU:
-      gtk_option_menu_set_menu (option_menu, g_value_get_object (value));
-      break;
-      
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_option_menu_get_property (GObject            *object,
-                             guint               prop_id,
-                             GValue             *value,
-                             GParamSpec         *pspec)
-{
-  GtkOptionMenu *option_menu = GTK_OPTION_MENU (object);
-
-  switch (prop_id)
-    {
-    case PROP_MENU:
-      g_value_set_object (value, option_menu->menu);
-      break;
-      
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_option_menu_destroy (GtkObject *object)
-{
-  GtkOptionMenu *option_menu = GTK_OPTION_MENU (object);
-
-  if (option_menu->menu)
-    gtk_widget_destroy (option_menu->menu);
-
-  GTK_OBJECT_CLASS (gtk_option_menu_parent_class)->destroy (object);
-}
-
-static void
-gtk_option_menu_get_props (GtkOptionMenu       *option_menu,
-                          GtkOptionMenuProps  *props)
-{
-  GtkRequisition *indicator_size;
-  GtkBorder *indicator_spacing;
-  
-  gtk_widget_style_get (GTK_WIDGET (option_menu),
-                       "indicator-size", &indicator_size,
-                       "indicator-spacing", &indicator_spacing,
-                       "interior-focus", &props->interior_focus,
-                       "focus-line-width", &props->focus_width,
-                       "focus-padding", &props->focus_pad,
-                       NULL);
-
-  if (indicator_size)
-    props->indicator_size = *indicator_size;
-  else
-    props->indicator_size = default_props.indicator_size;
-
-  if (indicator_spacing)
-    props->indicator_spacing = *indicator_spacing;
-  else
-    props->indicator_spacing = default_props.indicator_spacing;
-
-  gtk_requisition_free (indicator_size);
-  gtk_border_free (indicator_spacing);
-}
-
-static void
-gtk_option_menu_size_request (GtkWidget      *widget,
-                             GtkRequisition *requisition)
-{
-  GtkOptionMenu *option_menu = GTK_OPTION_MENU (widget);
-  GtkOptionMenuProps props;
-  gint tmp;
-  GtkRequisition child_requisition = { 0, 0 };
-      
-  gtk_option_menu_get_props (option_menu, &props);
-  if (GTK_BIN (option_menu)->child && gtk_widget_get_visible (GTK_BIN (option_menu)->child))
-    {
-      gtk_widget_size_request (GTK_BIN (option_menu)->child, &child_requisition);
-
-      requisition->width += child_requisition.width;
-      requisition->height += child_requisition.height;
-    }
-  
-  requisition->width = ((GTK_CONTAINER (widget)->border_width +
-                        GTK_WIDGET (widget)->style->xthickness + props.focus_pad) * 2 +
-                       MAX (child_requisition.width, option_menu->width) +
-                       props.indicator_size.width +
-                       props.indicator_spacing.left + props.indicator_spacing.right +
-                       CHILD_LEFT_SPACING + CHILD_RIGHT_SPACING + props.focus_width * 2);
-  requisition->height = ((GTK_CONTAINER (widget)->border_width +
-                         GTK_WIDGET (widget)->style->ythickness + props.focus_pad) * 2 +
-                        MAX (child_requisition.height, option_menu->height) +
-                        CHILD_TOP_SPACING + CHILD_BOTTOM_SPACING + props.focus_width * 2);
-
-  tmp = (requisition->height - MAX (child_requisition.height, option_menu->height) +
-        props.indicator_size.height + props.indicator_spacing.top + props.indicator_spacing.bottom);
-  requisition->height = MAX (requisition->height, tmp);
-}
-
-static void
-gtk_option_menu_size_allocate (GtkWidget     *widget,
-                              GtkAllocation *allocation)
-{
-  GtkWidget *child;
-  GtkButton *button = GTK_BUTTON (widget);
-  GtkAllocation child_allocation;
-  GtkOptionMenuProps props;
-  gint border_width;
-    
-  gtk_option_menu_get_props (GTK_OPTION_MENU (widget), &props);
-  border_width = GTK_CONTAINER (widget)->border_width;
-
-  widget->allocation = *allocation;
-  if (gtk_widget_get_realized (widget))
-    gdk_window_move_resize (button->event_window,
-                           allocation->x + border_width, allocation->y + border_width,
-                           allocation->width - border_width * 2, allocation->height - border_width * 2);
-
-  child = GTK_BIN (widget)->child;
-  if (child && gtk_widget_get_visible (child))
-    {
-      gint xthickness = GTK_WIDGET (widget)->style->xthickness;
-      gint ythickness = GTK_WIDGET (widget)->style->ythickness;
-      
-      child_allocation.x = widget->allocation.x + border_width + xthickness + props.focus_width + props.focus_pad + CHILD_LEFT_SPACING;
-      child_allocation.y = widget->allocation.y + border_width + ythickness + props.focus_width + props.focus_pad + CHILD_TOP_SPACING;
-      child_allocation.width = MAX (1, allocation->width - (border_width + xthickness + props.focus_width + props.focus_pad) * 2 -
-                                   props.indicator_size.width - props.indicator_spacing.left - props.indicator_spacing.right -
-                                   CHILD_LEFT_SPACING - CHILD_RIGHT_SPACING);
-      child_allocation.height = MAX (1, allocation->height - (border_width + ythickness + props.focus_width + props.focus_pad) * 2 -
-                                    CHILD_TOP_SPACING - CHILD_BOTTOM_SPACING);
-
-      if (gtk_widget_get_direction (GTK_WIDGET (widget)) == GTK_TEXT_DIR_RTL) 
-       child_allocation.x += props.indicator_size.width + props.indicator_spacing.left + props.indicator_spacing.right;
-
-      gtk_widget_size_allocate (child, &child_allocation);
-    }
-}
-
-static void
-gtk_option_menu_paint (GtkWidget    *widget,
-                      GdkRectangle *area)
-{
-  GdkRectangle button_area;
-  GtkOptionMenuProps props;
-  gint border_width;
-  gint tab_x;
-
-  g_return_if_fail (GTK_IS_OPTION_MENU (widget));
-  g_return_if_fail (area != NULL);
-
-  if (GTK_WIDGET_DRAWABLE (widget))
-    {
-      border_width = GTK_CONTAINER (widget)->border_width;
-      gtk_option_menu_get_props (GTK_OPTION_MENU (widget), &props);
-
-      button_area.x = widget->allocation.x + border_width;
-      button_area.y = widget->allocation.y + border_width;
-      button_area.width = widget->allocation.width - 2 * border_width;
-      button_area.height = widget->allocation.height - 2 * border_width;
-
-      if (!props.interior_focus && gtk_widget_has_focus (widget))
-       {
-         button_area.x += props.focus_width + props.focus_pad;
-         button_area.y += props.focus_width + props.focus_pad;
-         button_area.width -= 2 * (props.focus_width + props.focus_pad);
-         button_area.height -= 2 * (props.focus_width + props.focus_pad);
-       }
-      
-      gtk_paint_box (widget->style, widget->window,
-                    gtk_widget_get_state (widget), GTK_SHADOW_OUT,
-                    area, widget, "optionmenu",
-                    button_area.x, button_area.y,
-                    button_area.width, button_area.height);
-      
-      if (gtk_widget_get_direction (GTK_WIDGET (widget)) == GTK_TEXT_DIR_RTL) 
-       tab_x = button_area.x + props.indicator_spacing.right + 
-         widget->style->xthickness;
-      else
-       tab_x = button_area.x + button_area.width - 
-         props.indicator_size.width - props.indicator_spacing.right -
-         widget->style->xthickness;
-
-      gtk_paint_tab (widget->style, widget->window,
-                    gtk_widget_get_state (widget), GTK_SHADOW_OUT,
-                    area, widget, "optionmenutab",
-                    tab_x,
-                    button_area.y + (button_area.height - props.indicator_size.height) / 2,
-                    props.indicator_size.width, props.indicator_size.height);
-      
-      if (gtk_widget_has_focus (widget))
-       {
-         if (props.interior_focus)
-           {
-             button_area.x += widget->style->xthickness + props.focus_pad;
-             button_area.y += widget->style->ythickness + props.focus_pad;
-             button_area.width -= 2 * (widget->style->xthickness + props.focus_pad) +
-                     props.indicator_spacing.left +
-                     props.indicator_spacing.right +
-                     props.indicator_size.width;
-             button_area.height -= 2 * (widget->style->ythickness + props.focus_pad);
-             if (gtk_widget_get_direction (GTK_WIDGET (widget)) == GTK_TEXT_DIR_RTL) 
-               button_area.x += props.indicator_spacing.left +
-                 props.indicator_spacing.right +
-                 props.indicator_size.width;
-           }
-         else
-           {
-             button_area.x -= props.focus_width + props.focus_pad;
-             button_area.y -= props.focus_width + props.focus_pad;
-             button_area.width += 2 * (props.focus_width + props.focus_pad);
-             button_area.height += 2 * (props.focus_width + props.focus_pad);
-           }
-           
-         gtk_paint_focus (widget->style, widget->window, gtk_widget_get_state (widget),
-                          area, widget, "button",
-                          button_area.x, 
-                          button_area.y, 
-                          button_area.width,
-                          button_area.height);
-       }
-    }
-}
-
-static gint
-gtk_option_menu_expose (GtkWidget      *widget,
-                       GdkEventExpose *event)
-{
-  g_return_val_if_fail (GTK_IS_OPTION_MENU (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-
-  if (GTK_WIDGET_DRAWABLE (widget))
-    {
-      gtk_option_menu_paint (widget, &event->area);
-
-
-      /* The following code tries to draw the child in two places at
-       * once. It fails miserably for several reasons
-       *
-       * - If the child is not no-window, removing generates
-       *   more expose events. Bad, bad, bad.
-       * 
-       * - Even if the child is no-window, removing it now (properly)
-       *   clears the space where it was, so it does no good
-       */
-      
-#if 0
-      remove_child = FALSE;
-      child = GTK_BUTTON (widget)->child;
-
-      if (!child)
-       {
-         if (!GTK_OPTION_MENU (widget)->menu)
-           return FALSE;
-         gtk_option_menu_update_contents (GTK_OPTION_MENU (widget));
-         child = GTK_BUTTON (widget)->child;
-         if (!child)
-           return FALSE;
-         remove_child = TRUE;
-       }
-
-      child_event = *event;
-
-      if (!gtk_widget_get_has_window (child) &&
-         gtk_widget_intersect (child, &event->area, &child_event.area))
-       gtk_widget_event (child, (GdkEvent*) &child_event);
-
-      if (remove_child)
-       gtk_option_menu_remove_contents (GTK_OPTION_MENU (widget));
-#else
-      if (GTK_BIN (widget)->child)
-       gtk_container_propagate_expose (GTK_CONTAINER (widget),
-                                       GTK_BIN (widget)->child,
-                                       event);
-#endif /* 0 */
-    }
-
-  return FALSE;
-}
-
-static gint
-gtk_option_menu_button_press (GtkWidget      *widget,
-                             GdkEventButton *event)
-{
-  GtkOptionMenu *option_menu;
-  GtkWidget *menu_item;
-
-  g_return_val_if_fail (GTK_IS_OPTION_MENU (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-
-  option_menu = GTK_OPTION_MENU (widget);
-
-  if ((event->type == GDK_BUTTON_PRESS) &&
-      (event->button == 1))
-    {
-      gtk_option_menu_remove_contents (option_menu);
-      gtk_menu_popup (GTK_MENU (option_menu->menu), NULL, NULL,
-                     gtk_option_menu_position, option_menu,
-                     event->button, event->time);
-      menu_item = gtk_menu_get_active (GTK_MENU (option_menu->menu));
-      if (menu_item)
-       gtk_menu_shell_select_item (GTK_MENU_SHELL (option_menu->menu), menu_item);
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
-static gint
-gtk_option_menu_key_press (GtkWidget   *widget,
-                          GdkEventKey *event)
-{
-  GtkOptionMenu *option_menu;
-  GtkWidget *menu_item;
-
-  g_return_val_if_fail (GTK_IS_OPTION_MENU (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-
-  option_menu = GTK_OPTION_MENU (widget);
-
-  switch (event->keyval)
-    {
-    case GDK_KP_Space:
-    case GDK_space:
-      gtk_option_menu_remove_contents (option_menu);
-      gtk_menu_popup (GTK_MENU (option_menu->menu), NULL, NULL,
-                     gtk_option_menu_position, option_menu,
-                     0, event->time);
-      menu_item = gtk_menu_get_active (GTK_MENU (option_menu->menu));
-      if (menu_item)
-       gtk_menu_shell_select_item (GTK_MENU_SHELL (option_menu->menu), menu_item);
-      return TRUE;
-    }
-  
-  return FALSE;
-}
-
-static void
-gtk_option_menu_selection_done (GtkMenuShell  *menu_shell,
-                               GtkOptionMenu *option_menu)
-{
-  g_return_if_fail (menu_shell != NULL);
-  g_return_if_fail (GTK_IS_OPTION_MENU (option_menu));
-
-  gtk_option_menu_update_contents (option_menu);
-}
-
-static void
-gtk_option_menu_changed (GtkOptionMenu *option_menu)
-{
-  g_return_if_fail (GTK_IS_OPTION_MENU (option_menu));
-
-  g_signal_emit (option_menu, signals[CHANGED], 0);
-}
-
-static void
-gtk_option_menu_select_first_sensitive (GtkOptionMenu *option_menu)
-{
-  if (option_menu->menu)
-    {
-      GList *children = GTK_MENU_SHELL (option_menu->menu)->children;
-      gint index = 0;
-
-      while (children)
-       {
-         if (gtk_widget_get_sensitive (children->data))
-           {
-             gtk_option_menu_set_history (option_menu, index);
-             return;
-           }
-         
-         children = children->next;
-         index++;
-       }
-    }
-}
-
-static void
-gtk_option_menu_item_state_changed_cb (GtkWidget      *widget,
-                                      GtkStateType    previous_state,
-                                      GtkOptionMenu  *option_menu)
-{
-  GtkWidget *child = GTK_BIN (option_menu)->child;
-
-  if (child && gtk_widget_get_sensitive (child) != gtk_widget_is_sensitive (widget))
-    gtk_widget_set_sensitive (child, gtk_widget_is_sensitive (widget));
-}
-
-static void
-gtk_option_menu_item_destroy_cb (GtkWidget     *widget,
-                                GtkOptionMenu *option_menu)
-{
-  GtkWidget *child = GTK_BIN (option_menu)->child;
-
-  if (child)
-    {
-      g_object_ref (child);
-      gtk_option_menu_remove_contents (option_menu);
-      gtk_widget_destroy (child);
-      g_object_unref (child);
-
-      gtk_option_menu_select_first_sensitive (option_menu);
-    }
-}
-
-static void
-gtk_option_menu_update_contents (GtkOptionMenu *option_menu)
-{
-  GtkWidget *child;
-  GtkRequisition child_requisition;
-
-  g_return_if_fail (GTK_IS_OPTION_MENU (option_menu));
-
-  if (option_menu->menu)
-    {
-      GtkWidget *old_item = option_menu->menu_item;
-      
-      gtk_option_menu_remove_contents (option_menu);
-
-      option_menu->menu_item = gtk_menu_get_active (GTK_MENU (option_menu->menu));
-      if (option_menu->menu_item)
-       {
-         g_object_ref (option_menu->menu_item);
-         child = GTK_BIN (option_menu->menu_item)->child;
-         if (child)
-           {
-             if (!gtk_widget_is_sensitive (option_menu->menu_item))
-               gtk_widget_set_sensitive (child, FALSE);
-             gtk_widget_reparent (child, GTK_WIDGET (option_menu));
-           }
-
-         g_signal_connect (option_menu->menu_item, "state-changed",
-                           G_CALLBACK (gtk_option_menu_item_state_changed_cb), option_menu);
-         g_signal_connect (option_menu->menu_item, "destroy",
-                           G_CALLBACK (gtk_option_menu_item_destroy_cb), option_menu);
-
-         gtk_widget_size_request (child, &child_requisition);
-         gtk_widget_size_allocate (GTK_WIDGET (option_menu),
-                                   &(GTK_WIDGET (option_menu)->allocation));
-
-         if (GTK_WIDGET_DRAWABLE (option_menu))
-           gtk_widget_queue_draw (GTK_WIDGET (option_menu));
-       }
-
-      if (old_item != option_menu->menu_item)
-        gtk_option_menu_changed (option_menu);
-    }
-}
-
-static void
-gtk_option_menu_remove_contents (GtkOptionMenu *option_menu)
-{
-  GtkWidget *child;
-  
-  g_return_if_fail (GTK_IS_OPTION_MENU (option_menu));
-
-  if (option_menu->menu_item)
-    {
-      child = GTK_BIN (option_menu)->child;
-  
-      if (child)
-       {
-         gtk_widget_set_sensitive (child, TRUE);
-         gtk_widget_set_state (child, GTK_STATE_NORMAL);
-         gtk_widget_reparent (child, option_menu->menu_item);
-       }
-
-      g_signal_handlers_disconnect_by_func (option_menu->menu_item,
-                                           gtk_option_menu_item_state_changed_cb,
-                                           option_menu);                                    
-      g_signal_handlers_disconnect_by_func (option_menu->menu_item,
-                                           gtk_option_menu_item_destroy_cb,
-                                           option_menu);   
-      
-      g_object_unref (option_menu->menu_item);
-      option_menu->menu_item = NULL;
-    }
-}
-
-static void
-gtk_option_menu_calc_size (GtkOptionMenu *option_menu)
-{
-  GtkWidget *child;
-  GList *children;
-  GtkRequisition child_requisition;
-  gint old_width = option_menu->width;
-  gint old_height = option_menu->height;
-
-  g_return_if_fail (GTK_IS_OPTION_MENU (option_menu));
-
-  option_menu->width = 0;
-  option_menu->height = 0;
-
-  if (option_menu->menu)
-    {
-      children = GTK_MENU_SHELL (option_menu->menu)->children;
-      while (children)
-       {
-         child = children->data;
-         children = children->next;
-
-         if (gtk_widget_get_visible (child))
-           {
-             GtkWidget *inner = GTK_BIN (child)->child;
-
-             if (inner)
-               {
-                 gtk_widget_size_request (inner, &child_requisition);
-
-                 option_menu->width = MAX (option_menu->width, child_requisition.width);
-                 option_menu->height = MAX (option_menu->height, child_requisition.height);
-               }
-           }
-       }
-    }
-
-  if (old_width != option_menu->width || old_height != option_menu->height)
-    gtk_widget_queue_resize (GTK_WIDGET (option_menu));
-}
-
-static void
-gtk_option_menu_position (GtkMenu  *menu,
-                         gint     *x,
-                         gint     *y,
-                         gboolean *push_in,
-                         gpointer  user_data)
-{
-  GtkOptionMenu *option_menu;
-  GtkWidget *active;
-  GtkWidget *child;
-  GtkWidget *widget;
-  GtkRequisition requisition;
-  GList *children;
-  gint screen_width;
-  gint menu_xpos;
-  gint menu_ypos;
-  gint menu_width;
-
-  g_return_if_fail (GTK_IS_OPTION_MENU (user_data));
-
-  option_menu = GTK_OPTION_MENU (user_data);
-  widget = GTK_WIDGET (option_menu);
-
-  gtk_widget_get_child_requisition (GTK_WIDGET (menu), &requisition);
-  menu_width = requisition.width;
-
-  active = gtk_menu_get_active (GTK_MENU (option_menu->menu));
-  gdk_window_get_origin (widget->window, &menu_xpos, &menu_ypos);
-
-  /* set combo box type hint for menu popup */
-  gtk_window_set_type_hint (GTK_WINDOW (GTK_MENU (option_menu->menu)->toplevel),
-                           GDK_WINDOW_TYPE_HINT_COMBO);
-
-  menu_xpos += widget->allocation.x;
-  menu_ypos += widget->allocation.y + widget->allocation.height / 2 - 2;
-
-  if (active != NULL)
-    {
-      gtk_widget_get_child_requisition (active, &requisition);
-      menu_ypos -= requisition.height / 2;
-    }
-
-  children = GTK_MENU_SHELL (option_menu->menu)->children;
-  while (children)
-    {
-      child = children->data;
-
-      if (active == child)
-       break;
-
-      if (gtk_widget_get_visible (child))
-       {
-         gtk_widget_get_child_requisition (child, &requisition);
-         menu_ypos -= requisition.height;
-       }
-
-      children = children->next;
-    }
-
-  if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
-    menu_xpos = menu_xpos + widget->allocation.width - menu_width;
-
-  /* Clamp the position on screen */
-  screen_width = gdk_screen_get_width (gtk_widget_get_screen (widget));
-  
-  if (menu_xpos < 0)
-    menu_xpos = 0;
-  else if ((menu_xpos + menu_width) > screen_width)
-    menu_xpos -= ((menu_xpos + menu_width) - screen_width);
-
-  *x = menu_xpos;
-  *y = menu_ypos;
-  *push_in = TRUE;
-}
-
-
-static void
-gtk_option_menu_show_all (GtkWidget *widget)
-{
-  GtkContainer *container;
-  GtkOptionMenu *option_menu;
-  
-  g_return_if_fail (GTK_IS_OPTION_MENU (widget));
-  container = GTK_CONTAINER (widget);
-  option_menu = GTK_OPTION_MENU (widget);
-
-  gtk_widget_show (widget);
-  gtk_container_foreach (container, (GtkCallback) gtk_widget_show_all, NULL);
-  if (option_menu->menu)
-    gtk_widget_show_all (option_menu->menu);
-  if (option_menu->menu_item)
-    gtk_widget_show_all (option_menu->menu_item);
-}
-
-
-static void
-gtk_option_menu_hide_all (GtkWidget *widget)
-{
-  GtkContainer *container;
-
-  g_return_if_fail (GTK_IS_OPTION_MENU (widget));
-  container = GTK_CONTAINER (widget);
-
-  gtk_widget_hide (widget);
-  gtk_container_foreach (container, (GtkCallback) gtk_widget_hide_all, NULL);
-}
-
-static gboolean
-gtk_option_menu_mnemonic_activate (GtkWidget *widget,
-                                  gboolean   group_cycling)
-{
-  gtk_widget_grab_focus (widget);
-  return TRUE;
-}
-
-static gint
-gtk_option_menu_scroll_event (GtkWidget          *widget,
-                             GdkEventScroll     *event)
-{
-  GtkOptionMenu *option_menu = GTK_OPTION_MENU (widget);
-  gint index;
-  gint n_children;
-  gint index_dir;
-  GList *l;
-  GtkMenuItem *item;
-    
-  index = gtk_option_menu_get_history (option_menu);
-
-  if (index != -1)
-    {
-      n_children = g_list_length (GTK_MENU_SHELL (option_menu->menu)->children);
-      
-      if (event->direction == GDK_SCROLL_UP)
-       index_dir = -1;
-      else
-       index_dir = 1;
-
-
-      while (TRUE)
-       {
-         index += index_dir;
-
-         if (index < 0)
-           break;
-         if (index >= n_children)
-           break;
-
-         l = g_list_nth (GTK_MENU_SHELL (option_menu->menu)->children, index);
-         item = GTK_MENU_ITEM (l->data);
-         if (gtk_widget_get_visible (GTK_WIDGET (item)) &&
-              gtk_widget_is_sensitive (GTK_WIDGET (item)))
-           {
-             gtk_option_menu_set_history (option_menu, index);
-             gtk_menu_item_activate (GTK_MENU_ITEM (item));
-             break;
-           }
-             
-       }
-    }
-
-  return TRUE;
-}
-
-#define __GTK_OPTION_MENU_C__
-#include "gtkaliasdef.c"
-
diff --git a/gtk/gtkoptionmenu.h b/gtk/gtkoptionmenu.h
deleted file mode 100644 (file)
index 8521020..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * 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
- * 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.
- */
-
-/*
- * 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/. 
- */
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-#ifndef __GTK_OPTION_MENU_H__
-#define __GTK_OPTION_MENU_H__
-
-#include <gtk/gtk.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_OPTION_MENU              (gtk_option_menu_get_type ())
-#define GTK_OPTION_MENU(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_OPTION_MENU, GtkOptionMenu))
-#define GTK_OPTION_MENU_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_OPTION_MENU, GtkOptionMenuClass))
-#define GTK_IS_OPTION_MENU(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_OPTION_MENU))
-#define GTK_IS_OPTION_MENU_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_OPTION_MENU))
-#define GTK_OPTION_MENU_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_OPTION_MENU, GtkOptionMenuClass))
-
-
-typedef struct _GtkOptionMenu       GtkOptionMenu;
-typedef struct _GtkOptionMenuClass  GtkOptionMenuClass;
-
-struct _GtkOptionMenu
-{
-  GtkButton button;
-  
-  GtkWidget *menu;
-  GtkWidget *menu_item;
-  
-  guint16 width;
-  guint16 height;
-};
-
-struct _GtkOptionMenuClass
-{
-  GtkButtonClass parent_class;
-
-  void (*changed) (GtkOptionMenu *option_menu);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType      gtk_option_menu_get_type    (void) G_GNUC_CONST;
-GtkWidget* gtk_option_menu_new         (void);
-GtkWidget* gtk_option_menu_get_menu    (GtkOptionMenu *option_menu);
-void       gtk_option_menu_set_menu    (GtkOptionMenu *option_menu,
-                                       GtkWidget     *menu);
-void       gtk_option_menu_remove_menu (GtkOptionMenu *option_menu);
-gint       gtk_option_menu_get_history (GtkOptionMenu *option_menu);
-void       gtk_option_menu_set_history (GtkOptionMenu *option_menu,
-                                       guint          index_);
-
-
-G_END_DECLS
-
-#endif /* __GTK_OPTION_MENU_H__ */
-
-#endif /* GTK_DISABLE_DEPRECATED */