callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove GailCalendar

Browse Source 
This was just setting a role, which we can do just as well
in get_accessible().
This commit is contained in:
Matthias Clasen
2011-06-26 21:44:42 -04:00
parent 103b97301d
commit 6aedf8f066
5 changed files with 16 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/a11y/Makefile.am
View File

@ -10,7 +10,6 @@ gail_c_sources = \
gailbooleancell.c \ gailbooleancell.c \
gailbox.c \ gailbox.c \
gailbutton.c \ gailbutton.c \
gailcalendar.c \
gailcell.c \ gailcell.c \
gailcellparent.c \ gailcellparent.c \
gailcheckmenuitem.c \ gailcheckmenuitem.c \
@ -63,7 +62,6 @@ gail_private_h_sources = \
gailbooleancell.h \ gailbooleancell.h \
gailbox.h \ gailbox.h \
gailbutton.h \ gailbutton.h \
gailcalendar.h \
gailcell.h \ gailcell.h \
gailcellparent.h \ gailcellparent.h \
gailcheckmenuitem.h \ gailcheckmenuitem.h \

3
gtk/a11y/gail.c
View File

@ -27,7 +27,6 @@
#include "gailbooleancell.h" #include "gailbooleancell.h"
#include "gailbox.h" #include "gailbox.h"
#include "gailbutton.h" #include "gailbutton.h"
#include "gailcalendar.h"
#include "gailcell.h" #include "gailcell.h"
#include "gailcheckmenuitem.h" #include "gailcheckmenuitem.h"
#include "gailcombobox.h" #include "gailcombobox.h"
@ -121,7 +120,6 @@ GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_RANGE, GailRange, gail_range, GTK_TYPE_RANGE)
GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_SCALE_BUTTON, GailScaleButton, gail_scale_button, GTK_TYPE_SCALE_BUTTON) GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_SCALE_BUTTON, GailScaleButton, gail_scale_button, GTK_TYPE_SCALE_BUTTON)
GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_STATUSBAR, GailStatusbar, gail_statusbar, GTK_TYPE_STATUSBAR) GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_STATUSBAR, GailStatusbar, gail_statusbar, GTK_TYPE_STATUSBAR)
GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_NOTEBOOK, GailNotebook, gail_notebook, GTK_TYPE_NOTEBOOK) GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_NOTEBOOK, GailNotebook, gail_notebook, GTK_TYPE_NOTEBOOK)
GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_CALENDAR, GailCalendar, gail_calendar, GTK_TYPE_CALENDAR)
GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_PROGRESS_BAR, GailProgressBar, gail_progress_bar, GTK_TYPE_PROGRESS_BAR) GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_PROGRESS_BAR, GailProgressBar, gail_progress_bar, GTK_TYPE_PROGRESS_BAR)
GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_TREE_VIEW, GailTreeView, gail_tree_view, GTK_TYPE_TREE_VIEW) GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_TREE_VIEW, GailTreeView, gail_tree_view, GTK_TYPE_TREE_VIEW)
GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_FRAME, GailFrame, gail_frame, GTK_TYPE_FRAME) GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_FRAME, GailFrame, gail_frame, GTK_TYPE_FRAME)
@ -892,7 +890,6 @@ gail_accessibility_module_init (void)
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_SCALE_BUTTON, gail_scale_button); GAIL_WIDGET_SET_FACTORY (GTK_TYPE_SCALE_BUTTON, gail_scale_button);
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_STATUSBAR, gail_statusbar); GAIL_WIDGET_SET_FACTORY (GTK_TYPE_STATUSBAR, gail_statusbar);
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_NOTEBOOK, gail_notebook); GAIL_WIDGET_SET_FACTORY (GTK_TYPE_NOTEBOOK, gail_notebook);
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_CALENDAR, gail_calendar);
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_PROGRESS_BAR, gail_progress_bar); GAIL_WIDGET_SET_FACTORY (GTK_TYPE_PROGRESS_BAR, gail_progress_bar);
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_TREE_VIEW, gail_tree_view); GAIL_WIDGET_SET_FACTORY (GTK_TYPE_TREE_VIEW, gail_tree_view);
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_FRAME, gail_frame); GAIL_WIDGET_SET_FACTORY (GTK_TYPE_FRAME, gail_frame);

