Update atkmm -> ztkmm header location

libs/tk/ytkmm/main.cc

@@ -42,7 +42,7 @@
 #include <giomm/init.h>
 #include <pangomm/wrap_init.h>
 #ifdef GTKMM_ATKMM_ENABLED
-#include <atkmm/wrap_init.h>
+#include <ztkmm/wrap_init.h>
 #endif //GTKMM_ATKMM_ENABLED
 #include <gdkmm/wrap_init.h>
 #include <gtkmm/wrap_init.h>

libs/tk/ytkmm/ytkmm/gtkmm/widget.h

@@ -31,8 +31,8 @@
 #include <pangomm/layout.h>
 
 #ifdef GTKMM_ATKMM_ENABLED
-#include <atkmm/object.h>
+#include <ztkmm/object.h>
-#include <atkmm/implementor.h>
+#include <ztkmm/implementor.h>
 #endif //GTKMM_ATKMM_ENABLED
 
 #include <gdkmm/event.h>

libs/tk/ztkmm/action.cc

@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <atkmm/action.h>
+#include <ztkmm/action.h>
-#include <atkmm/private/action_p.h>
+#include <ztkmm/private/action_p.h>
 
 
 // -*- c++ -*-

libs/tk/ztkmm/component.cc

@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <atkmm/component.h>
+#include <ztkmm/component.h>
-#include <atkmm/private/component_p.h>
+#include <ztkmm/private/component_p.h>
 
 #include <ztk/atk-enum-types.h>
 
@@ -28,7 +28,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <atkmm/object.h>
+#include <ztkmm/object.h>
 #include <ztk/atkcomponent.h>
 
 

libs/tk/ztkmm/document.cc

@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <atkmm/document.h>
+#include <ztkmm/document.h>
-#include <atkmm/private/document_p.h>
+#include <ztkmm/private/document_p.h>
 
 
 // -*- c++ -*-
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <atkmm/object.h>
+#include <ztkmm/object.h>
 #include <ztk/atkdocument.h>
 
 

libs/tk/ztkmm/editabletext.cc

@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <atkmm/editabletext.h>
+#include <ztkmm/editabletext.h>
-#include <atkmm/private/editabletext_p.h>
+#include <ztkmm/private/editabletext_p.h>
 
 
 // -*- c++ -*-
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <atkmm/object.h>
+#include <ztkmm/object.h>
 #include <ztk/atkeditabletext.h>
 
 

libs/tk/ztkmm/hyperlink.cc

@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <atkmm/hyperlink.h>
+#include <ztkmm/hyperlink.h>
-#include <atkmm/private/hyperlink_p.h>
+#include <ztkmm/private/hyperlink_p.h>
 
 
 // -*- c++ -*-
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <atkmm/object.h>
+#include <ztkmm/object.h>
 #include <ztk/atkobject.h>
 #include <ztk/atkhyperlink.h>
 

libs/tk/ztkmm/hypertext.cc

@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <atkmm/hypertext.h>
+#include <ztkmm/hypertext.h>
-#include <atkmm/private/hypertext_p.h>
+#include <ztkmm/private/hypertext_p.h>
 
 
 // -*- c++ -*-
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <atkmm/object.h>
+#include <ztkmm/object.h>
 #include <ztk/atkhypertext.h>
 
 

libs/tk/ztkmm/image.cc

@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <atkmm/image.h>
+#include <ztkmm/image.h>
-#include <atkmm/private/image_p.h>
+#include <ztkmm/private/image_p.h>
 
 
 // -*- c++ -*-
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <atkmm/object.h>
+#include <ztkmm/object.h>
 #include <ztk/atkimage.h>
 
 

libs/tk/ztkmm/implementor.cc

@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <atkmm/implementor.h>
+#include <ztkmm/implementor.h>
-#include <atkmm/private/implementor_p.h>
+#include <ztkmm/private/implementor_p.h>
 
 
 // -*- c++ -*-
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <atkmm/object.h>
+#include <ztkmm/object.h>
 #include <ztk/atkobject.h>
 
 

libs/tk/ztkmm/init.cc

@@ -19,7 +19,7 @@
  */
 
 #include <glibmm/init.h>
