commit b7c37ff8ad58adb765a92e00910bb51509a75c77
parent 1f5a512b8539864f17ebdff70e4a2bb3dd7c1ca1
Author: Ricardo Mones <ricardo@mones.org>
Date: Tue, 13 Feb 2018 12:49:44 +0100
Require GTK+3 in gtk3 branch
Also remove a couple of GTK+2 specific files
Diffstat:
4 files changed, 3 insertions(+), 1174 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -10,7 +10,7 @@ dnl version number
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=
+EXTRA_GTK3_VERSION=
if test \( -d .git \); then
AC_CHECK_PROG([GIT], [git], [yes], [no], [$PATH])
@@ -39,7 +39,7 @@ else
fi
if test \( "x$EXTRA_RELEASE" != "x" \); then
- VERSION=${VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
+ VERSION=${VERSION}${EXTRA_RELEASE}${EXTRA_GTK3_VERSION}
fi
dnl set $target
@@ -286,10 +286,6 @@ AC_ARG_ENABLE(alternate-addressbook,
[ --enable-alternate-addressbook Build alternate external address book support],
[enable_alternate_addressbook=$enableval], [enable_alternate_addressbook=no])
-AC_ARG_ENABLE(gtk3,
- [ --enable-gtk3 Build GTK3 support],
- [enable_gtk3=$enableval], [enable_gtk3=no])
-
AC_ARG_ENABLE(svg,
[ --disable-svg Do not build SVG support],
[enable_svg=$enableval], [enable_svg=yes])
@@ -566,15 +562,7 @@ dnl ** GTK user interface **
dnl ************************
dnl Checks for GTK
-AM_CONDITIONAL(GTK3, false)
-AM_CONDITIONAL(GTK2, true)
-if test x"$enable_gtk3" = x"yes"; then
- PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.2 cairo)
- AM_CONDITIONAL(GTK3, true)
- AM_CONDITIONAL(GTK2, false)
-else
- PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.24)
-fi
+PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.2 cairo)
AC_ARG_ENABLE(deprecated,
[ --disable-deprecated Disable deprecated GTK functions],
[GTK_CFLAGS="$GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"], [])
diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am
@@ -11,11 +11,6 @@ noinst_LTLIBRARIES = libclawsgtk.la
EXTRA_DIST = \
claws-marshal.list
-if GTK2
-gtk2_sources = \
- gtkcmoptionmenu.c
-endif
-
if OS_WIN32
arch_sources = w32_filesel.c
else
@@ -35,7 +30,6 @@ libclawsgtk_la_SOURCES = \
gtkcmclist.c \
gtksctree.c \
gtkunit.c \
- $(gtk2_sources) \
gtkshruler.c \
gtkutils.c \
gtkvscrollbutton.c \
diff --git a/src/gtk/gtkcmoptionmenu.c b/src/gtk/gtkcmoptionmenu.c
@@ -1,1067 +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 <glib.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-
-#include "claws-marshal.h"
-#include "gtkcmoptionmenu.h"
-#include "utils.h"
-#include "gtkutils.h"
-
-#define CHILD_LEFT_SPACING 4
-#define CHILD_RIGHT_SPACING 1
-#define CHILD_TOP_SPACING 1
-#define CHILD_BOTTOM_SPACING 1
-
-typedef struct _GtkCMOptionMenuProps GtkCMOptionMenuProps;
-
-struct _GtkCMOptionMenuProps
-{
- gboolean interior_focus;
- GtkRequisition indicator_size;
- GtkBorder indicator_spacing;
- gint focus_width;
- gint focus_pad;
-};
-
-static const GtkCMOptionMenuProps default_props = {
- TRUE,
- { 7, 13 },
- { 7, 5, 2, 2 }, /* Left, right, top, bottom */
- 1,
- 0
-};
-
-static void gtk_cmoption_menu_destroy (GtkObject *object);
-static void gtk_cmoption_menu_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static void gtk_cmoption_menu_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
-static void gtk_cmoption_menu_size_request (GtkWidget *widget,
- GtkRequisition *requisition);
-static void gtk_cmoption_menu_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation);
-static void gtk_cmoption_menu_paint (GtkWidget *widget,
- GdkRectangle *area);
-static gint gtk_cmoption_menu_expose (GtkWidget *widget,
- GdkEventExpose *event);
-static gint gtk_cmoption_menu_button_press (GtkWidget *widget,
- GdkEventButton *event);
-static gint gtk_cmoption_menu_key_press (GtkWidget *widget,
- GdkEventKey *event);
-static void gtk_cmoption_menu_selection_done (GtkMenuShell *menu_shell,
- GtkCMOptionMenu *option_menu);
-static void gtk_cmoption_menu_update_contents (GtkCMOptionMenu *option_menu);
-static void gtk_cmoption_menu_remove_contents (GtkCMOptionMenu *option_menu);
-static void gtk_cmoption_menu_calc_size (GtkCMOptionMenu *option_menu);
-static void gtk_cmoption_menu_position (GtkMenu *menu,
- gint *x,
- gint *y,
- gint *scroll_offet,
- gpointer user_data);
-static void gtk_cmoption_menu_show_all (GtkWidget *widget);
-static void gtk_cmoption_menu_hide_all (GtkWidget *widget);
-static gboolean gtk_cmoption_menu_mnemonic_activate (GtkWidget *widget,
- gboolean group_cycling);
-static GType gtk_cmoption_menu_child_type (GtkContainer *container);
-static gint gtk_cmoption_menu_scroll_event (GtkWidget *widget,
- GdkEventScroll *event);
-
-enum
-{
- CHANGED,
- LAST_SIGNAL
-};
-
-enum
-{
- PROP_0,
- PROP_MENU,
- LAST_PROP
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-G_DEFINE_TYPE (GtkCMOptionMenu, gtk_cmoption_menu, GTK_TYPE_BUTTON)
-
-static void
-gtk_cmoption_menu_class_init (GtkCMOptionMenuClass *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 (("changed"),
- G_OBJECT_CLASS_TYPE (class),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GtkCMOptionMenuClass, changed),
- NULL, NULL,
- claws_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
-
- gobject_class->set_property = gtk_cmoption_menu_set_property;
- gobject_class->get_property = gtk_cmoption_menu_get_property;
- object_class->destroy = gtk_cmoption_menu_destroy;
-
- widget_class->size_request = gtk_cmoption_menu_size_request;
- widget_class->size_allocate = gtk_cmoption_menu_size_allocate;
- widget_class->expose_event = gtk_cmoption_menu_expose;
- widget_class->button_press_event = gtk_cmoption_menu_button_press;
- widget_class->key_press_event = gtk_cmoption_menu_key_press;
- widget_class->scroll_event = gtk_cmoption_menu_scroll_event;
- widget_class->show_all = gtk_cmoption_menu_show_all;
- widget_class->hide_all = gtk_cmoption_menu_hide_all;
- widget_class->mnemonic_activate = gtk_cmoption_menu_mnemonic_activate;
-
- container_class->child_type = gtk_cmoption_menu_child_type;
-
- g_object_class_install_property (gobject_class,
- PROP_MENU,
- g_param_spec_object ("menu",
- ("Menu"),
- ("The menu of options"),
- GTK_TYPE_MENU,
- G_PARAM_READWRITE));
-
- gtk_widget_class_install_style_property (widget_class,
- g_param_spec_boxed ("indicator-size",
- ("Indicator Size"),
- ("Size of dropdown indicator"),
- GTK_TYPE_REQUISITION,
- G_PARAM_READABLE));
- gtk_widget_class_install_style_property (widget_class,
- g_param_spec_boxed ("indicator-spacing",
- ("Indicator Spacing"),
- ("Spacing around indicator"),
- GTK_TYPE_BORDER,
- G_PARAM_READABLE));
-}
-
-static GType
-gtk_cmoption_menu_child_type (GtkContainer *container)
-{
- return G_TYPE_NONE;
-}
-
-static void
-gtk_cmoption_menu_init (GtkCMOptionMenu *option_menu)
-{
- gtk_widget_set_can_focus (GTK_WIDGET(option_menu), TRUE);
- gtk_widget_set_can_default (GTK_WIDGET(option_menu), FALSE);
- gtk_widget_set_receives_default (GTK_WIDGET(option_menu), FALSE);
-
- option_menu->menu = NULL;
- option_menu->menu_item = NULL;
- option_menu->width = 0;
- option_menu->height = 0;
-}
-
-GtkWidget*
-gtk_cmoption_menu_new (void)
-{
- return g_object_new (GTK_TYPE_CMOPTION_MENU, NULL);
-}
-
-GtkWidget*
-gtk_cmoption_menu_get_menu (GtkCMOptionMenu *option_menu)
-{
- cm_return_val_if_fail (GTK_IS_CMOPTION_MENU (option_menu), NULL);
-
- return option_menu->menu;
-}
-
-static void
-gtk_cmoption_menu_detacher (GtkWidget *widget,
- GtkMenu *menu)
-{
- GtkCMOptionMenu *option_menu;
-
- cm_return_if_fail (GTK_IS_CMOPTION_MENU (widget));
-
- option_menu = GTK_CMOPTION_MENU (widget);
- cm_return_if_fail (option_menu->menu == (GtkWidget*) menu);
-
- gtk_cmoption_menu_remove_contents (option_menu);
- g_signal_handlers_disconnect_by_func (option_menu->menu,
- gtk_cmoption_menu_selection_done,
- option_menu);
- g_signal_handlers_disconnect_by_func (option_menu->menu,
- gtk_cmoption_menu_calc_size,
- option_menu);
-
- option_menu->menu = NULL;
- g_object_notify (G_OBJECT (option_menu), "menu");
-}
-
-void
-gtk_cmoption_menu_set_menu (GtkCMOptionMenu *option_menu,
- GtkWidget *menu)
-{
- cm_return_if_fail (GTK_IS_CMOPTION_MENU (option_menu));
- cm_return_if_fail (GTK_IS_MENU (menu));
-
- if (option_menu->menu != menu)
- {
- gtk_cmoption_menu_remove_menu (option_menu);
-
- option_menu->menu = menu;
- gtk_menu_attach_to_widget (GTK_MENU (menu),
- GTK_WIDGET (option_menu),
- gtk_cmoption_menu_detacher);
-
- gtk_cmoption_menu_calc_size (option_menu);
-
- g_signal_connect_after (option_menu->menu, "selection-done",
- G_CALLBACK (gtk_cmoption_menu_selection_done),
- option_menu);
- g_signal_connect_swapped (option_menu->menu, "size_request",
- G_CALLBACK (gtk_cmoption_menu_calc_size),
- option_menu);
-
- if (gtk_widget_get_parent (GTK_WIDGET (option_menu)))
- gtk_widget_queue_resize (GTK_WIDGET (option_menu));
-
- gtk_cmoption_menu_update_contents (option_menu);
-
- g_object_notify (G_OBJECT (option_menu), "menu");
- }
-}
-
-void
-gtk_cmoption_menu_remove_menu (GtkCMOptionMenu *option_menu)
-{
- cm_return_if_fail (GTK_IS_CMOPTION_MENU (option_menu));
-
- if (option_menu->menu)
- {
- if (option_menu->menu_item ==
- gtk_menu_get_active (GTK_MENU (option_menu->menu)))
- gtk_menu_shell_cancel (GTK_MENU_SHELL (option_menu->menu));
-
- gtk_menu_detach (GTK_MENU (option_menu->menu));
- }
-}
-
-void
-gtk_cmoption_menu_set_history (GtkCMOptionMenu *option_menu,
- guint index)
-{
- GtkWidget *menu_item;
-
- cm_return_if_fail (GTK_IS_CMOPTION_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_cmoption_menu_update_contents (option_menu);
- }
-}
-
-/**
- * gtk_cmoption_menu_get_history:
- * @option_menu: a #GtkCMOptionMenu
- *
- * 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_cmoption_menu_get_history (GtkCMOptionMenu *option_menu)
-{
- GtkWidget *active_widget;
- GList *list;
- gint index;
-
- cm_return_val_if_fail (GTK_IS_CMOPTION_MENU (option_menu), -1);
-
- if (option_menu->menu)
- {
- active_widget = gtk_menu_get_active (GTK_MENU (option_menu->menu));
-
- if (active_widget)
- {
- list = gtk_container_get_children (GTK_CONTAINER
- (GTK_MENU_SHELL (option_menu->menu)));
- index = g_list_index (list, active_widget);
- g_list_free (list);
-
- return index;
- }
- else
- return -1;
- }
- else
- return -1;
-}
-
-static void
-gtk_cmoption_menu_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- GtkCMOptionMenu *option_menu = GTK_CMOPTION_MENU (object);
-
- switch (prop_id)
- {
- case PROP_MENU:
- gtk_cmoption_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_cmoption_menu_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
-{
- GtkCMOptionMenu *option_menu = GTK_CMOPTION_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_cmoption_menu_destroy (GtkObject *object)
-{
- GtkCMOptionMenu *option_menu;
-
- cm_return_if_fail (GTK_IS_CMOPTION_MENU (object));
-
- option_menu = GTK_CMOPTION_MENU (object);
-
- if (option_menu->menu)
- gtk_widget_destroy (option_menu->menu);
-
- if (GTK_OBJECT_CLASS (gtk_cmoption_menu_parent_class)->destroy)
- (* GTK_OBJECT_CLASS (gtk_cmoption_menu_parent_class)->destroy) (object);
-}
-
-static void
-gtk_cmoption_menu_get_props (GtkCMOptionMenu *option_menu,
- GtkCMOptionMenuProps *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_cmoption_menu_size_request (GtkWidget *widget,
- GtkRequisition *requisition)
-{
- GtkCMOptionMenu *option_menu = GTK_CMOPTION_MENU (widget);
- GtkCMOptionMenuProps props;
- gint tmp;
- GtkWidget *child;
- GtkRequisition child_requisition = { 0, 0 };
- GtkStyle *style;
- gint border_width;
-
- gtk_cmoption_menu_get_props (option_menu, &props);
-
- child = gtk_bin_get_child (GTK_BIN (option_menu));
- if (child && gtk_widget_get_visible (child))
- {
- gtk_widget_size_request (child, &child_requisition);
-
- requisition->width += child_requisition.width;
- requisition->height += child_requisition.height;
- }
-
- border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
- style = gtk_widget_get_style (widget);
- requisition->width = ((border_width +
- 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 = ((border_width +
- 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_cmoption_menu_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation)
-{
- GtkWidget *child;
- GtkStyle *style;
- GtkButton *button = GTK_BUTTON (widget);
- GtkAllocation child_allocation, widget_allocation;
- GtkCMOptionMenuProps props;
- gint border_width;
-
- gtk_cmoption_menu_get_props (GTK_CMOPTION_MENU (widget), &props);
- border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
-
- gtk_widget_set_allocation (widget, allocation);
- if (gtk_widget_get_realized (widget))
- gdk_window_move_resize (gtk_button_get_event_window (button),
- allocation->x + border_width, allocation->y + border_width,
- allocation->width - border_width * 2, allocation->height - border_width * 2);
-
- child = gtk_bin_get_child (GTK_BIN (widget));
- if (child && gtk_widget_get_visible (child))
- {
- style = gtk_widget_get_style (widget);
- gint xthickness = style->xthickness;
- gint ythickness = style->ythickness;
-
- gtk_widget_get_allocation (widget, &widget_allocation);
- 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_cmoption_menu_paint (GtkWidget *widget,
- GdkRectangle *area)
-{
- GtkAllocation allocation;
- GtkStyle *style;
- GdkRectangle button_area;
- GdkWindow *window;
- GtkCMOptionMenuProps props;
- gint border_width;
- gint tab_x;
-
- cm_return_if_fail (GTK_IS_CMOPTION_MENU (widget));
- cm_return_if_fail (area != NULL);
-
- if (gtk_widget_is_drawable (widget))
- {
- gtk_widget_get_allocation (widget, &allocation);
- border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
- gtk_cmoption_menu_get_props (GTK_CMOPTION_MENU (widget), &props);
-
- button_area.x = allocation.x + border_width;
- button_area.y = allocation.y + border_width;
- button_area.width = allocation.width - 2 * border_width;
- button_area.height = 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);
- }
-
- style = gtk_widget_get_style (widget);
- window = gtk_widget_get_window (widget);
- gtk_paint_box (style, 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 +
- style->xthickness;
- else
- tab_x = button_area.x + button_area.width -
- props.indicator_size.width - props.indicator_spacing.right -
- style->xthickness;
-
- gtk_paint_tab (style, 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 += style->xthickness + props.focus_pad;
- button_area.y += style->ythickness + props.focus_pad;
- button_area.width -= 2 * (style->xthickness + props.focus_pad) +
- props.indicator_spacing.left +
- props.indicator_spacing.right +
- props.indicator_size.width;
- button_area.height -= 2 * (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 (style, window, gtk_widget_get_state (widget),
- area, widget, "button",
- button_area.x,
- button_area.y,
- button_area.width,
- button_area.height);
- }
- }
-}
-
-static gint
-gtk_cmoption_menu_expose (GtkWidget *widget,
- GdkEventExpose *event)
-{
- GtkWidget *child;
- cm_return_val_if_fail (GTK_IS_CMOPTION_MENU (widget), FALSE);
- cm_return_val_if_fail (event != NULL, FALSE);
-
- if (gtk_widget_is_drawable (widget))
- {
- gtk_cmoption_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_CMOPTION_MENU (widget)->menu)
- return FALSE;
- gtk_cmoption_menu_update_contents (GTK_CMOPTION_MENU (widget));
- child = GTK_BUTTON (widget)->child;
- if (!child)
- return FALSE;
- remove_child = TRUE;
- }
-
- child_event = *event;
-
- if (GTK_WIDGET_NO_WINDOW (child) &&
- gtk_widget_intersect (child, &event->area, &child_event.area))
- gtk_widget_event (child, (GdkEvent*) &child_event);
-
- if (remove_child)
- gtk_cmoption_menu_remove_contents (GTK_CMOPTION_MENU (widget));
-#else
- child = gtk_bin_get_child (GTK_BIN (widget));
- if (child)
- gtk_container_propagate_expose (GTK_CONTAINER (widget),
- child,
- event);
-#endif /* 0 */
- }
-
- return FALSE;
-}
-
-static gint
-gtk_cmoption_menu_button_press (GtkWidget *widget,
- GdkEventButton *event)
-{
- GtkCMOptionMenu *option_menu;
- GtkWidget *menu_item;
-
- cm_return_val_if_fail (GTK_IS_CMOPTION_MENU (widget), FALSE);
- cm_return_val_if_fail (event != NULL, FALSE);
-
- option_menu = GTK_CMOPTION_MENU (widget);
-
- if ((event->type == GDK_BUTTON_PRESS) &&
- (event->button == 1))
- {
- gtk_cmoption_menu_remove_contents (option_menu);
- gtk_menu_popup (GTK_MENU (option_menu->menu), NULL, NULL,
- gtk_cmoption_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_cmoption_menu_key_press (GtkWidget *widget,
- GdkEventKey *event)
-{
- GtkCMOptionMenu *option_menu;
- GtkWidget *menu_item;
-
- cm_return_val_if_fail (GTK_IS_CMOPTION_MENU (widget), FALSE);
- cm_return_val_if_fail (event != NULL, FALSE);
-
- option_menu = GTK_CMOPTION_MENU (widget);
-
- switch (event->keyval)
- {
- case GDK_KEY_KP_Space:
- case GDK_KEY_space:
- gtk_cmoption_menu_remove_contents (option_menu);
- gtk_menu_popup (GTK_MENU (option_menu->menu), NULL, NULL,
- gtk_cmoption_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_cmoption_menu_selection_done (GtkMenuShell *menu_shell,
- GtkCMOptionMenu *option_menu)
-{
- cm_return_if_fail (menu_shell != NULL);
- cm_return_if_fail (GTK_IS_CMOPTION_MENU (option_menu));
-
- gtk_cmoption_menu_update_contents (option_menu);
-}
-
-static void
-gtk_cmoption_menu_changed (GtkCMOptionMenu *option_menu)
-{
- cm_return_if_fail (GTK_IS_CMOPTION_MENU (option_menu));
-
- g_signal_emit (option_menu, signals[CHANGED], 0);
-}
-
-static void
-gtk_cmoption_menu_select_first_sensitive (GtkCMOptionMenu *option_menu)
-{
- if (option_menu->menu)
- {
- GList *children = gtk_container_get_children (GTK_CONTAINER (GTK_MENU_SHELL (option_menu->menu)));
- gint index = 0;
-
- while (children)
- {
- if (gtk_widget_get_sensitive (children->data))
- {
- gtk_cmoption_menu_set_history (option_menu, index);
- return;
- }
-
- children = children->next;
- index++;
- }
-
- g_list_free (children);
- }
-}
-
-static void
-gtk_cmoption_menu_item_state_changed_cb (GtkWidget *widget,
- GtkStateType previous_state,
- GtkCMOptionMenu *option_menu)
-{
- GtkWidget *child = gtk_bin_get_child (GTK_BIN (option_menu));
-
- 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_cmoption_menu_item_destroy_cb (GtkWidget *widget,
- GtkCMOptionMenu *option_menu)
-{
- GtkWidget *child = gtk_bin_get_child (GTK_BIN (option_menu));
-
- if (child)
- {
- g_object_ref (child);
- gtk_cmoption_menu_remove_contents (option_menu);
- gtk_widget_destroy (child);
- g_object_unref (child);
-
- gtk_cmoption_menu_select_first_sensitive (option_menu);
- }
-}
-
-static void
-gtk_cmoption_menu_update_contents (GtkCMOptionMenu *option_menu)
-{
- GtkWidget *child;
- GtkRequisition child_requisition;
- GtkAllocation allocation;
-
- cm_return_if_fail (GTK_IS_CMOPTION_MENU (option_menu));
-
- if (option_menu->menu)
- {
- GtkWidget *old_item = option_menu->menu_item;
-
- gtk_cmoption_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_get_child (GTK_BIN (option_menu->menu_item));
- 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_cmoption_menu_item_state_changed_cb), option_menu);
- g_signal_connect (option_menu->menu_item, "destroy",
- G_CALLBACK (gtk_cmoption_menu_item_destroy_cb), option_menu);
-
- gtk_widget_size_request (child, &child_requisition);
- gtk_widget_get_allocation (GTK_WIDGET (option_menu), &allocation);
- gtk_widget_size_allocate (GTK_WIDGET (option_menu),
- &allocation);
-
- if (gtk_widget_is_drawable (GTK_WIDGET(option_menu)))
- gtk_widget_queue_draw (GTK_WIDGET (option_menu));
- }
-
- if (old_item != option_menu->menu_item)
- gtk_cmoption_menu_changed (option_menu);
- }
-}
-
-static void
-gtk_cmoption_menu_remove_contents (GtkCMOptionMenu *option_menu)
-{
- GtkWidget *child;
-
- cm_return_if_fail (GTK_IS_CMOPTION_MENU (option_menu));
-
- if (option_menu->menu_item)
- {
- child = gtk_bin_get_child (GTK_BIN (option_menu));
-
- 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_cmoption_menu_item_state_changed_cb,
- option_menu);
- g_signal_handlers_disconnect_by_func (option_menu->menu_item,
- gtk_cmoption_menu_item_destroy_cb,
- option_menu);
-
- g_object_unref (option_menu->menu_item);
- option_menu->menu_item = NULL;
- }
-}
-
-static void
-gtk_cmoption_menu_calc_size (GtkCMOptionMenu *option_menu)
-{
- GtkWidget *child;
- GList *children, *walk;
- GtkRequisition child_requisition;
- gint old_width = option_menu->width;
- gint old_height = option_menu->height;
-
- cm_return_if_fail (GTK_IS_CMOPTION_MENU (option_menu));
-
- option_menu->width = 0;
- option_menu->height = 0;
-
- if (option_menu->menu)
- {
- children = gtk_container_get_children (GTK_CONTAINER (GTK_MENU_SHELL (option_menu->menu)));
- walk = children;
- while (walk)
- {
- child = walk->data;
- walk = walk->next;
-
- if (gtk_widget_get_visible (child))
- {
- GtkWidget *inner = gtk_bin_get_child (GTK_BIN (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);
- }
- }
- }
-
- g_list_free(children);
- }
-
- if (old_width != option_menu->width || old_height != option_menu->height)
- gtk_widget_queue_resize (GTK_WIDGET (option_menu));
-}
-
-static void
-gtk_cmoption_menu_position (GtkMenu *menu,
- gint *x,
- gint *y,
- gboolean *push_in,
- gpointer user_data)
-{
- GtkCMOptionMenu *option_menu;
- GtkWidget *active;
- GtkWidget *child;
- GtkWidget *widget;
- GtkRequisition requisition;
- GtkAllocation allocation;
- GList *children, *cur;
- gint screen_width;
- gint menu_xpos;
- gint menu_ypos;
- gint menu_width;
-
- cm_return_if_fail (GTK_IS_CMOPTION_MENU (user_data));
-
- option_menu = GTK_CMOPTION_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 (gtk_widget_get_window (widget), &menu_xpos, &menu_ypos);
-
- gtk_widget_get_allocation (widget, &allocation);
- menu_xpos += allocation.x;
- menu_ypos += allocation.y + allocation.height / 2 - 2;
-
- if (active != NULL)
- {
- gtk_widget_get_child_requisition (active, &requisition);
- menu_ypos -= requisition.height / 2;
- }
-
- children = gtk_container_get_children (GTK_CONTAINER (GTK_MENU_SHELL (option_menu->menu)));
- for (cur = children; cur && cur->data; cur = cur->next)
- {
- child = cur->data;
-
- if (active == child)
- break;
-
- if (gtk_widget_get_visible (child))
- {
- gtk_widget_get_child_requisition (child, &requisition);
- menu_ypos -= requisition.height;
- }
- }
-
- g_list_free (children);
-
- if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
- menu_xpos = menu_xpos + 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_cmoption_menu_show_all (GtkWidget *widget)
-{
- GtkContainer *container;
- GtkCMOptionMenu *option_menu;
-
- cm_return_if_fail (GTK_IS_CMOPTION_MENU (widget));
- container = GTK_CONTAINER (widget);
- option_menu = GTK_CMOPTION_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_cmoption_menu_hide_all (GtkWidget *widget)
-{
- GtkContainer *container;
-
- cm_return_if_fail (GTK_IS_CMOPTION_MENU (widget));
- container = GTK_CONTAINER (widget);
-
- gtk_widget_hide (widget);
- gtk_container_foreach (container, (GtkCallback) gtk_widget_hide, NULL);
-}
-
-static gboolean
-gtk_cmoption_menu_mnemonic_activate (GtkWidget *widget,
- gboolean group_cycling)
-{
- gtk_widget_grab_focus (widget);
- return TRUE;
-}
-
-static gint
-gtk_cmoption_menu_scroll_event (GtkWidget *widget,
- GdkEventScroll *event)
-{
- GtkCMOptionMenu *option_menu = GTK_CMOPTION_MENU (widget);
- gint index;
- gint n_children;
- gint index_dir;
- GList *l, *children;
- GtkMenuItem *item;
-
- index = gtk_cmoption_menu_get_history (option_menu);
-
- if (index != -1)
- {
- children = gtk_container_get_children (GTK_CONTAINER (GTK_MENU_SHELL (option_menu->menu)));
- n_children = g_list_length (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 (children, index);
- item = GTK_MENU_ITEM (l->data);
- if (gtk_widget_get_visible (GTK_WIDGET(item)) &&
- gtk_widget_is_sensitive (GTK_WIDGET(item)))
- {
- gtk_cmoption_menu_set_history (option_menu, index);
- gtk_menu_item_activate (GTK_MENU_ITEM (item));
- break;
- }
-
- }
-
- g_list_free (children);
- }
-
- return TRUE;
-}
-
diff --git a/src/gtk/gtkcmoptionmenu.h b/src/gtk/gtkcmoptionmenu.h
@@ -1,86 +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_CMOPTION_MENU_H__
-#define __GTK_CMOPTION_MENU_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_CMOPTION_MENU (gtk_cmoption_menu_get_type ())
-#define GTK_CMOPTION_MENU(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CMOPTION_MENU, GtkCMOptionMenu))
-#define GTK_CMOPTION_MENU_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CMOPTION_MENU, GtkCMOptionMenuClass))
-#define GTK_IS_CMOPTION_MENU(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CMOPTION_MENU))
-#define GTK_IS_CMOPTION_MENU_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CMOPTION_MENU))
-#define GTK_CMOPTION_MENU_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CMOPTION_MENU, GtkCMOptionMenuClass))
-
-
-typedef struct _GtkCMOptionMenu GtkCMOptionMenu;
-typedef struct _GtkCMOptionMenuClass GtkCMOptionMenuClass;
-
-struct _GtkCMOptionMenu
-{
- GtkButton button;
-
- GtkWidget *menu;
- GtkWidget *menu_item;
-
- guint16 width;
- guint16 height;
-};
-
-struct _GtkCMOptionMenuClass
-{
- GtkButtonClass parent_class;
-
- void (*changed) (GtkCMOptionMenu *option_menu);
-
- /* Padding for future expansion */
- void (*_gtk_reserved1) (void);
- void (*_gtk_reserved2) (void);
- void (*_gtk_reserved3) (void);
- void (*_gtk_reserved4) (void);
-};
-
-
-GType gtk_cmoption_menu_get_type (void) G_GNUC_CONST;
-GtkWidget* gtk_cmoption_menu_new (void);
-GtkWidget* gtk_cmoption_menu_get_menu (GtkCMOptionMenu *option_menu);
-void gtk_cmoption_menu_set_menu (GtkCMOptionMenu *option_menu,
- GtkWidget *menu);
-void gtk_cmoption_menu_remove_menu (GtkCMOptionMenu *option_menu);
-gint gtk_cmoption_menu_get_history (GtkCMOptionMenu *option_menu);
-void gtk_cmoption_menu_set_history (GtkCMOptionMenu *option_menu,
- guint index_);
-
-
-G_END_DECLS
-
-#endif /* __GTK_CMOPTION_MENU_H__ */
