Commit b6025e44 authored by Benjamin Otte's avatar Benjamin Otte Committed by Matthias Clasen

gail: Copy gail-util functions into gail

Otherwise we get a circular dependency if we move libgail into GTK:
GTK depends on gail-util depends on gail (is part of GTK)
parent df2e122b
......@@ -32,6 +32,7 @@ gail_c_sources = \
gailimagecell.c \
gaillabel.c \
gaillinkbutton.c \
gailmisc.c \
gailmenu.c \
gailmenushell.c \
gailmenuitem.c \
......@@ -53,6 +54,7 @@ gail_c_sources = \
gailsubmenuitem.c \
gailstatusbar.c \
gailtextcell.c \
gailtextutil.c \
gailtextview.c \
gailtogglebutton.c \
gailtoplevel.c \
......@@ -86,6 +88,7 @@ gail_private_h_sources = \
gailimagecell.h \
gaillabel.h \
gaillinkbutton.h \
gailmisc.h \
gailmenu.h \
gailmenushell.h \
gailmenuitem.h \
......@@ -107,6 +110,7 @@ gail_private_h_sources = \
gailsubmenuitem.h \
gailstatusbar.h \
gailtextcell.h \
gailtextutil.h \
gailtextview.h \
gailtogglebutton.h \
gailtoplevel.h \
......@@ -143,8 +147,7 @@ libgail_la_CFLAGS = \
libgail_la_LIBADD = \
$(top_builddir)/gtk/libgtk-3.la \
$(top_builddir)/gtk/a11y/libgail-util/libgailutil-3.la \
$(GTK_DEP_LIBS) \
$(GTK_DEP_LIBS) \
$(INTLLIBS)
libgail_la_LDFLAGS = \
......
......@@ -21,7 +21,7 @@
#define __GAIL_BUTTON_H__
#include "gailcontainer.h"
#include <libgail-util/gailtextutil.h>
#include "gailtextutil.h"
G_BEGIN_DECLS
......
......@@ -21,7 +21,7 @@
#define __GAIL_ENTRY_H__
#include "gailwidget.h"
#include <libgail-util/gailtextutil.h>
#include "gailtextutil.h"
G_BEGIN_DECLS
......
......@@ -21,7 +21,7 @@
#define __GAIL_EXPANDER_H__
#include "gailcontainer.h"
#include <libgail-util/gailtextutil.h>
#include "gailtextutil.h"
G_BEGIN_DECLS
......
......@@ -21,7 +21,7 @@
#define __GAIL_LABEL_H__
#include "gailwidget.h"
#include <libgail-util/gailtextutil.h>
#include "gailtextutil.h"
G_BEGIN_DECLS
......
......@@ -21,7 +21,7 @@
#define __GAIL_MENU_ITEM_H__
#include "gailcontainer.h"
#include <libgail-util/gailtextutil.h>
#include "gailtextutil.h"
G_BEGIN_DECLS
......
This diff is collapsed.
/* 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_MISC_H__
#define __GAIL_MISC_H__
#include <glib-object.h>
#include <gtk/gtk.h>
#include <pango/pango.h>
G_BEGIN_DECLS
AtkAttributeSet* gail_misc_add_attribute (AtkAttributeSet *attrib_set,
AtkTextAttribute attr,
gchar *value);
AtkAttributeSet* gail_misc_layout_get_run_attributes
(AtkAttributeSet *attrib_set,
PangoLayout *layout,
const gchar *text,
gint offset,
gint *start_offset,
gint *end_offset);
AtkAttributeSet* gail_misc_get_default_attributes (AtkAttributeSet *attrib_set,
PangoLayout *layout,
GtkWidget *widget);
void gail_misc_get_extents_from_pango_rectangle
(GtkWidget *widget,
PangoRectangle *char_rect,
gint x_layout,
gint y_layout,
gint *x,
gint *y,
gint *width,
gint *height,
AtkCoordType coords);
gint gail_misc_get_index_at_point_in_layout
(GtkWidget *widget,
PangoLayout *layout,
gint x_layout,
gint y_layout,
gint x,
gint y,
AtkCoordType coords);
void gail_misc_get_origins (GtkWidget *widget,
gint *x_window,
gint *y_window,
gint *x_toplevel,
gint *y_toplevel);
AtkAttributeSet* gail_misc_buffer_get_run_attributes
(GtkTextBuffer *buffer,
gint offset,
gint *start_offset,
gint *end_offset);
G_END_DECLS
#endif /*__GAIL_MISC_H__ */
......@@ -21,7 +21,7 @@
#define __GAIL_NOTEBOOK_PAGE_H__
#include "gailnotebook.h"
#include <libgail-util/gailtextutil.h>
#include "gailtextutil.h"
G_BEGIN_DECLS
......
......@@ -21,7 +21,7 @@
#define __GAIL_SCALE_H__
#include "gailrange.h"
#include <libgail-util/gailtextutil.h>
#include "gailtextutil.h"
G_BEGIN_DECLS
......
......@@ -21,7 +21,7 @@
#define __GAIL_STATUSBAR_H__
#include "gailcontainer.h"
#include <libgail-util/gailtextutil.h>
#include "gailtextutil.h"
G_BEGIN_DECLS
......
......@@ -22,7 +22,7 @@
#include <atk/atk.h>
#include "gailrenderercell.h"
#include <libgail-util/gailtextutil.h>
#include "gailtextutil.h"
G_BEGIN_DECLS
......
This diff is collapsed.
/* 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_TEXT_UTIL_H__
#define __GAIL_TEXT_UTIL_H__
#include <glib-object.h>
#include <gtk/gtk.h>
G_BEGIN_DECLS
#define GAIL_TYPE_TEXT_UTIL (gail_text_util_get_type ())
#define GAIL_TEXT_UTIL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_TEXT_UTIL, GailTextUtil))
#define GAIL_TEXT_UTIL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GAIL_TYPE_TEXT_UTIL, GailTextUtilClass))
#define GAIL_IS_TEXT_UTIL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAIL_TYPE_TEXT_UTIL))
#define GAIL_IS_TEXT_UTIL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAIL_TYPE_TEXT_UTIL))
#define GAIL_TEXT_UTIL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GAIL_TYPE_TEXT_UTIL, GailTextUtilClass))
/**
*GailOffsetType:
*@GAIL_BEFORE_OFFSET: Text before offset is required.
*@GAIL_AT_OFFSET: Text at offset is required,
*@GAIL_AFTER_OFFSET: Text after offset is required.
*
* Specifies which of the functions atk_text_get_text_before_offset(),
* atk_text_get_text_at_offset(), atk_text_get_text_after_offset() the
* function gail_text_util_get_text() is being called for.
**/
typedef enum
{
GAIL_BEFORE_OFFSET,
GAIL_AT_OFFSET,
GAIL_AFTER_OFFSET
}GailOffsetType;
typedef struct _GailTextUtil GailTextUtil;
typedef struct _GailTextUtilClass GailTextUtilClass;
struct _GailTextUtil
{
GObject parent;
GtkTextBuffer *buffer;
};
struct _GailTextUtilClass
{
GObjectClass parent_class;
};
GType gail_text_util_get_type (void);
GailTextUtil* gail_text_util_new (void);
void gail_text_util_text_setup (GailTextUtil *textutil,
const gchar *text);
void gail_text_util_buffer_setup (GailTextUtil *textutil,
GtkTextBuffer *buffer);
gchar* gail_text_util_get_text (GailTextUtil *textutil,
gpointer layout,
GailOffsetType function,
AtkTextBoundary boundary_type,
gint offset,
gint *start_offset,
gint *end_offset);
gchar* gail_text_util_get_substring (GailTextUtil *textutil,
gint start_pos,
gint end_pos);
G_END_DECLS
#endif /*__GAIL_TEXT_UTIL_H__ */
......@@ -21,7 +21,7 @@
#define __GAIL_TEXT_VIEW_H__
#include "gailcontainer.h"
#include <libgail-util/gailtextutil.h>
#include "gailtextutil.h"
G_BEGIN_DECLS
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment