diff --git a/libs/tk/ytk/gtkassistant.c b/libs/tk/ytk/gtkassistant.c index 031329dcb9..27f2b9fc72 100644 --- a/libs/tk/ytk/gtkassistant.c +++ b/libs/tk/ytk/gtkassistant.c @@ -47,7 +47,7 @@ #include "config.h" -#include +#include #include "gtkassistant.h" diff --git a/libs/tk/ytk/gtkfontsel.c b/libs/tk/ytk/gtkfontsel.c index 5bfb5b3703..c9a8089e44 100644 --- a/libs/tk/ytk/gtkfontsel.c +++ b/libs/tk/ytk/gtkfontsel.c @@ -34,7 +34,7 @@ #include #include -#include +#include #include "gdk/gdk.h" #include "gdk/gdkkeysyms.h" diff --git a/libs/tk/ytk/gtkiconview.c b/libs/tk/ytk/gtkiconview.c index 190fec8f70..6babe41f85 100644 --- a/libs/tk/ytk/gtkiconview.c +++ b/libs/tk/ytk/gtkiconview.c @@ -20,7 +20,7 @@ #include "config.h" #include -#include +#include #include diff --git a/libs/tk/ytk/ytk/gtk/gtkaccessible.h b/libs/tk/ytk/ytk/gtk/gtkaccessible.h index 04e6077126..252a0aed6f 100644 --- a/libs/tk/ytk/ytk/gtk/gtkaccessible.h +++ b/libs/tk/ytk/ytk/gtk/gtkaccessible.h @@ -24,7 +24,7 @@ #error "Only can be included directly." #endif -#include +#include #include G_BEGIN_DECLS diff --git a/libs/tk/ytk/ytk/gtk/gtkwidget.h b/libs/tk/ytk/ytk/gtk/gtkwidget.h index fc9546b226..4883cef668 100644 --- a/libs/tk/ytk/ytk/gtk/gtkwidget.h +++ b/libs/tk/ytk/ytk/gtk/gtkwidget.h @@ -37,7 +37,7 @@ #include #include #include -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ztk/atkgobjectaccessible.c b/libs/tk/ztk/atkgobjectaccessible.c index 83cb45ebf9..4ee20b7f7e 100644 --- a/libs/tk/ztk/atkgobjectaccessible.c +++ b/libs/tk/ztk/atkgobjectaccessible.c @@ -19,9 +19,9 @@ #include "config.h" -#include -#include -#include +#include +#include +#include /** * SECTION:atkgobjectaccessible diff --git a/libs/tk/ztk/wscript b/libs/tk/ztk/wscript index a057841b68..808c201aa2 100644 --- a/libs/tk/ztk/wscript +++ b/libs/tk/ztk/wscript @@ -56,8 +56,8 @@ def configure(conf): def build(bld): obj = bld.shlib(features = 'c cshlib', source = libztk_sources) obj.cflags = [ bld.env['compiler_flags_dict']['pic'] ] - obj.export_includes = ['ztk'] - obj.includes = ['.', '..', 'ztk', 'ztk/atk'] + obj.export_includes = ['.'] + obj.includes = ['.', '..', 'ztk'] obj.name = 'libztk' obj.target = 'ztk' obj.use = 'libztk-pixbuf' diff --git a/libs/tk/ztk/ztk/atk/atk-enum-types.h b/libs/tk/ztk/ztk/atk-enum-types.h similarity index 96% rename from libs/tk/ztk/ztk/atk/atk-enum-types.h rename to libs/tk/ztk/ztk/atk-enum-types.h index c6695ca731..262f255d0c 100644 --- a/libs/tk/ztk/ztk/atk/atk-enum-types.h +++ b/libs/tk/ztk/ztk/atk-enum-types.h @@ -2,13 +2,13 @@ /* This file is generated by glib-mkenums, do not modify it. This code is licensed under the same license as the containing project. Note that it links to GLib, so must comply with the LGPL linking clauses. */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __ATK_ENUM_TYPES_H__ #define __ATK_ENUM_TYPES_H__ -#include +#include #include G_BEGIN_DECLS diff --git a/libs/tk/ztk/ztk/atk.h b/libs/tk/ztk/ztk/atk.h new file mode 100755 index 0000000000..f00ce61e1f --- /dev/null +++ b/libs/tk/ztk/ztk/atk.h @@ -0,0 +1,61 @@ +/* ATK - Accessibility Toolkit + * 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 __ATK_H__ +#define __ATK_H__ + +#define __ATK_H_INSIDE__ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#undef __ATK_H_INSIDE__ + +#endif /* __ATK_H__ */ diff --git a/libs/tk/ztk/ztk/atk/atk.h b/libs/tk/ztk/ztk/atk/atk.h deleted file mode 100755 index dc121a5a5a..0000000000 --- a/libs/tk/ztk/ztk/atk/atk.h +++ /dev/null @@ -1,61 +0,0 @@ -/* ATK - Accessibility Toolkit - * 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 __ATK_H__ -#define __ATK_H__ - -#define __ATK_H_INSIDE__ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#undef __ATK_H_INSIDE__ - -#endif /* __ATK_H__ */ diff --git a/libs/tk/ztk/ztk/atk/atkaction.h b/libs/tk/ztk/ztk/atkaction.h similarity index 98% rename from libs/tk/ztk/ztk/atk/atkaction.h rename to libs/tk/ztk/ztk/atkaction.h index 371280630b..76fbccf804 100755 --- a/libs/tk/ztk/ztk/atk/atkaction.h +++ b/libs/tk/ztk/ztk/atkaction.h @@ -18,13 +18,13 @@ */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __ATK_ACTION_H__ #define __ATK_ACTION_H__ -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ztk/ztk/atk/atkcomponent.h b/libs/tk/ztk/ztk/atkcomponent.h similarity index 99% rename from libs/tk/ztk/ztk/atk/atkcomponent.h rename to libs/tk/ztk/ztk/atkcomponent.h index 9a057efdf9..7d97249738 100755 --- a/libs/tk/ztk/ztk/atk/atkcomponent.h +++ b/libs/tk/ztk/ztk/atkcomponent.h @@ -18,14 +18,14 @@ */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __ATK_COMPONENT_H__ #define __ATK_COMPONENT_H__ -#include -#include +#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ztk/ztk/atk/atkdocument.h b/libs/tk/ztk/ztk/atkdocument.h similarity index 97% rename from libs/tk/ztk/ztk/atk/atkdocument.h rename to libs/tk/ztk/ztk/atkdocument.h index aa38d3e8ad..3435e34c5a 100755 --- a/libs/tk/ztk/ztk/atk/atkdocument.h +++ b/libs/tk/ztk/ztk/atkdocument.h @@ -18,14 +18,14 @@ */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __ATK_DOCUMENT_H__ #define __ATK_DOCUMENT_H__ -#include -#include +#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ztk/ztk/atk/atkeditabletext.h b/libs/tk/ztk/ztk/atkeditabletext.h similarity index 97% rename from libs/tk/ztk/ztk/atk/atkeditabletext.h rename to libs/tk/ztk/ztk/atkeditabletext.h index f78f267b52..3e8f91fbdf 100755 --- a/libs/tk/ztk/ztk/atk/atkeditabletext.h +++ b/libs/tk/ztk/ztk/atkeditabletext.h @@ -18,14 +18,14 @@ */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __ATK_EDITABLE_TEXT_H__ #define __ATK_EDITABLE_TEXT_H__ -#include -#include +#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ztk/ztk/atk/atkgobjectaccessible.h b/libs/tk/ztk/ztk/atkgobjectaccessible.h similarity index 96% rename from libs/tk/ztk/ztk/atk/atkgobjectaccessible.h rename to libs/tk/ztk/ztk/atkgobjectaccessible.h index f843370d23..8eeec82c98 100644 --- a/libs/tk/ztk/ztk/atk/atkgobjectaccessible.h +++ b/libs/tk/ztk/ztk/atkgobjectaccessible.h @@ -18,13 +18,13 @@ */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __ATK_GOBJECT_ACCESSIBLE_H__ #define __ATK_GOBJECT_ACCESSIBLE_H__ -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ztk/ztk/atk/atkhyperlink.h b/libs/tk/ztk/ztk/atkhyperlink.h similarity index 98% rename from libs/tk/ztk/ztk/atk/atkhyperlink.h rename to libs/tk/ztk/ztk/atkhyperlink.h index 6e8dc74c49..ba975e3c84 100755 --- a/libs/tk/ztk/ztk/atk/atkhyperlink.h +++ b/libs/tk/ztk/ztk/atkhyperlink.h @@ -18,13 +18,13 @@ */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __ATK_HYPERLINK_H__ #define __ATK_HYPERLINK_H__ -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ztk/ztk/atk/atkhyperlinkimpl.h b/libs/tk/ztk/ztk/atkhyperlinkimpl.h similarity index 95% rename from libs/tk/ztk/ztk/atk/atkhyperlinkimpl.h rename to libs/tk/ztk/ztk/atkhyperlinkimpl.h index 65568b59d2..d3f5aef0f6 100644 --- a/libs/tk/ztk/ztk/atk/atkhyperlinkimpl.h +++ b/libs/tk/ztk/ztk/atkhyperlinkimpl.h @@ -18,14 +18,14 @@ */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __ATK_HYPERLINK_IMPL_H__ #define __ATK_HYPERLINK_IMPL_H__ -#include -#include +#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ztk/ztk/atk/atkhypertext.h b/libs/tk/ztk/ztk/atkhypertext.h similarity index 96% rename from libs/tk/ztk/ztk/atk/atkhypertext.h rename to libs/tk/ztk/ztk/atkhypertext.h index 6a972156f9..7af147fd86 100755 --- a/libs/tk/ztk/ztk/atk/atkhypertext.h +++ b/libs/tk/ztk/ztk/atkhypertext.h @@ -18,14 +18,14 @@ */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __ATK_HYPERTEXT_H__ #define __ATK_HYPERTEXT_H__ -#include -#include +#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ztk/ztk/atk/atkimage.h b/libs/tk/ztk/ztk/atkimage.h similarity index 97% rename from libs/tk/ztk/ztk/atk/atkimage.h rename to libs/tk/ztk/ztk/atkimage.h index 4905cd1ce8..68a380d913 100755 --- a/libs/tk/ztk/ztk/atk/atkimage.h +++ b/libs/tk/ztk/ztk/atkimage.h @@ -18,14 +18,14 @@ */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __ATK_IMAGE_H__ #define __ATK_IMAGE_H__ -#include -#include +#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ztk/ztk/atk/atkmarshal.h b/libs/tk/ztk/ztk/atkmarshal.h similarity index 100% rename from libs/tk/ztk/ztk/atk/atkmarshal.h rename to libs/tk/ztk/ztk/atkmarshal.h diff --git a/libs/tk/ztk/ztk/atk/atkmisc.h b/libs/tk/ztk/ztk/atkmisc.h similarity index 97% rename from libs/tk/ztk/ztk/atk/atkmisc.h rename to libs/tk/ztk/ztk/atkmisc.h index e898e35d61..694a8f173a 100755 --- a/libs/tk/ztk/ztk/atk/atkmisc.h +++ b/libs/tk/ztk/ztk/atkmisc.h @@ -18,14 +18,14 @@ */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __ATK_MISC_H__ #define __ATK_MISC_H__ #include -#include +#include /* We prefix variable declarations so they can * properly get exported in Windows DLLs. diff --git a/libs/tk/ztk/ztk/atk/atknoopobject.h b/libs/tk/ztk/ztk/atknoopobject.h similarity index 96% rename from libs/tk/ztk/ztk/atk/atknoopobject.h rename to libs/tk/ztk/ztk/atknoopobject.h index 9c02a19c23..fe244747fb 100644 --- a/libs/tk/ztk/ztk/atk/atknoopobject.h +++ b/libs/tk/ztk/ztk/atknoopobject.h @@ -18,10 +18,10 @@ */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif -#include +#include #ifndef __ATK_NO_OP_OBJECT_H__ #define __ATK_NO_OP_OBJECT_H__ diff --git a/libs/tk/ztk/ztk/atk/atknoopobjectfactory.h b/libs/tk/ztk/ztk/atknoopobjectfactory.h similarity index 96% rename from libs/tk/ztk/ztk/atk/atknoopobjectfactory.h rename to libs/tk/ztk/ztk/atknoopobjectfactory.h index 953e8fe40c..b4f322b54f 100755 --- a/libs/tk/ztk/ztk/atk/atknoopobjectfactory.h +++ b/libs/tk/ztk/ztk/atknoopobjectfactory.h @@ -18,13 +18,13 @@ */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __ATK_NO_OP_OBJECT_FACTORY_H__ #define __ATK_NO_OP_OBJECT_FACTORY_H__ -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ztk/ztk/atk/atkobject.h b/libs/tk/ztk/ztk/atkobject.h similarity index 99% rename from libs/tk/ztk/ztk/atk/atkobject.h rename to libs/tk/ztk/ztk/atkobject.h index 93b7c846b0..4d218384ba 100755 --- a/libs/tk/ztk/ztk/atk/atkobject.h +++ b/libs/tk/ztk/ztk/atkobject.h @@ -18,7 +18,7 @@ */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __ATK_OBJECT_H__ @@ -26,9 +26,9 @@ #include -#include -#include -#include +#include +#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ztk/ztk/atk/atkobjectfactory.h b/libs/tk/ztk/ztk/atkobjectfactory.h similarity index 97% rename from libs/tk/ztk/ztk/atk/atkobjectfactory.h rename to libs/tk/ztk/ztk/atkobjectfactory.h index 4c9cb102b2..2301bee7a0 100755 --- a/libs/tk/ztk/ztk/atk/atkobjectfactory.h +++ b/libs/tk/ztk/ztk/atkobjectfactory.h @@ -18,14 +18,14 @@ */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __ATK_OBJECT_FACTORY_H__ #define __ATK_OBJECT_FACTORY_H__ #include -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ztk/ztk/atk/atkplug.h b/libs/tk/ztk/ztk/atkplug.h similarity index 96% rename from libs/tk/ztk/ztk/atk/atkplug.h rename to libs/tk/ztk/ztk/atkplug.h index 1e6813f23b..173335e40b 100644 --- a/libs/tk/ztk/ztk/atk/atkplug.h +++ b/libs/tk/ztk/ztk/atkplug.h @@ -18,13 +18,13 @@ */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __ATK_PLUG_H__ #define __ATK_PLUG_H__ -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ztk/ztk/atk/atkprivate.h b/libs/tk/ztk/ztk/atkprivate.h similarity index 95% rename from libs/tk/ztk/ztk/atk/atkprivate.h rename to libs/tk/ztk/ztk/atkprivate.h index 3d33c90020..96ed852400 100644 --- a/libs/tk/ztk/ztk/atk/atkprivate.h +++ b/libs/tk/ztk/ztk/atkprivate.h @@ -20,7 +20,7 @@ */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __ATK_PRIVATE_H__ diff --git a/libs/tk/ztk/ztk/atk/atkrange.h b/libs/tk/ztk/ztk/atkrange.h similarity index 95% rename from libs/tk/ztk/ztk/atk/atkrange.h rename to libs/tk/ztk/ztk/atkrange.h index 0dd585c8c4..12eda8e5d4 100644 --- a/libs/tk/ztk/ztk/atk/atkrange.h +++ b/libs/tk/ztk/ztk/atkrange.h @@ -19,14 +19,14 @@ * Boston, MA 02111-1307, USA. */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __ATK_RANGE_H__ #define __ATK_RANGE_H__ #include -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ztk/ztk/atk/atkregistry.h b/libs/tk/ztk/ztk/atkregistry.h similarity index 98% rename from libs/tk/ztk/ztk/atk/atkregistry.h rename to libs/tk/ztk/ztk/atkregistry.h index 24909408f8..56d8340c8d 100644 --- a/libs/tk/ztk/ztk/atk/atkregistry.h +++ b/libs/tk/ztk/ztk/atkregistry.h @@ -18,7 +18,7 @@ */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __ATK_REGISTRY_H__ diff --git a/libs/tk/ztk/ztk/atk/atkrelation.h b/libs/tk/ztk/ztk/atkrelation.h similarity index 96% rename from libs/tk/ztk/ztk/atk/atkrelation.h rename to libs/tk/ztk/ztk/atkrelation.h index 0c958fa76d..cf2d3cfcdd 100755 --- a/libs/tk/ztk/ztk/atk/atkrelation.h +++ b/libs/tk/ztk/ztk/atkrelation.h @@ -18,7 +18,7 @@ */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __ATK_RELATION_H__ @@ -27,8 +27,8 @@ G_BEGIN_DECLS #include -#include -#include +#include +#include /* * An AtkRelation describes a relation between the object and one or more diff --git a/libs/tk/ztk/ztk/atk/atkrelationset.h b/libs/tk/ztk/ztk/atkrelationset.h similarity index 97% rename from libs/tk/ztk/ztk/atk/atkrelationset.h rename to libs/tk/ztk/ztk/atkrelationset.h index ed286b4aa5..1f2b210309 100755 --- a/libs/tk/ztk/ztk/atk/atkrelationset.h +++ b/libs/tk/ztk/ztk/atkrelationset.h @@ -18,7 +18,7 @@ */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __ATK_RELATION_SET_H__ @@ -27,8 +27,8 @@ G_BEGIN_DECLS #include -#include -#include +#include +#include #define ATK_TYPE_RELATION_SET (atk_relation_set_get_type ()) #define ATK_RELATION_SET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_RELATION_SET, AtkRelationSet)) diff --git a/libs/tk/ztk/ztk/atk/atkrelationtype.h b/libs/tk/ztk/ztk/atkrelationtype.h similarity index 98% rename from libs/tk/ztk/ztk/atk/atkrelationtype.h rename to libs/tk/ztk/ztk/atkrelationtype.h index c932e5641b..7c434762ca 100755 --- a/libs/tk/ztk/ztk/atk/atkrelationtype.h +++ b/libs/tk/ztk/ztk/atkrelationtype.h @@ -18,7 +18,7 @@ */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __ATK_RELATION_TYPE_H__ diff --git a/libs/tk/ztk/ztk/atk/atkselection.h b/libs/tk/ztk/ztk/atkselection.h similarity index 97% rename from libs/tk/ztk/ztk/atk/atkselection.h rename to libs/tk/ztk/ztk/atkselection.h index 0d51cf2c0d..234bd3809b 100755 --- a/libs/tk/ztk/ztk/atk/atkselection.h +++ b/libs/tk/ztk/ztk/atkselection.h @@ -18,13 +18,13 @@ */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __ATK_SELECTION_H__ #define __ATK_SELECTION_H__ -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ztk/ztk/atk/atksocket.h b/libs/tk/ztk/ztk/atksocket.h similarity index 96% rename from libs/tk/ztk/ztk/atk/atksocket.h rename to libs/tk/ztk/ztk/atksocket.h index 600559b42c..17b80eab77 100644 --- a/libs/tk/ztk/ztk/atk/atksocket.h +++ b/libs/tk/ztk/ztk/atksocket.h @@ -18,13 +18,13 @@ */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __ATK_SOCKET_H__ #define __ATK_SOCKET_H__ -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ztk/ztk/atk/atkstate.h b/libs/tk/ztk/ztk/atkstate.h similarity index 99% rename from libs/tk/ztk/ztk/atk/atkstate.h rename to libs/tk/ztk/ztk/atkstate.h index a6967ef8b7..e59e721760 100755 --- a/libs/tk/ztk/ztk/atk/atkstate.h +++ b/libs/tk/ztk/ztk/atkstate.h @@ -18,14 +18,14 @@ */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __ATK_STATE_H__ #define __ATK_STATE_H__ #include -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ztk/ztk/atk/atkstateset.h b/libs/tk/ztk/ztk/atkstateset.h similarity index 97% rename from libs/tk/ztk/ztk/atk/atkstateset.h rename to libs/tk/ztk/ztk/atkstateset.h index e67679e858..16312d793b 100755 --- a/libs/tk/ztk/ztk/atk/atkstateset.h +++ b/libs/tk/ztk/ztk/atkstateset.h @@ -18,15 +18,15 @@ */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __ATK_STATE_SET_H__ #define __ATK_STATE_SET_H__ #include -#include -#include +#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ztk/ztk/atk/atkstreamablecontent.h b/libs/tk/ztk/ztk/atkstreamablecontent.h similarity index 98% rename from libs/tk/ztk/ztk/atk/atkstreamablecontent.h rename to libs/tk/ztk/ztk/atkstreamablecontent.h index 91d09c1b67..c59b2bd820 100755 --- a/libs/tk/ztk/ztk/atk/atkstreamablecontent.h +++ b/libs/tk/ztk/ztk/atkstreamablecontent.h @@ -18,13 +18,13 @@ */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __ATK_STREAMABLE_CONTENT_H__ #define __ATK_STREAMABLE_CONTENT_H__ -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ztk/ztk/atk/atktable.h b/libs/tk/ztk/ztk/atktable.h similarity index 99% rename from libs/tk/ztk/ztk/atk/atktable.h rename to libs/tk/ztk/ztk/atktable.h index 388f1b8e08..b8bd68eac1 100755 --- a/libs/tk/ztk/ztk/atk/atktable.h +++ b/libs/tk/ztk/ztk/atktable.h @@ -18,13 +18,13 @@ */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __ATK_TABLE_H__ #define __ATK_TABLE_H__ -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ztk/ztk/atk/atktablecell.h b/libs/tk/ztk/ztk/atktablecell.h similarity index 98% rename from libs/tk/ztk/ztk/atk/atktablecell.h rename to libs/tk/ztk/ztk/atktablecell.h index 0e70d69ca6..064e974561 100755 --- a/libs/tk/ztk/ztk/atk/atktablecell.h +++ b/libs/tk/ztk/ztk/atktablecell.h @@ -18,13 +18,13 @@ */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __ATK_TABLE_CELL_H__ #define __ATK_TABLE_CELL_H__ -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ztk/ztk/atk/atktext.h b/libs/tk/ztk/ztk/atktext.h similarity index 99% rename from libs/tk/ztk/ztk/atk/atktext.h rename to libs/tk/ztk/ztk/atktext.h index cd941305d6..1e3147606b 100755 --- a/libs/tk/ztk/ztk/atk/atktext.h +++ b/libs/tk/ztk/ztk/atktext.h @@ -18,15 +18,15 @@ */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __ATK_TEXT_H__ #define __ATK_TEXT_H__ #include -#include -#include +#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ztk/ztk/atk/atkutil.h b/libs/tk/ztk/ztk/atkutil.h similarity index 99% rename from libs/tk/ztk/ztk/atk/atkutil.h rename to libs/tk/ztk/ztk/atkutil.h index 79180e23af..b98feccd16 100755 --- a/libs/tk/ztk/ztk/atk/atkutil.h +++ b/libs/tk/ztk/ztk/atkutil.h @@ -18,13 +18,13 @@ */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __ATK_UTIL_H__ #define __ATK_UTIL_H__ -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ztk/ztk/atk/atkvalue.h b/libs/tk/ztk/ztk/atkvalue.h similarity index 98% rename from libs/tk/ztk/ztk/atk/atkvalue.h rename to libs/tk/ztk/ztk/atkvalue.h index bafbed4986..812419bf15 100755 --- a/libs/tk/ztk/ztk/atk/atkvalue.h +++ b/libs/tk/ztk/ztk/atkvalue.h @@ -18,14 +18,14 @@ */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __ATK_VALUE_H__ #define __ATK_VALUE_H__ -#include -#include +#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ztk/ztk/atk/atkversion.h b/libs/tk/ztk/ztk/atkversion.h similarity index 99% rename from libs/tk/ztk/ztk/atk/atkversion.h rename to libs/tk/ztk/ztk/atkversion.h index dcdb01748e..7d1fe4e32b 100644 --- a/libs/tk/ztk/ztk/atk/atkversion.h +++ b/libs/tk/ztk/ztk/atkversion.h @@ -22,7 +22,7 @@ */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __ATK_VERSION_H__ diff --git a/libs/tk/ztk/ztk/atk/atkwindow.h b/libs/tk/ztk/ztk/atkwindow.h similarity index 95% rename from libs/tk/ztk/ztk/atk/atkwindow.h rename to libs/tk/ztk/ztk/atkwindow.h index a9a5b4b6df..0788582b2c 100644 --- a/libs/tk/ztk/ztk/atk/atkwindow.h +++ b/libs/tk/ztk/ztk/atkwindow.h @@ -18,13 +18,13 @@ */ #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __ATK_WINDOW_H__ #define __ATK_WINDOW_H__ -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ztk/ztk/atk/stamp-atkmarshal.h b/libs/tk/ztk/ztk/stamp-atkmarshal.h similarity index 100% rename from libs/tk/ztk/ztk/atk/stamp-atkmarshal.h rename to libs/tk/ztk/ztk/stamp-atkmarshal.h diff --git a/libs/tk/ztkmm/action.cc b/libs/tk/ztkmm/action.cc index 52f1b098c5..d24e17b902 100644 --- a/libs/tk/ztkmm/action.cc +++ b/libs/tk/ztkmm/action.cc @@ -27,7 +27,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include namespace diff --git a/libs/tk/ztkmm/component.cc b/libs/tk/ztkmm/component.cc index b8c1494294..dfcaede206 100644 --- a/libs/tk/ztkmm/component.cc +++ b/libs/tk/ztkmm/component.cc @@ -6,7 +6,7 @@ #include #include -#include +#include // -*- c++ -*- /* $Id: component.ccg,v 1.1 2003/01/21 13:37:05 murrayc Exp $ */ @@ -29,7 +29,7 @@ */ #include -#include +#include namespace diff --git a/libs/tk/ztkmm/document.cc b/libs/tk/ztkmm/document.cc index 43037be8ce..ac428d8245 100644 --- a/libs/tk/ztkmm/document.cc +++ b/libs/tk/ztkmm/document.cc @@ -28,7 +28,7 @@ */ #include -#include +#include namespace Atk diff --git a/libs/tk/ztkmm/editabletext.cc b/libs/tk/ztkmm/editabletext.cc index c08f9f8528..2b240c65cb 100644 --- a/libs/tk/ztkmm/editabletext.cc +++ b/libs/tk/ztkmm/editabletext.cc @@ -28,7 +28,7 @@ */ #include -#include +#include namespace diff --git a/libs/tk/ztkmm/hyperlink.cc b/libs/tk/ztkmm/hyperlink.cc index 6a8a5a5c8f..50a757fa56 100644 --- a/libs/tk/ztkmm/hyperlink.cc +++ b/libs/tk/ztkmm/hyperlink.cc @@ -28,8 +28,8 @@ */ #include -#include -#include +#include +#include namespace Atk diff --git a/libs/tk/ztkmm/hypertext.cc b/libs/tk/ztkmm/hypertext.cc index a6dcbc3992..b093986767 100644 --- a/libs/tk/ztkmm/hypertext.cc +++ b/libs/tk/ztkmm/hypertext.cc @@ -28,7 +28,7 @@ */ #include -#include +#include namespace Atk diff --git a/libs/tk/ztkmm/image.cc b/libs/tk/ztkmm/image.cc index 44f42cfe71..62d691d9a7 100644 --- a/libs/tk/ztkmm/image.cc +++ b/libs/tk/ztkmm/image.cc @@ -28,7 +28,7 @@ */ #include -#include +#include namespace diff --git a/libs/tk/ztkmm/implementor.cc b/libs/tk/ztkmm/implementor.cc index 4cf6093b8a..3d8d8a803a 100644 --- a/libs/tk/ztkmm/implementor.cc +++ b/libs/tk/ztkmm/implementor.cc @@ -28,7 +28,7 @@ */ #include -#include +#include namespace diff --git a/libs/tk/ztkmm/noopobject.cc b/libs/tk/ztkmm/noopobject.cc index 7b619ebbde..261374779b 100644 --- a/libs/tk/ztkmm/noopobject.cc +++ b/libs/tk/ztkmm/noopobject.cc @@ -27,7 +27,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include namespace diff --git a/libs/tk/ztkmm/object.cc b/libs/tk/ztkmm/object.cc index b666a04f52..976f66e2a3 100644 --- a/libs/tk/ztkmm/object.cc +++ b/libs/tk/ztkmm/object.cc @@ -6,7 +6,7 @@ #include #include -#include +#include // -*- c++ -*- /* $Id: object.ccg,v 1.1 2003/01/21 13:37:06 murrayc Exp $ */ @@ -32,7 +32,7 @@ #include #include #include -#include +#include namespace Atk diff --git a/libs/tk/ztkmm/objectaccessible.cc b/libs/tk/ztkmm/objectaccessible.cc index 2df5df523c..dfeed23512 100644 --- a/libs/tk/ztkmm/objectaccessible.cc +++ b/libs/tk/ztkmm/objectaccessible.cc @@ -29,7 +29,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include namespace { } // anonymous namespace diff --git a/libs/tk/ztkmm/relation.cc b/libs/tk/ztkmm/relation.cc index fbce8404c7..4a5dbcecff 100644 --- a/libs/tk/ztkmm/relation.cc +++ b/libs/tk/ztkmm/relation.cc @@ -6,7 +6,7 @@ #include #include -#include +#include // -*- c++ -*- /* $Id: relation.ccg,v 1.2 2003/09/30 14:28:09 murrayc Exp $ */ @@ -29,8 +29,8 @@ */ #include -#include -#include +#include +#include namespace Atk diff --git a/libs/tk/ztkmm/relationset.cc b/libs/tk/ztkmm/relationset.cc index 6844a5b43a..dabfc7d84f 100644 --- a/libs/tk/ztkmm/relationset.cc +++ b/libs/tk/ztkmm/relationset.cc @@ -27,8 +27,8 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include -#include +#include +#include namespace diff --git a/libs/tk/ztkmm/selection.cc b/libs/tk/ztkmm/selection.cc index e673a62bf4..51ea5430b6 100644 --- a/libs/tk/ztkmm/selection.cc +++ b/libs/tk/ztkmm/selection.cc @@ -28,7 +28,7 @@ */ #include -#include +#include namespace diff --git a/libs/tk/ztkmm/stateset.cc b/libs/tk/ztkmm/stateset.cc index 790971d824..47c0102269 100644 --- a/libs/tk/ztkmm/stateset.cc +++ b/libs/tk/ztkmm/stateset.cc @@ -6,7 +6,7 @@ #include #include -#include +#include // -*- c++ -*- /* $Id: stateset.ccg,v 1.1 2003/01/21 13:37:07 murrayc Exp $ */ @@ -28,8 +28,8 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include -#include +#include +#include namespace Atk diff --git a/libs/tk/ztkmm/streamablecontent.cc b/libs/tk/ztkmm/streamablecontent.cc index fc0aba8305..70d7335df8 100644 --- a/libs/tk/ztkmm/streamablecontent.cc +++ b/libs/tk/ztkmm/streamablecontent.cc @@ -28,7 +28,7 @@ */ #include -#include +#include namespace Atk diff --git a/libs/tk/ztkmm/table.cc b/libs/tk/ztkmm/table.cc index 1316b43fca..2688de9546 100644 --- a/libs/tk/ztkmm/table.cc +++ b/libs/tk/ztkmm/table.cc @@ -28,7 +28,7 @@ */ #include -#include +#include namespace Atk diff --git a/libs/tk/ztkmm/text.cc b/libs/tk/ztkmm/text.cc index 25ce4ba1da..455c6b3df1 100644 --- a/libs/tk/ztkmm/text.cc +++ b/libs/tk/ztkmm/text.cc @@ -6,7 +6,7 @@ #include #include -#include +#include // -*- c++ -*- /* $Id: text.ccg,v 1.1 2003/01/21 13:37:07 murrayc Exp $ */ diff --git a/libs/tk/ztkmm/value.cc b/libs/tk/ztkmm/value.cc index 9c405bd24f..6f07e290f0 100644 --- a/libs/tk/ztkmm/value.cc +++ b/libs/tk/ztkmm/value.cc @@ -27,7 +27,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include namespace diff --git a/libs/tk/ztkmm/ztkmm/atkmm/private/component_p.h b/libs/tk/ztkmm/ztkmm/atkmm/private/component_p.h index 5ef35cd560..0179530859 100644 --- a/libs/tk/ztkmm/ztkmm/atkmm/private/component_p.h +++ b/libs/tk/ztkmm/ztkmm/atkmm/private/component_p.h @@ -4,7 +4,7 @@ #define _ATKMM_COMPONENT_P_H -#include +#include #include diff --git a/libs/tk/ztkmm/ztkmm/atkmm/private/hyperlink_p.h b/libs/tk/ztkmm/ztkmm/atkmm/private/hyperlink_p.h index aab78fae21..28ca05bac1 100644 --- a/libs/tk/ztkmm/ztkmm/atkmm/private/hyperlink_p.h +++ b/libs/tk/ztkmm/ztkmm/atkmm/private/hyperlink_p.h @@ -5,7 +5,7 @@ #include -#include +#include #include diff --git a/libs/tk/ztkmm/ztkmm/atkmm/private/image_p.h b/libs/tk/ztkmm/ztkmm/atkmm/private/image_p.h index ae3abde468..5e3e199317 100644 --- a/libs/tk/ztkmm/ztkmm/atkmm/private/image_p.h +++ b/libs/tk/ztkmm/ztkmm/atkmm/private/image_p.h @@ -4,7 +4,7 @@ #define _ATKMM_IMAGE_P_H -#include +#include #include diff --git a/libs/tk/ztkmm/ztkmm/atkmm/private/selection_p.h b/libs/tk/ztkmm/ztkmm/atkmm/private/selection_p.h index d9cb1778a4..322e482416 100644 --- a/libs/tk/ztkmm/ztkmm/atkmm/private/selection_p.h +++ b/libs/tk/ztkmm/ztkmm/atkmm/private/selection_p.h @@ -4,7 +4,7 @@ #define _ATKMM_SELECTION_P_H -#include +#include #include diff --git a/libs/tk/ztkmm/ztkmm/atkmm/private/table_p.h b/libs/tk/ztkmm/ztkmm/atkmm/private/table_p.h index 6dad5d22c6..0d3a8b4218 100644 --- a/libs/tk/ztkmm/ztkmm/atkmm/private/table_p.h +++ b/libs/tk/ztkmm/ztkmm/atkmm/private/table_p.h @@ -4,7 +4,7 @@ #define _ATKMM_TABLE_P_H -#include +#include #include diff --git a/libs/tk/ztkmm/ztkmm/atkmm/text.h b/libs/tk/ztkmm/ztkmm/atkmm/text.h index 2156881e1b..a9d116822b 100644 --- a/libs/tk/ztkmm/ztkmm/atkmm/text.h +++ b/libs/tk/ztkmm/ztkmm/atkmm/text.h @@ -29,7 +29,7 @@ #include /* for Atk::CoordType */ #include -#include +#include #ifndef DOXYGEN_SHOULD_SKIP_THIS