* Boston, MA 02111-1307, USA.
*/
-#include <config.h>
+#include "config.h"
#include <string.h>
#include <gtk/gtk.h>
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
- GailWidgetClass *widget_class;
GailContainerClass *container_class;
- widget_class = (GailWidgetClass*)klass;
container_class = (GailContainerClass*)klass;
gobject_class->finalize = gail_button_finalize;
GtkWidget *widget;
GtkWidget *child;
- widget = GTK_ACCESSIBLE (obj)->widget;
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
if (widget == NULL)
/*
* State is defunct
static gboolean
gail_button_is_default_press (GtkWidget *widget)
{
+ GtkArrowType arrow_type;
GtkWidget *child;
GtkWidget *parent;
gboolean ret = FALSE;
const gchar *parent_type_name;
- child = GTK_BIN (widget)->child;
- if (GTK_IS_ARROW (child) &&
- GTK_ARROW (child)->arrow_type == GTK_ARROW_DOWN)
+ child = gtk_bin_get_child (GTK_BIN (widget));
+ if (GTK_IS_ARROW (child))
{
- parent = gtk_widget_get_parent (widget);
- if (parent)
+ g_object_get (child,
+ "arrow_type", &arrow_type,
+ NULL);
+
+ if (arrow_type == GTK_ARROW_DOWN)
{
- parent_type_name = g_type_name (G_OBJECT_TYPE (parent));
- if (strcmp (parent_type_name, "ColorCombo"))
- return TRUE;
+ parent = gtk_widget_get_parent (widget);
+ if (parent)
+ {
+ parent_type_name = g_type_name (G_OBJECT_TYPE (parent));
+ if (g_strcmp0 (parent_type_name, "ColorCombo"))
+ return TRUE;
+ }
}
}
label = get_label_from_button (widget, 0, FALSE);
if (GTK_IS_LABEL (label))
{
- if (GTK_WIDGET_MAPPED (label))
+ if (gtk_widget_get_mapped (label))
gail_button_init_textutil (button, label);
else
g_signal_connect (label,
{
const gchar *label_text;
+ if (button->textutil)
+ g_object_unref (button->textutil);
button->textutil = gail_text_util_new ();
label_text = gtk_label_get_text (GTK_LABEL (label));
gail_text_util_text_setup (button->textutil, label_text);
GailButton *button;
gboolean return_value = TRUE;
- widget = GTK_ACCESSIBLE (action)->widget;
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (action));
if (widget == NULL)
/*
* State is defunct
*/
return FALSE;
- if (!GTK_WIDGET_IS_SENSITIVE (widget) || !GTK_WIDGET_VISIBLE (widget))
+ if (!gtk_widget_is_sensitive (widget) || !gtk_widget_get_visible (widget))
return FALSE;
button = GAIL_BUTTON (action);
{
button->action_queue = g_queue_new ();
}
- g_queue_push_head (button->action_queue, (gpointer) i);
+ g_queue_push_head (button->action_queue, GINT_TO_POINTER(i));
if (!button->action_idle_handler)
button->action_idle_handler = gdk_threads_add_idle (idle_do_action, button);
break;
GtkWidget *widget;
GailButton *gail_button;
GdkEvent tmp_event;
+ GdkWindow *window;
gail_button = GAIL_BUTTON (data);
gail_button->action_idle_handler = 0;
- widget = GTK_ACCESSIBLE (gail_button)->widget;
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (gail_button));
+ window = gtk_widget_get_window (widget);
+
tmp_event.button.type = GDK_BUTTON_RELEASE;
- tmp_event.button.window = widget->window;
+ tmp_event.button.window = window;
tmp_event.button.button = 1;
tmp_event.button.send_event = TRUE;
tmp_event.button.time = GDK_CURRENT_TIME;
tmp_event.button.axes = NULL;
-
+
+ g_object_ref (gail_button);
+
if (widget == NULL /* State is defunct */ ||
- !GTK_WIDGET_IS_SENSITIVE (widget) || !GTK_WIDGET_VISIBLE (widget))
- return FALSE;
+ !gtk_widget_is_sensitive (widget) || !gtk_widget_get_visible (widget))
+ {
+ g_object_unref (gail_button);
+ return FALSE;
+ }
else
gtk_widget_event (widget, &tmp_event);
button = GTK_BUTTON (widget);
while (!g_queue_is_empty (gail_button->action_queue))
{
- gint action_number = (gint) g_queue_pop_head (gail_button->action_queue);
+ gint action_number = GPOINTER_TO_INT(g_queue_pop_head (gail_button->action_queue));
if (gail_button->default_is_press)
{
if (action_number == 0)
case 0:
/* first a press */
+ /* FIXME: Do not access public member
button->in_button = TRUE;
- gtk_button_enter (button);
+ */
+ g_signal_emit_by_name (button, "enter");
/*
* Simulate a button press event. calling gtk_button_pressed() does
* not get the job done for a GtkOptionMenu.
*/
tmp_event.button.type = GDK_BUTTON_PRESS;
- tmp_event.button.window = widget->window;
+ tmp_event.button.window = window;
tmp_event.button.button = 1;
tmp_event.button.send_event = TRUE;
tmp_event.button.time = GDK_CURRENT_TIME;
/* then a release */
tmp_event.button.type = GDK_BUTTON_RELEASE;
gtk_widget_event (widget, &tmp_event);
+ /* FIXME: Do not access public member
button->in_button = FALSE;
- gtk_button_leave (button);
+ */
+ g_signal_emit_by_name (button, "leave");
break;
case 1:
+ /* FIXME: Do not access public member
button->in_button = TRUE;
- gtk_button_enter (button);
+ */
+ g_signal_emit_by_name (button, "enter");
/*
* Simulate a button press event. calling gtk_button_pressed() does
* not get the job done for a GtkOptionMenu.
*/
tmp_event.button.type = GDK_BUTTON_PRESS;
- tmp_event.button.window = widget->window;
+ tmp_event.button.window = window;
tmp_event.button.button = 1;
tmp_event.button.send_event = TRUE;
tmp_event.button.time = GDK_CURRENT_TIME;
gtk_widget_event (widget, &tmp_event);
break;
case 2:
+ /* FIXME: Do not access public member
button->in_button = FALSE;
- gtk_button_leave (button);
+ */
+ g_signal_emit_by_name (button, "leave");
break;
default:
g_assert_not_reached ();
break;
}
}
-
+ g_object_unref (gail_button);
return FALSE;
}
GtkWidget *label;
guint key_val;
- widget = GTK_ACCESSIBLE (button)->widget;
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (button));
if (widget == NULL)
/*
* State is defunct
if (GTK_IS_LABEL (label))
{
key_val = gtk_label_get_mnemonic_keyval (GTK_LABEL (label));
- if (key_val != GDK_VoidSymbol)
+ if (key_val != GDK_KEY_VoidSymbol)
return_value = gtk_accelerator_name (key_val, GDK_MOD1_MASK);
}
if (return_value == NULL)
target = atk_relation_get_target (relation);
target_object = g_ptr_array_index (target, 0);
- if (GTK_IS_ACCESSIBLE (target_object))
- {
- label = GTK_ACCESSIBLE (target_object)->widget;
- }
+ label = gtk_accessible_get_widget (GTK_ACCESSIBLE (target_object));
}
g_object_unref (set);
}
if (GTK_IS_LABEL (label))
{
key_val = gtk_label_get_mnemonic_keyval (GTK_LABEL (label));
- if (key_val != GDK_VoidSymbol)
+ if (key_val != GDK_KEY_VoidSymbol)
return_value = gtk_accelerator_name (key_val, GDK_MOD1_MASK);
}
}
g_return_val_if_fail (GAIL_IS_BUTTON (obj), 0);
- widget = GTK_ACCESSIBLE (obj)->widget;
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
if (widget == NULL)
/*
* State is defunct
g_return_val_if_fail (GAIL_IS_BUTTON (obj), NULL);
- widget = GTK_ACCESSIBLE (obj)->widget;
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
if (widget == NULL)
/*
* State is defunct
{
AtkStateSet *state_set;
GtkWidget *widget;
- GtkButton *button;
state_set = ATK_OBJECT_CLASS (gail_button_parent_class)->ref_state_set (obj);
- widget = GTK_ACCESSIBLE (obj)->widget;
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
if (widget == NULL)
return state_set;
- button = GTK_BUTTON (widget);
-
- if (GTK_WIDGET_STATE (widget) == GTK_STATE_ACTIVE)
+ if (gtk_widget_get_state (widget) == GTK_STATE_ACTIVE)
atk_state_set_add_state (state_set, ATK_STATE_ARMED);
- if (GTK_WIDGET_CAN_FOCUS(widget))
- atk_state_set_add_state (state_set, ATK_STATE_SELECTABLE);
- else
+ if (!gtk_widget_get_can_focus (widget))
atk_state_set_remove_state (state_set, ATK_STATE_SELECTABLE);
{
AtkObject *accessible;
- if (GTK_WIDGET_STATE (widget) == GTK_STATE_ACTIVE)
+ if (gtk_widget_get_state (widget) == GTK_STATE_ACTIVE)
{
accessible = gtk_widget_get_accessible (widget);
atk_object_notify_state_change (accessible, ATK_STATE_ARMED, TRUE);
GtkImage *button_image;
AtkObject *obj;
- widget = GTK_ACCESSIBLE (image)->widget;
-
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (image));
if (widget == NULL)
/*
* State is defunct
GtkImage *button_image;
AtkObject *obj;
- widget = GTK_ACCESSIBLE (image)->widget;
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (image));
if (widget == NULL)
{
GtkImage *button_image;
AtkObject *obj;
- widget = GTK_ACCESSIBLE (image)->widget;
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (image));
if (widget == NULL)
{
GtkImage *button_image;
AtkObject *obj;
- widget = GTK_ACCESSIBLE (image)->widget;
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (image));
if (widget == NULL)
/*
GailButton *button;
const gchar *label_text;
- widget = GTK_ACCESSIBLE (text)->widget;
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text));
+
if (widget == NULL)
/* State is defunct */
return NULL;
GtkWidget *widget;
GtkWidget *label;
GailButton *button;
-
- widget = GTK_ACCESSIBLE (text)->widget;
-
+
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text));
+
if (widget == NULL)
/* State is defunct */
return NULL;
GtkWidget *widget;
GtkWidget *label;
GailButton *button;
+
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text));
- widget = GTK_ACCESSIBLE (text)->widget;
-
if (widget == NULL)
/* State is defunct */
return NULL;
GtkWidget *label;
GailButton *button;
- widget = GTK_ACCESSIBLE (text)->widget;
-
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text));
+
if (widget == NULL)
{
/* State is defunct */
GtkWidget *widget;
GtkWidget *label;
- widget = GTK_ACCESSIBLE (text)->widget;
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text));
+
if (widget == NULL)
/* State is defunct */
return 0;
PangoRectangle char_rect;
gint index, x_layout, y_layout;
const gchar *label_text;
-
- widget = GTK_ACCESSIBLE (text)->widget;
+
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text));
if (widget == NULL)
/* State is defunct */
gint index, x_layout, y_layout;
const gchar *label_text;
- widget = GTK_ACCESSIBLE (text)->widget;
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text));
+
if (widget == NULL)
/* State is defunct */
return -1;
+
label = get_label_from_button (widget, 0, FALSE);
if (!GTK_IS_LABEL(label))
GtkJustification justify;
GtkTextDirection dir;
- widget = GTK_ACCESSIBLE (text)->widget;
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text));
+
if (widget == NULL)
/* State is defunct */
return NULL;
GtkWidget *label;
AtkAttributeSet *at_set = NULL;
- widget = GTK_ACCESSIBLE (text)->widget;
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text));
+
if (widget == NULL)
/* State is defunct */
return NULL;
const gchar *string;
gchar *index;
- widget = GTK_ACCESSIBLE (text)->widget;
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text));
+
if (widget == NULL)
/* State is defunct */
return '\0';