-#include <atkmm/wrap_init.h>
+#include <ztkmm/wrap_init.h>
 
 namespace Atk
 {

libs/tk/ztkmm/noopobject.cc

@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <atkmm/noopobject.h>
+#include <ztkmm/noopobject.h>
-#include <atkmm/private/noopobject_p.h>
+#include <ztkmm/private/noopobject_p.h>
 
 
 // -*- c++ -*-

libs/tk/ztkmm/object.cc

@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <atkmm/object.h>
+#include <ztkmm/object.h>
-#include <atkmm/private/object_p.h>
+#include <ztkmm/private/object_p.h>
 
 #include <ztk/atk-enum-types.h>
 
@@ -28,10 +28,10 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <atkmm/noopobject.h>
+#include <ztkmm/noopobject.h>
-#include <atkmm/relation.h>
+#include <ztkmm/relation.h>
-#include <atkmm/relationset.h>
+#include <ztkmm/relationset.h>
-#include <atkmm/stateset.h>
+#include <ztkmm/stateset.h>
 #include <ztk/atkobject.h>
 
 

libs/tk/ztkmm/objectaccessible.cc

@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <atkmm/objectaccessible.h>
+#include <ztkmm/objectaccessible.h>
-#include <atkmm/private/objectaccessible_p.h>
+#include <ztkmm/private/objectaccessible_p.h>
 
 
 // -*- c++ -*-

libs/tk/ztkmm/relation.cc

@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <atkmm/relation.h>
+#include <ztkmm/relation.h>
-#include <atkmm/private/relation_p.h>
+#include <ztkmm/private/relation_p.h>
 
 #include <ztk/atk-enum-types.h>
 
@@ -28,7 +28,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <atkmm/object.h>
+#include <ztkmm/object.h>
 #include <ztk/atkobject.h>
 #include <ztk/atkrelation.h>
 

libs/tk/ztkmm/relationset.cc

@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <atkmm/relationset.h>
+#include <ztkmm/relationset.h>
-#include <atkmm/private/relationset_p.h>
+#include <ztkmm/private/relationset_p.h>
 
 
 // -*- c++ -*-

libs/tk/ztkmm/selection.cc

@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <atkmm/selection.h>
+#include <ztkmm/selection.h>
-#include <atkmm/private/selection_p.h>
+#include <ztkmm/private/selection_p.h>
 
 
 // -*- c++ -*-
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <atkmm/object.h>
+#include <ztkmm/object.h>
 #include <ztk/atkselection.h>
 
 

libs/tk/ztkmm/stateset.cc

@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <atkmm/stateset.h>
+#include <ztkmm/stateset.h>
-#include <atkmm/private/stateset_p.h>
+#include <ztkmm/private/stateset_p.h>
 
 #include <ztk/atk-enum-types.h>
 

libs/tk/ztkmm/streamablecontent.cc

@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <atkmm/streamablecontent.h>
+#include <ztkmm/streamablecontent.h>
-#include <atkmm/private/streamablecontent_p.h>
+#include <ztkmm/private/streamablecontent_p.h>
 
 
 // -*- c++ -*-
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <atkmm/object.h>
+#include <ztkmm/object.h>
 #include <ztk/atkstreamablecontent.h>
 
 

libs/tk/ztkmm/table.cc

@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <atkmm/table.h>
+#include <ztkmm/table.h>
-#include <atkmm/private/table_p.h>
+#include <ztkmm/private/table_p.h>
 
 
 // -*- c++ -*-
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <atkmm/object.h>
+#include <ztkmm/object.h>
 #include <ztk/atktable.h>
 
 

libs/tk/ztkmm/text.cc

@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <atkmm/text.h>
+#include <ztkmm/text.h>
-#include <atkmm/private/text_p.h>
+#include <ztkmm/private/text_p.h>
 
 #include <ztk/atk-enum-types.h>
 
@@ -28,7 +28,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <atkmm/object.h>
+#include <ztkmm/object.h>
 #include <glib.h>
 #include <algorithm> /* for std::swap() */
 

libs/tk/ztkmm/value.cc

@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <atkmm/value.h>
+#include <ztkmm/value.h>
-#include <atkmm/private/value_p.h>
+#include <ztkmm/private/value_p.h>
 
 
 // -*- c++ -*-

libs/tk/ztkmm/wrap_init.cc

@@ -7,30 +7,30 @@
 #undef  G_GNUC_CONST
 #define G_GNUC_CONST /* empty */
 
-#include <atkmm/wrap_init.h>
+#include <ztkmm/wrap_init.h>
 #include <glibmm/error.h>
 #include <glibmm/object.h>
 
 // #include the widget headers so that we can call the get_type() static methods:
-#include "atkmm/action.h"
+#include "ztkmm/action.h"
-#include "atkmm/component.h"
+#include "ztkmm/component.h"
-#include "atkmm/document.h"
+#include "ztkmm/document.h"
-#include "atkmm/editabletext.h"
+#include "ztkmm/editabletext.h"
-#include "atkmm/hyperlink.h"
+#include "ztkmm/hyperlink.h"
-#include "atkmm/hypertext.h"
+#include "ztkmm/hypertext.h"
-#include "atkmm/image.h"
+#include "ztkmm/image.h"
-#include "atkmm/implementor.h"
+#include "ztkmm/implementor.h"
-#include "atkmm/noopobject.h"
+#include "ztkmm/noopobject.h"
-#include "atkmm/object.h"
+#include "ztkmm/object.h"
-#include "atkmm/objectaccessible.h"
+#include "ztkmm/objectaccessible.h"
-#include "atkmm/relation.h"
+#include "ztkmm/relation.h"
-#include "atkmm/relationset.h"
+#include "ztkmm/relationset.h"
-#include "atkmm/selection.h"
+#include "ztkmm/selection.h"
-#include "atkmm/stateset.h"
+#include "ztkmm/stateset.h"
-#include "atkmm/streamablecontent.h"
+#include "ztkmm/streamablecontent.h"
-#include "atkmm/table.h"
+#include "ztkmm/table.h"
-#include "atkmm/text.h"
+#include "ztkmm/text.h"
-#include "atkmm/value.h"
+#include "ztkmm/value.h"
 
 extern "C"
 {

libs/tk/ztkmm/wscript

@@ -44,8 +44,8 @@ def build(bld):
     obj = bld.shlib(features = 'cxx cxxshlib', source=libztkmm_sources)
     obj.cxxflags        = [ bld.env['compiler_flags_dict']['pic'], '-w' ]
     obj.cflags          = [ bld.env['compiler_flags_dict']['pic'], '-w' ]
-    obj.export_includes = ['ztkmm']
+    obj.export_includes = ['.']
-    obj.includes        = ['ztkmm']
+    obj.includes        = ['.']
     obj.name            = 'libztkmm'
     obj.target          = 'ztkmm'
     obj.use             = 'libztk'

libs/tk/ztkmm/ztkmm/atkmm.h

@@ -1,73 +0,0 @@
-/* $Id$ */
-
-/* atkmm - a C++ wrapper for the GLib toolkit
- *
- * Copyright 2002 The gtkmm Development Team
- *
- * 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.1 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _ATKMM_H
-#define _ATKMM_H
-
-
-/** @mainpage atkmm Reference Manual
- *
- * @section description Description
- *
- * atkmm is the official C++ interface for the <a href="http://library.gnome.org/devel/atk/stable/">ATK</a> accessibility toolkit library. It may be used, for instance, by user interfaces implemented with gtkmm.
- *
- * @section basics Basic usage
- *
- * Include the atkmm header:
- * @code
- * #include <atkmm.h>
- * @endcode
- * This includes every header installed by atkmm, so can slow down
- * compilation, but suffices for this simple example. Assuming that your
- * program source file is @c program.cc, compile it with:
- * @code
- * g++ program.cc -o program  `pkg-config --cflags --libs atkmm-1.6`
- * @endcode
- * Alternatively, if using autoconf, use the following in @c configure.ac:
- * @code
- * PKG_CHECK_MODULES([ATKMM], [atkmm-1.6])
- * @endcode
- * Then use the generated @c ATKMM_CFLAGS and @c ATKMM_LIBS variables in
- * the project @c Makefile.am files. For example:
- * @code
- * program_CPPFLAGS = $(ATKMM_CFLAGS)
- * program_LDADD = $(ATKMM_LIBS)
- * @endcode
- */
-
-
-#include <atkmm/action.h>
-#include <atkmm/component.h>
-#include <atkmm/document.h>
-#include <atkmm/editabletext.h>
-#include <atkmm/image.h>
-#include <atkmm/implementor.h>
-#include <atkmm/object.h>
-#include <atkmm/objectaccessible.h>
-#include <atkmm/relation.h>
-#include <atkmm/relationset.h>
-#include <atkmm/selection.h>
-#include <atkmm/stateset.h>
-#include <atkmm/table.h>
-#include <atkmm/text.h>
-#include <atkmm/value.h>
-
-#endif /* _ATKMM_H */

libs/tk/ztkmm/ztkmm/editabletext.h

@@ -27,7 +27,7 @@
  */
 
 
-#include <atkmm/text.h>
+#include <ztkmm/text.h>
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 extern "C"

libs/tk/ztkmm/ztkmm/hyperlink.h

@@ -24,7 +24,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <atkmm/action.h>
+#include <ztkmm/action.h>
 
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS

libs/tk/ztkmm/ztkmm/hypertext.h

@@ -27,7 +27,7 @@
  */
 
 
-#include <atkmm/hyperlink.h>
+#include <ztkmm/hyperlink.h>
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 extern "C"

libs/tk/ztkmm/ztkmm/image.h

@@ -27,7 +27,7 @@
  */
 
 
-#include <atkmm/component.h> /* for Atk::CoordType */
+#include <ztkmm/component.h> /* for Atk::CoordType */
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 extern "C"

libs/tk/ztkmm/ztkmm/implementor.h

@@ -27,7 +27,7 @@
  */
 
 
-#include <atkmm/object.h>
+#include <ztkmm/object.h>
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 extern "C"

libs/tk/ztkmm/ztkmm/noopobject.h

@@ -26,15 +26,15 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <atkmm/object.h>
+#include <ztkmm/object.h>
-#include <atkmm/component.h>
+#include <ztkmm/component.h>
-#include <atkmm/action.h>
+#include <ztkmm/action.h>
-#include <atkmm/editabletext.h>
+#include <ztkmm/editabletext.h>
-#include <atkmm/image.h>
+#include <ztkmm/image.h>
-#include <atkmm/selection.h>
+#include <ztkmm/selection.h>
-#include <atkmm/table.h>
+#include <ztkmm/table.h>
-#include <atkmm/value.h>
+#include <ztkmm/value.h>
-#include <atkmm/hypertext.h>
+#include <ztkmm/hypertext.h>
 
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS

libs/tk/ztkmm/ztkmm/object.h

@@ -28,8 +28,8 @@
 
 
 #include <glibmm/object.h>
-#include <atkmm/component.h>
+#include <ztkmm/component.h>
-#include <atkmm/relation.h>
+#include <ztkmm/relation.h>
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 extern "C" { typedef struct _AtkPropertyValues AtkPropertyValues; }

libs/tk/ztkmm/ztkmm/objectaccessible.h

@@ -26,7 +26,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
  
-#include <atkmm/object.h>
+#include <ztkmm/object.h>
 
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS

libs/tk/ztkmm/ztkmm/private/noopobject_p.h

@@ -4,7 +4,7 @@
 #define _ATKMM_NOOPOBJECT_P_H
 
 
-#include <atkmm/private/object_p.h>
+#include <ztkmm/private/object_p.h>
 
 #include <glibmm/class.h>
 

libs/tk/ztkmm/ztkmm/private/objectaccessible_p.h

@@ -4,7 +4,7 @@
 #define _ATKMM_OBJECTACCESSIBLE_P_H
 
 
-#include <atkmm/private/object_p.h>
+#include <ztkmm/private/object_p.h>
 
 #include <glibmm/class.h>
 

libs/tk/ztkmm/ztkmm/relationset.h

@@ -27,8 +27,8 @@
  */
 
 
-#include <atkmm/relation.h>
+#include <ztkmm/relation.h>
-#include <atkmm/object.h>
+#include <ztkmm/object.h>
 
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS

libs/tk/ztkmm/ztkmm/text.h

@@ -27,7 +27,7 @@
  */
 
 
-#include <atkmm/component.h> /* for Atk::CoordType */
+#include <ztkmm/component.h> /* for Atk::CoordType */
 #include <glibmm/slisthandle.h>
 #include <ztk/atktext.h>