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

More gail removal

Browse Source 
Rename GailMisc to GtkMiscImpl.
This commit is contained in:
Matthias Clasen
2012-12-27 01:14:15 -05:00
parent 4cd806ff0c
commit d2944ce633
4 changed files with 27 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/a11y/Makefile.am
View File

@ -5,6 +5,7 @@ noinst_LTLIBRARIES = libgtka11y.la
gtka11y_c_sources = \
gtkaccessibility.c \
gtkaccessibilityutil.c \
gtkaccessibilitymisc.c \
gtkarrowaccessible.c \
gtkbooleancellaccessible.c \
gtkbuttonaccessible.c \
@ -49,10 +50,9 @@ gtka11y_c_sources = \
gtktoplevelaccessible.c \
gtktreeviewaccessible.c \
gtkwidgetaccessible.c \
gtkwindowaccessible.c \
gailmisc.c
gtkwindowaccessible.c
gail_private_h_sources = \
gtka11y_private_h_sources = \
gtkarrowaccessible.h \
gtkbooleancellaccessible.h \
gtkbuttonaccessible.h \
@ -97,16 +97,16 @@ gail_private_h_sources = \
gtktreeviewaccessible.h \
gtkwidgetaccessible.h \
gtkwindowaccessible.h \
gtkaccessibility.h \
gtkaccessibilityutil.h \
gtkaccessibilitymisc.h \
gtkcolorswatchaccessible.h \
gtkcellaccessibleprivate.h \
gtklockbuttonaccessibleprivate.h \
gtkiconviewaccessibleprivate.h \
gtktreeviewaccessibleprivate.h \
gtktextviewaccessibleprivate.h \
gtkwidgetaccessibleprivate.h \
gtkaccessibility.h \
gtkaccessibilityutil.h \
gailmisc.h
gtkwidgetaccessibleprivate.h
libgtka11y_la_SOURCES = \
$(gtka11y_c_sources) \

5
gtk/a11y/gtkaccessibility.c
View File

@ -19,6 +19,8 @@
#include "gtkaccessibility.h"
#include "gtkaccessibilityutil.h"
#include "gtkaccessibilitymisc.h"
#include "gtkwindowaccessible.h"
#include <stdio.h>
@ -34,7 +36,6 @@
#include <gtk/gtktogglebutton.h>
#include <gtk/gtkcombobox.h>
#include <gtk/gtkaccessible.h>
#include "gailmisc.h"
#ifdef GDK_WINDOWING_X11
#include <atk-bridge.h>
@ -1014,5 +1015,5 @@ _gtk_accessibility_init (void)
atk_bridge_adaptor_init (NULL, NULL);
#endif
atk_misc_instance = g_object_new (GAIL_TYPE_MISC, NULL);
atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL);
}

16
gtk/a11y/gailmisc.c → gtk/a11y/gtkaccessibilitymisc.c
View File

@ -18,33 +18,33 @@
#include "config.h"
#include <gtk/gtk.h>
#include "gailmisc.h"
#include "gtkaccessibilitymisc.h"
G_DEFINE_TYPE (GailMisc, _gail_misc, ATK_TYPE_MISC)
G_DEFINE_TYPE (GtkMiscImpl, _gtk_misc_impl, ATK_TYPE_MISC)
static void
gail_misc_threads_enter (AtkMisc *misc)
gtk_misc_impl_threads_enter (AtkMisc *misc)
{
gdk_threads_enter ();
}
static void
gail_misc_threads_leave (AtkMisc *misc)
gtk_misc_impl_threads_leave (AtkMisc *misc)
{
gdk_threads_leave ();
}
static void
_gail_misc_class_init (GailMiscClass *klass)
_gtk_misc_impl_class_init (GtkMiscImplClass *klass)
{
AtkMiscClass *misc_class = ATK_MISC_CLASS (klass);
misc_class->threads_enter = gail_misc_threads_enter;
misc_class->threads_leave = gail_misc_threads_leave;
misc_class->threads_enter = gtk_misc_impl_threads_enter;
misc_class->threads_leave = gtk_misc_impl_threads_leave;
}
static void
_gail_misc_init (GailMisc *misc)
_gtk_misc_impl_init (GtkMiscImpl *misc)
{
}

23
gtk/a11y/gailmisc.h → gtk/a11y/gtkaccessibilitymisc.h
View File

@ -15,35 +15,30 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __GAIL_MISC_H__
#define __GAIL_MISC_H__
#ifndef __GTK_ACCESSIBILITY_MISC_H__
#define __GTK_ACCESSIBILITY_MISC_H__
#include <atk/atk.h>
G_BEGIN_DECLS
#define GAIL_TYPE_MISC (_gail_misc_get_type ())
#define GAIL_MISC(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_MISC, GailMisc))
#define GAIL_MISC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GAIL_TYPE_MISC, GailMiscClass))
#define GAIL_IS_MISC(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAIL_TYPE_MISC))
#define GAIL_IS_MISC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAIL_TYPE_MISC))
#define GAIL_MISC_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GAIL_TYPE_MISC, GailMiscClass))
#define GTK_TYPE_MISC_IMPL (_gtk_misc_impl_get_type ())
typedef struct _GailMisc GailMisc;
typedef struct _GailMiscClass GailMiscClass;
typedef struct _GtkMiscImpl GtkMiscImpl;
typedef struct _GtkMiscImplClass GtkMiscImplClass;
struct _GailMisc
struct _GtkMiscImpl
{
AtkMisc parent;
};
struct _GailMiscClass
struct _GtkMiscImplClass
{
AtkMiscClass parent_class;
};
GType _gail_misc_get_type (void);
GType _gtk_misc_impl_get_type (void);
G_END_DECLS
#endif /* __GAIL_MISC_H__ */
#endif /* __GTK_ACCESSIBILITY_MISC_H__ */