forked from AuroraMiddleware/gtk
Include files outside of the extern "C" block. Makes some C++ compiler
2000-07-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de> * gdk-pixbuf/gdk-pixbuf.h, gtk/gtkhsv.h, gtk/gtktextbtree.h, gtk/gtktextbuffer.h, gtk/gtktextchild.h, gtk/gtktextdisplay.h, gtk/gtktextiter.h, gtk/gtktextiterprivate.h, gtk/gtktextlayout.h, gtk/gtktextmarkprivate.h, gtk/gtktextsegment.h, gtk/gtktexttag.h, gtk/gtktexttagtable.h, gtk/gtktexttypes.h, gtk/gtktextview.h, gtk/gtktypeutils.h: Include files outside of the extern "C" block. Makes some C++ compiler happy. Reported by Denis Vakatov <vakatov@peony.nlm.nih.gov>. I really hope not to have caused a merging nightmare for all the branches out there. Otherwise I'll be available for crucifixion.
This commit is contained in:
parent
8ac34068ba
commit
1e166c0693
11
ChangeLog
11
ChangeLog
@ -1,3 +1,14 @@
|
|||||||
|
2000-07-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||||
|
|
||||||
|
* gdk-pixbuf/gdk-pixbuf.h, gtk/gtkhsv.h, gtk/gtktextbtree.h,
|
||||||
|
gtk/gtktextbuffer.h, gtk/gtktextchild.h, gtk/gtktextdisplay.h,
|
||||||
|
gtk/gtktextiter.h, gtk/gtktextiterprivate.h, gtk/gtktextlayout.h,
|
||||||
|
gtk/gtktextmarkprivate.h, gtk/gtktextsegment.h, gtk/gtktexttag.h,
|
||||||
|
gtk/gtktexttagtable.h, gtk/gtktexttypes.h, gtk/gtktextview.h,
|
||||||
|
gtk/gtktypeutils.h: Include files outside of the extern "C"
|
||||||
|
block. Makes some C++ compiler happy. Reported by Denis Vakatov
|
||||||
|
<vakatov@peony.nlm.nih.gov>.
|
||||||
|
|
||||||
Wed Jul 19 14:07:57 BST 2000 Tony Gale <gale@gtk.org>
|
Wed Jul 19 14:07:57 BST 2000 Tony Gale <gale@gtk.org>
|
||||||
|
|
||||||
* docs/tutorial/gtk-tut.sgml: Yet more clean ups.
|
* docs/tutorial/gtk-tut.sgml: Yet more clean ups.
|
||||||
|
@ -1,3 +1,14 @@
|
|||||||
|
2000-07-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||||
|
|
||||||
|
* gdk-pixbuf/gdk-pixbuf.h, gtk/gtkhsv.h, gtk/gtktextbtree.h,
|
||||||
|
gtk/gtktextbuffer.h, gtk/gtktextchild.h, gtk/gtktextdisplay.h,
|
||||||
|
gtk/gtktextiter.h, gtk/gtktextiterprivate.h, gtk/gtktextlayout.h,
|
||||||
|
gtk/gtktextmarkprivate.h, gtk/gtktextsegment.h, gtk/gtktexttag.h,
|
||||||
|
gtk/gtktexttagtable.h, gtk/gtktexttypes.h, gtk/gtktextview.h,
|
||||||
|
gtk/gtktypeutils.h: Include files outside of the extern "C"
|
||||||
|
block. Makes some C++ compiler happy. Reported by Denis Vakatov
|
||||||
|
<vakatov@peony.nlm.nih.gov>.
|
||||||
|
|
||||||
Wed Jul 19 14:07:57 BST 2000 Tony Gale <gale@gtk.org>
|
Wed Jul 19 14:07:57 BST 2000 Tony Gale <gale@gtk.org>
|
||||||
|
|
||||||
* docs/tutorial/gtk-tut.sgml: Yet more clean ups.
|
* docs/tutorial/gtk-tut.sgml: Yet more clean ups.
|
||||||
|
@ -1,3 +1,14 @@
|
|||||||
|
2000-07-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||||
|
|
||||||
|
* gdk-pixbuf/gdk-pixbuf.h, gtk/gtkhsv.h, gtk/gtktextbtree.h,
|
||||||
|
gtk/gtktextbuffer.h, gtk/gtktextchild.h, gtk/gtktextdisplay.h,
|
||||||
|
gtk/gtktextiter.h, gtk/gtktextiterprivate.h, gtk/gtktextlayout.h,
|
||||||
|
gtk/gtktextmarkprivate.h, gtk/gtktextsegment.h, gtk/gtktexttag.h,
|
||||||
|
gtk/gtktexttagtable.h, gtk/gtktexttypes.h, gtk/gtktextview.h,
|
||||||
|
gtk/gtktypeutils.h: Include files outside of the extern "C"
|
||||||
|
block. Makes some C++ compiler happy. Reported by Denis Vakatov
|
||||||
|
<vakatov@peony.nlm.nih.gov>.
|
||||||
|
|
||||||
Wed Jul 19 14:07:57 BST 2000 Tony Gale <gale@gtk.org>
|
Wed Jul 19 14:07:57 BST 2000 Tony Gale <gale@gtk.org>
|
||||||
|
|
||||||
* docs/tutorial/gtk-tut.sgml: Yet more clean ups.
|
* docs/tutorial/gtk-tut.sgml: Yet more clean ups.
|
||||||
|
@ -1,3 +1,14 @@
|
|||||||
|
2000-07-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||||
|
|
||||||
|
* gdk-pixbuf/gdk-pixbuf.h, gtk/gtkhsv.h, gtk/gtktextbtree.h,
|
||||||
|
gtk/gtktextbuffer.h, gtk/gtktextchild.h, gtk/gtktextdisplay.h,
|
||||||
|
gtk/gtktextiter.h, gtk/gtktextiterprivate.h, gtk/gtktextlayout.h,
|
||||||
|
gtk/gtktextmarkprivate.h, gtk/gtktextsegment.h, gtk/gtktexttag.h,
|
||||||
|
gtk/gtktexttagtable.h, gtk/gtktexttypes.h, gtk/gtktextview.h,
|
||||||
|
gtk/gtktypeutils.h: Include files outside of the extern "C"
|
||||||
|
block. Makes some C++ compiler happy. Reported by Denis Vakatov
|
||||||
|
<vakatov@peony.nlm.nih.gov>.
|
||||||
|
|
||||||
Wed Jul 19 14:07:57 BST 2000 Tony Gale <gale@gtk.org>
|
Wed Jul 19 14:07:57 BST 2000 Tony Gale <gale@gtk.org>
|
||||||
|
|
||||||
* docs/tutorial/gtk-tut.sgml: Yet more clean ups.
|
* docs/tutorial/gtk-tut.sgml: Yet more clean ups.
|
||||||
|
@ -1,3 +1,14 @@
|
|||||||
|
2000-07-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||||
|
|
||||||
|
* gdk-pixbuf/gdk-pixbuf.h, gtk/gtkhsv.h, gtk/gtktextbtree.h,
|
||||||
|
gtk/gtktextbuffer.h, gtk/gtktextchild.h, gtk/gtktextdisplay.h,
|
||||||
|
gtk/gtktextiter.h, gtk/gtktextiterprivate.h, gtk/gtktextlayout.h,
|
||||||
|
gtk/gtktextmarkprivate.h, gtk/gtktextsegment.h, gtk/gtktexttag.h,
|
||||||
|
gtk/gtktexttagtable.h, gtk/gtktexttypes.h, gtk/gtktextview.h,
|
||||||
|
gtk/gtktypeutils.h: Include files outside of the extern "C"
|
||||||
|
block. Makes some C++ compiler happy. Reported by Denis Vakatov
|
||||||
|
<vakatov@peony.nlm.nih.gov>.
|
||||||
|
|
||||||
Wed Jul 19 14:07:57 BST 2000 Tony Gale <gale@gtk.org>
|
Wed Jul 19 14:07:57 BST 2000 Tony Gale <gale@gtk.org>
|
||||||
|
|
||||||
* docs/tutorial/gtk-tut.sgml: Yet more clean ups.
|
* docs/tutorial/gtk-tut.sgml: Yet more clean ups.
|
||||||
|
@ -1,3 +1,14 @@
|
|||||||
|
2000-07-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||||
|
|
||||||
|
* gdk-pixbuf/gdk-pixbuf.h, gtk/gtkhsv.h, gtk/gtktextbtree.h,
|
||||||
|
gtk/gtktextbuffer.h, gtk/gtktextchild.h, gtk/gtktextdisplay.h,
|
||||||
|
gtk/gtktextiter.h, gtk/gtktextiterprivate.h, gtk/gtktextlayout.h,
|
||||||
|
gtk/gtktextmarkprivate.h, gtk/gtktextsegment.h, gtk/gtktexttag.h,
|
||||||
|
gtk/gtktexttagtable.h, gtk/gtktexttypes.h, gtk/gtktextview.h,
|
||||||
|
gtk/gtktypeutils.h: Include files outside of the extern "C"
|
||||||
|
block. Makes some C++ compiler happy. Reported by Denis Vakatov
|
||||||
|
<vakatov@peony.nlm.nih.gov>.
|
||||||
|
|
||||||
Wed Jul 19 14:07:57 BST 2000 Tony Gale <gale@gtk.org>
|
Wed Jul 19 14:07:57 BST 2000 Tony Gale <gale@gtk.org>
|
||||||
|
|
||||||
* docs/tutorial/gtk-tut.sgml: Yet more clean ups.
|
* docs/tutorial/gtk-tut.sgml: Yet more clean ups.
|
||||||
|
@ -1,3 +1,14 @@
|
|||||||
|
2000-07-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||||
|
|
||||||
|
* gdk-pixbuf/gdk-pixbuf.h, gtk/gtkhsv.h, gtk/gtktextbtree.h,
|
||||||
|
gtk/gtktextbuffer.h, gtk/gtktextchild.h, gtk/gtktextdisplay.h,
|
||||||
|
gtk/gtktextiter.h, gtk/gtktextiterprivate.h, gtk/gtktextlayout.h,
|
||||||
|
gtk/gtktextmarkprivate.h, gtk/gtktextsegment.h, gtk/gtktexttag.h,
|
||||||
|
gtk/gtktexttagtable.h, gtk/gtktexttypes.h, gtk/gtktextview.h,
|
||||||
|
gtk/gtktypeutils.h: Include files outside of the extern "C"
|
||||||
|
block. Makes some C++ compiler happy. Reported by Denis Vakatov
|
||||||
|
<vakatov@peony.nlm.nih.gov>.
|
||||||
|
|
||||||
Wed Jul 19 14:07:57 BST 2000 Tony Gale <gale@gtk.org>
|
Wed Jul 19 14:07:57 BST 2000 Tony Gale <gale@gtk.org>
|
||||||
|
|
||||||
* docs/tutorial/gtk-tut.sgml: Yet more clean ups.
|
* docs/tutorial/gtk-tut.sgml: Yet more clean ups.
|
||||||
|
@ -26,14 +26,14 @@
|
|||||||
#ifndef GDK_PIXBUF_H
|
#ifndef GDK_PIXBUF_H
|
||||||
#define GDK_PIXBUF_H
|
#define GDK_PIXBUF_H
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
#include <gdk-pixbuf/gdk-pixbuf-features.h>
|
#include <gdk-pixbuf/gdk-pixbuf-features.h>
|
||||||
#include <gobject/gobject.h>
|
#include <gobject/gobject.h>
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* Color spaces; right now only RGB is supported */
|
/* Color spaces; right now only RGB is supported */
|
||||||
|
@ -31,14 +31,12 @@
|
|||||||
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
|
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <gtk/gtkwidget.h>
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <gtk/gtkwidget.h>
|
|
||||||
|
|
||||||
|
|
||||||
#define GTK_TYPE_HSV (gtk_hsv_get_type ())
|
#define GTK_TYPE_HSV (gtk_hsv_get_type ())
|
||||||
#define GTK_HSV(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_HSV, GtkHSV))
|
#define GTK_HSV(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_HSV, GtkHSV))
|
||||||
#define GTK_HSV_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_HSV, GtkHSV))
|
#define GTK_HSV_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_HSV, GtkHSV))
|
||||||
|
@ -1,10 +1,6 @@
|
|||||||
#ifndef GTK_TEXT_BTREE_H
|
#ifndef GTK_TEXT_BTREE_H
|
||||||
#define GTK_TEXT_BTREE_H
|
#define GTK_TEXT_BTREE_H
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif /* __cplusplus */
|
|
||||||
|
|
||||||
#include <gtk/gtktextbuffer.h>
|
#include <gtk/gtktextbuffer.h>
|
||||||
#include <gtk/gtktexttag.h>
|
#include <gtk/gtktexttag.h>
|
||||||
#include <gtk/gtktextmark.h>
|
#include <gtk/gtktextmark.h>
|
||||||
@ -12,6 +8,9 @@ extern "C" {
|
|||||||
#include <gtk/gtktextsegment.h>
|
#include <gtk/gtktextsegment.h>
|
||||||
#include <gtk/gtktextiter.h>
|
#include <gtk/gtktextiter.h>
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif /* __cplusplus */
|
||||||
|
|
||||||
GtkTextBTree *gtk_text_btree_new (GtkTextTagTable *table,
|
GtkTextBTree *gtk_text_btree_new (GtkTextTagTable *table,
|
||||||
GtkTextBuffer *buffer);
|
GtkTextBuffer *buffer);
|
||||||
|
@ -1,6 +1,11 @@
|
|||||||
#ifndef GTK_TEXT_BUFFER_H
|
#ifndef GTK_TEXT_BUFFER_H
|
||||||
#define GTK_TEXT_BUFFER_H
|
#define GTK_TEXT_BUFFER_H
|
||||||
|
|
||||||
|
#include <gtk/gtkwidget.h>
|
||||||
|
#include <gtk/gtktexttagtable.h>
|
||||||
|
#include <gtk/gtktextiter.h>
|
||||||
|
#include <gtk/gtktextmark.h>
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif /* __cplusplus */
|
#endif /* __cplusplus */
|
||||||
@ -10,11 +15,6 @@ extern "C" {
|
|||||||
* GtkTextBTree is the PRIVATE internal representation of it.
|
* GtkTextBTree is the PRIVATE internal representation of it.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <gtk/gtkwidget.h>
|
|
||||||
#include <gtk/gtktexttagtable.h>
|
|
||||||
#include <gtk/gtktextiter.h>
|
|
||||||
#include <gtk/gtktextmark.h>
|
|
||||||
|
|
||||||
typedef struct _GtkTextBTree GtkTextBTree;
|
typedef struct _GtkTextBTree GtkTextBTree;
|
||||||
|
|
||||||
#define GTK_TYPE_TEXT_BUFFER (gtk_text_buffer_get_type())
|
#define GTK_TYPE_TEXT_BUFFER (gtk_text_buffer_get_type())
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
#ifndef GTK_TEXT_CHILD_H
|
#ifndef GTK_TEXT_CHILD_H
|
||||||
#define GTK_TEXT_CHILD_H
|
#define GTK_TEXT_CHILD_H
|
||||||
|
|
||||||
|
#include <gtk/gtktexttypes.h>
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif /* __cplusplus */
|
#endif /* __cplusplus */
|
||||||
|
|
||||||
#include <gtk/gtktexttypes.h>
|
|
||||||
|
|
||||||
typedef struct _GtkTextPixmap GtkTextPixmap;
|
typedef struct _GtkTextPixmap GtkTextPixmap;
|
||||||
|
|
||||||
struct _GtkTextPixmap {
|
struct _GtkTextPixmap {
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
#ifndef GTK_TEXT_DISPLAY_H
|
#ifndef GTK_TEXT_DISPLAY_H
|
||||||
#define GTK_TEXT_DISPLAY_H
|
#define GTK_TEXT_DISPLAY_H
|
||||||
|
|
||||||
|
#include <gtk/gtktextlayout.h>
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif /* __cplusplus */
|
#endif /* __cplusplus */
|
||||||
@ -10,8 +12,6 @@ extern "C" {
|
|||||||
uses GtkTextLayout
|
uses GtkTextLayout
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <gtk/gtktextlayout.h>
|
|
||||||
|
|
||||||
/* The drawable should be pre-initialized to your preferred
|
/* The drawable should be pre-initialized to your preferred
|
||||||
background. */
|
background. */
|
||||||
void gtk_text_layout_draw (GtkTextLayout *layout,
|
void gtk_text_layout_draw (GtkTextLayout *layout,
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
#ifndef GTK_TEXT_ITER_H
|
#ifndef GTK_TEXT_ITER_H
|
||||||
#define GTK_TEXT_ITER_H
|
#define GTK_TEXT_ITER_H
|
||||||
|
|
||||||
|
#include <gtk/gtktexttag.h>
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif /* __cplusplus */
|
#endif /* __cplusplus */
|
||||||
@ -11,8 +13,6 @@ extern "C" {
|
|||||||
* are changed.
|
* are changed.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <gtk/gtktexttag.h>
|
|
||||||
|
|
||||||
typedef struct _GtkTextBuffer GtkTextBuffer;
|
typedef struct _GtkTextBuffer GtkTextBuffer;
|
||||||
|
|
||||||
struct _GtkTextIter {
|
struct _GtkTextIter {
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
#ifndef GTK_TEXT_ITER_PRIVATE_H
|
#ifndef GTK_TEXT_ITER_PRIVATE_H
|
||||||
#define GTK_TEXT_ITER_PRIVATE_H
|
#define GTK_TEXT_ITER_PRIVATE_H
|
||||||
|
|
||||||
|
#include <gtk/gtktextiter.h>
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif /* __cplusplus */
|
#endif /* __cplusplus */
|
||||||
|
|
||||||
#include <gtk/gtktextiter.h>
|
|
||||||
|
|
||||||
GtkTextLineSegment *gtk_text_iter_get_indexable_segment(const GtkTextIter *iter);
|
GtkTextLineSegment *gtk_text_iter_get_indexable_segment(const GtkTextIter *iter);
|
||||||
GtkTextLineSegment *gtk_text_iter_get_any_segment(const GtkTextIter *iter);
|
GtkTextLineSegment *gtk_text_iter_get_any_segment(const GtkTextIter *iter);
|
||||||
|
|
||||||
|
@ -1,6 +1,10 @@
|
|||||||
#ifndef GTK_TEXT_LAYOUT_H
|
#ifndef GTK_TEXT_LAYOUT_H
|
||||||
#define GTK_TEXT_LAYOUT_H
|
#define GTK_TEXT_LAYOUT_H
|
||||||
|
|
||||||
|
#include <gtk/gtktextbuffer.h>
|
||||||
|
#include <gtk/gtktextiter.h>
|
||||||
|
#include <gtk/gtktextbtree.h>
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif /* __cplusplus */
|
#endif /* __cplusplus */
|
||||||
@ -12,11 +16,6 @@ extern "C" {
|
|||||||
* to use it.
|
* to use it.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <gtk/gtktextbuffer.h>
|
|
||||||
#include <gtk/gtktextiter.h>
|
|
||||||
#include <gtk/gtktextbtree.h>
|
|
||||||
|
|
||||||
|
|
||||||
#define GTK_TYPE_TEXT_LAYOUT (gtk_text_layout_get_type())
|
#define GTK_TYPE_TEXT_LAYOUT (gtk_text_layout_get_type())
|
||||||
#define GTK_TEXT_LAYOUT(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_TEXT_LAYOUT, GtkTextLayout))
|
#define GTK_TEXT_LAYOUT(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_TEXT_LAYOUT, GtkTextLayout))
|
||||||
#define GTK_TEXT_LAYOUT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_LAYOUT, GtkTextLayoutClass))
|
#define GTK_TEXT_LAYOUT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_LAYOUT, GtkTextLayoutClass))
|
||||||
|
@ -1,13 +1,12 @@
|
|||||||
#ifndef GTK_TEXT_MARK_PRIVATE_H
|
#ifndef GTK_TEXT_MARK_PRIVATE_H
|
||||||
#define GTK_TEXT_MARK_PRIVATE_H
|
#define GTK_TEXT_MARK_PRIVATE_H
|
||||||
|
|
||||||
|
#include <gtk/gtktexttypes.h>
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif /* __cplusplus */
|
#endif /* __cplusplus */
|
||||||
|
|
||||||
#include <gtk/gtktexttypes.h>
|
|
||||||
|
|
||||||
|
|
||||||
#define GTK_IS_TEXT_MARK(mark) (((GtkTextLineSegment*)mark)->type == >k_text_left_mark_type || \
|
#define GTK_IS_TEXT_MARK(mark) (((GtkTextLineSegment*)mark)->type == >k_text_left_mark_type || \
|
||||||
((GtkTextLineSegment*)mark)->type == >k_text_right_mark_type)
|
((GtkTextLineSegment*)mark)->type == >k_text_right_mark_type)
|
||||||
|
|
||||||
|
@ -1,6 +1,11 @@
|
|||||||
#ifndef GTK_TEXT_SEGMENT_H
|
#ifndef GTK_TEXT_SEGMENT_H
|
||||||
#define GTK_TEXT_SEGMENT_H
|
#define GTK_TEXT_SEGMENT_H
|
||||||
|
|
||||||
|
#include <gtk/gtktexttag.h>
|
||||||
|
#include <gtk/gtktextiter.h>
|
||||||
|
#include <gtk/gtktextmarkprivate.h>
|
||||||
|
#include <gtk/gtktextchild.h>
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif /* __cplusplus */
|
#endif /* __cplusplus */
|
||||||
@ -15,11 +20,6 @@ extern "C" {
|
|||||||
/* This header has the segment type, and two specific segments
|
/* This header has the segment type, and two specific segments
|
||||||
(character and toggle segments) */
|
(character and toggle segments) */
|
||||||
|
|
||||||
#include <gtk/gtktexttag.h>
|
|
||||||
#include <gtk/gtktextiter.h>
|
|
||||||
#include <gtk/gtktextmarkprivate.h>
|
|
||||||
#include <gtk/gtktextchild.h>
|
|
||||||
|
|
||||||
/* Information a BTree stores about a tag. */
|
/* Information a BTree stores about a tag. */
|
||||||
typedef struct _GtkTextTagInfo GtkTextTagInfo;
|
typedef struct _GtkTextTagInfo GtkTextTagInfo;
|
||||||
struct _GtkTextTagInfo {
|
struct _GtkTextTagInfo {
|
||||||
|
@ -1,13 +1,13 @@
|
|||||||
#ifndef GTK_TEXT_TAG_H
|
#ifndef GTK_TEXT_TAG_H
|
||||||
#define GTK_TEXT_TAG_H
|
#define GTK_TEXT_TAG_H
|
||||||
|
|
||||||
|
#include <gtk/gtkobject.h>
|
||||||
|
#include <gdk/gdk.h>
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif /* __cplusplus */
|
#endif /* __cplusplus */
|
||||||
|
|
||||||
#include <gtk/gtkobject.h>
|
|
||||||
#include <gdk/gdk.h>
|
|
||||||
|
|
||||||
typedef struct _GtkTextIter GtkTextIter;
|
typedef struct _GtkTextIter GtkTextIter;
|
||||||
typedef struct _GtkTextBTreeNode GtkTextBTreeNode;
|
typedef struct _GtkTextBTreeNode GtkTextBTreeNode;
|
||||||
typedef struct _GtkTextTagTable GtkTextTagTable;
|
typedef struct _GtkTextTagTable GtkTextTagTable;
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
#ifndef GTK_TEXT_TAG_TABLE_H
|
#ifndef GTK_TEXT_TAG_TABLE_H
|
||||||
#define GTK_TEXT_TAG_TABLE_H
|
#define GTK_TEXT_TAG_TABLE_H
|
||||||
|
|
||||||
|
#include <gtk/gtktexttag.h>
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif /* __cplusplus */
|
#endif /* __cplusplus */
|
||||||
|
|
||||||
#include <gtk/gtktexttag.h>
|
|
||||||
|
|
||||||
#define GTK_TYPE_TEXT_TAG_TABLE (gtk_text_tag_table_get_type())
|
#define GTK_TYPE_TEXT_TAG_TABLE (gtk_text_tag_table_get_type())
|
||||||
#define GTK_TEXT_TAG_TABLE(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_TEXT_TAG_TABLE, GtkTextTagTable))
|
#define GTK_TEXT_TAG_TABLE(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_TEXT_TAG_TABLE, GtkTextTagTable))
|
||||||
#define GTK_TEXT_TAG_TABLE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_TAG_TABLE, GtkTextTagTableClass))
|
#define GTK_TEXT_TAG_TABLE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_TAG_TABLE, GtkTextTagTableClass))
|
||||||
|
@ -1,15 +1,15 @@
|
|||||||
#ifndef GTK_TEXT_TYPES_H
|
#ifndef GTK_TEXT_TYPES_H
|
||||||
#define GTK_TEXT_TYPES_H
|
#define GTK_TEXT_TYPES_H
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif /* __cplusplus */
|
|
||||||
|
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
|
|
||||||
#include <gtk/gtktextbuffer.h>
|
#include <gtk/gtktextbuffer.h>
|
||||||
#include <gtk/gtktexttagprivate.h>
|
#include <gtk/gtktexttagprivate.h>
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif /* __cplusplus */
|
||||||
|
|
||||||
typedef struct _GtkTextLine GtkTextLine;
|
typedef struct _GtkTextLine GtkTextLine;
|
||||||
typedef struct _GtkTextCounter GtkTextCounter;
|
typedef struct _GtkTextCounter GtkTextCounter;
|
||||||
typedef struct _GtkTextLineSegment GtkTextLineSegment;
|
typedef struct _GtkTextLineSegment GtkTextLineSegment;
|
||||||
|
@ -1,14 +1,14 @@
|
|||||||
#ifndef GTK_TEXT_VIEW_H
|
#ifndef GTK_TEXT_VIEW_H
|
||||||
#define GTK_TEXT_VIEW_H
|
#define GTK_TEXT_VIEW_H
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif /* __cplusplus */
|
|
||||||
|
|
||||||
#include <gtk/gtkcontainer.h>
|
#include <gtk/gtkcontainer.h>
|
||||||
#include <gtk/gtkimcontext.h>
|
#include <gtk/gtkimcontext.h>
|
||||||
#include <gtk/gtktextbuffer.h>
|
#include <gtk/gtktextbuffer.h>
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif /* __cplusplus */
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
GTK_TEXT_MOVEMENT_CHAR, /* move by forw/back chars */
|
GTK_TEXT_MOVEMENT_CHAR, /* move by forw/back chars */
|
||||||
GTK_TEXT_MOVEMENT_POSITIONS, /* move by left/right chars */
|
GTK_TEXT_MOVEMENT_POSITIONS, /* move by left/right chars */
|
||||||
|
@ -95,10 +95,18 @@ typedef GBaseInitFunc GtkClassInitFunc;
|
|||||||
typedef GInstanceInitFunc GtkObjectInitFunc;
|
typedef GInstanceInitFunc GtkObjectInitFunc;
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif /* __cplusplus */
|
||||||
|
|
||||||
/* Builtin Types
|
/* Builtin Types
|
||||||
*/
|
*/
|
||||||
#include <gtk/gtktypebuiltins.h>
|
#include <gtk/gtktypebuiltins.h>
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif /* __cplusplus */
|
||||||
|
|
||||||
|
|
||||||
/* --- typedefs --- */
|
/* --- typedefs --- */
|
||||||
/* here we come with some necessary forward declarations for structures and
|
/* here we come with some necessary forward declarations for structures and
|
||||||
|
Loading…
Reference in New Issue
Block a user