* 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.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <string.h>
#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
#include "gtkrangeaccessible.h"
static void atk_action_interface_init (AtkActionIface *iface);
static void atk_value_interface_init (AtkValueIface *iface);
-G_DEFINE_TYPE_WITH_CODE (GtkRangeAccessible, gtk_range_accessible, GAIL_TYPE_WIDGET,
+G_DEFINE_TYPE_WITH_CODE (GtkRangeAccessible, _gtk_range_accessible, GTK_TYPE_WIDGET_ACCESSIBLE,
G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)
G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init))
GtkAdjustment *adj;
GtkRange *gtk_range;
- ATK_OBJECT_CLASS (gtk_range_accessible_parent_class)->initialize (obj, data);
+ ATK_OBJECT_CLASS (_gtk_range_accessible_parent_class)->initialize (obj, data);
gtk_range = GTK_RANGE (data);
/*
*/
adj = gtk_range_get_adjustment (gtk_range);
if (adj)
- {
- g_signal_connect (adj,
- "value-changed",
- G_CALLBACK (gtk_range_accessible_value_changed),
- range);
- }
+ g_signal_connect (adj, "value-changed",
+ G_CALLBACK (gtk_range_accessible_value_changed),
+ range);
obj->role = ATK_ROLE_SLIDER;
}
range);
}
- if (range->action_idle_handler)
- {
- g_source_remove (range->action_idle_handler);
- range->action_idle_handler = 0;
- }
-
- G_OBJECT_CLASS (gtk_range_accessible_parent_class)->finalize (object);
+ G_OBJECT_CLASS (_gtk_range_accessible_parent_class)->finalize (object);
}
static void
{
range = gtk_widget_get_accessible (widget);
adj = gtk_range_get_adjustment (GTK_RANGE (widget));
- g_signal_connect (adj,
- "value-changed",
+ g_signal_connect (adj, "value-changed",
G_CALLBACK (gtk_range_accessible_value_changed),
range);
}
else
- GAIL_WIDGET_CLASS (gtk_range_accessible_parent_class)->notify_gtk (obj, pspec);
+ GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_range_accessible_parent_class)->notify_gtk (obj, pspec);
}
static void
-gtk_range_accessible_class_init (GtkRangeAccessibleClass *klass)
+_gtk_range_accessible_class_init (GtkRangeAccessibleClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
- GailWidgetClass *widget_class = (GailWidgetClass*)klass;
+ GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass;
widget_class->notify_gtk = gtk_range_accessible_notify_gtk;
}
static void
-gtk_range_accessible_init (GtkRangeAccessible *range)
+_gtk_range_accessible_init (GtkRangeAccessible *range)
{
}
iface->set_current_value = gtk_range_accessible_set_current_value;
}
-static gboolean
-idle_do_action (gpointer data)
-{
- GtkRangeAccessible *range = GTK_RANGE_ACCESSIBLE (data);
- GtkWidget *widget;
-
- range->action_idle_handler = 0;
- widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (range));
- if (widget == NULL)
- return FALSE;
-
- if (!gtk_widget_get_sensitive (widget) || !gtk_widget_get_visible (widget))
- return FALSE;
-
- gtk_widget_activate (widget);
-
- return TRUE;
-}
-
static gboolean
gtk_range_accessible_do_action (AtkAction *action,
gint i)
{
- GtkRangeAccessible *range = GTK_RANGE_ACCESSIBLE (action);
GtkWidget *widget;
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (action));
if (i != 0)
return FALSE;
- if (range->action_idle_handler)
- return FALSE;
-
- range->action_idle_handler = gdk_threads_add_idle (idle_do_action, range);
+ gtk_widget_activate (widget);
return TRUE;
}