52
gtk/a11y/gailcalendar.c
View File

@ -1,52 +0,0 @@
/* GAIL - The GNOME Accessibility Implementation Library
* Copyright 2001 Sun Microsystems Inc.
*
* 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.
*/
#include "config.h"
#include <gtk/gtk.h>
#include "gailcalendar.h"
static void gail_calendar_class_init (GailCalendarClass *klass);
static void gail_calendar_init (GailCalendar *calendar);
static void gail_calendar_initialize (AtkObject *accessible,
gpointer data);
G_DEFINE_TYPE (GailCalendar, gail_calendar, GAIL_TYPE_WIDGET)
static void
gail_calendar_class_init (GailCalendarClass *klass)
{
AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass);
atk_object_class->initialize = gail_calendar_initialize;
}
static void
gail_calendar_init (GailCalendar *calendar)
{
}
static void
gail_calendar_initialize (AtkObject *accessible,
gpointer data)
{
ATK_OBJECT_CLASS (gail_calendar_parent_class)->initialize (accessible, data);
accessible->role = ATK_ROLE_CALENDAR;
}

51
gtk/a11y/gailcalendar.h
View File

@ -1,51 +0,0 @@
/* GAIL - The GNOME Accessibility Implementation Library
* Copyright 2001 Sun Microsystems Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library 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
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library 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.
*/
#ifndef __GAIL_CALENDAR_H__
#define __GAIL_CALENDAR_H__
#include "gailcontainer.h"
G_BEGIN_DECLS
#define GAIL_TYPE_CALENDAR (gail_calendar_get_type ())
#define GAIL_CALENDAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_CALENDAR, GailCalendar))
#define GAIL_CALENDAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GAIL_TYPE_CALENDAR, GailCalendarClass))
#define GAIL_IS_CALENDAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAIL_TYPE_CALENDAR))
#define GAIL_IS_CALENDAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAIL_TYPE_CALENDAR))
#define GAIL_CALENDAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GAIL_TYPE_CALENDAR, GailCalendarClass))
typedef struct _GailCalendar GailCalendar;
typedef struct _GailCalendarClass GailCalendarClass;
struct _GailCalendar
{
GailWidget parent;
};
GType gail_calendar_get_type (void);
struct _GailCalendarClass
{
GailWidgetClass parent_class;
};
G_END_DECLS
#endif /* __GAIL_CALENDAR_H__ */

16
gtk/gtkcalendar.c
View File

@ -393,6 +393,8 @@ static gboolean gtk_calendar_drag_drop (GtkWidget *widget,
gint y, gint y,
guint time); guint time);
static AtkObject *gtk_calendar_get_accessible (GtkWidget *widget);
static void calendar_start_spinning (GtkCalendar *calendar, static void calendar_start_spinning (GtkCalendar *calendar,
gint click_child); gint click_child);
static void calendar_stop_spinning (GtkCalendar *calendar); static void calendar_stop_spinning (GtkCalendar *calendar);
@ -455,6 +457,8 @@ gtk_calendar_class_init (GtkCalendarClass *class)
widget_class->drag_drop = gtk_calendar_drag_drop; widget_class->drag_drop = gtk_calendar_drag_drop;
widget_class->drag_data_received = gtk_calendar_drag_data_received; widget_class->drag_data_received = gtk_calendar_drag_data_received;
widget_class->get_accessible = gtk_calendar_get_accessible;
/** /**
* GtkCalendar:year: * GtkCalendar:year:
* *
@ -3554,6 +3558,18 @@ gtk_calendar_drag_data_received (GtkWidget *widget,
g_object_thaw_notify (G_OBJECT (calendar)); g_object_thaw_notify (G_OBJECT (calendar));
} }
static AtkObject *
gtk_calendar_get_accessible (GtkWidget *widget)
{
AtkObject *obj;
obj = GTK_WIDGET_CLASS (gtk_calendar_parent_class)->get_accessible (widget);
atk_object_set_role (obj, ATK_ROLE_CALENDAR);
return obj;
}
/**************************************** /****************************************
* Public API * * Public API *