Attach as AtkImplementorIface method

	* atk.defs (atk_implementor_ref_accessible): Attach as
	AtkImplementorIface method

	* atk-types.defs (AtkImplementorIface): Revert to registered name.

	* gtk/gtk-base-types.defs: Annotate interfaces with prerequisites
	and objects with interface implementations

	* gtk/gtk-2.10-types.defs: Annotate interfaces with prerequisites
	and objects with interface implementations. Reorganize.

5 files changed, 204 insertions, 168 deletions

diff --git a/ChangeLog b/ChangeLog
index 9c7b898b..7a8e9cb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2006-07-22  John Finlay  <finlay@moeraki.com>
 
+	* atk.defs (atk_implementor_ref_accessible): Attach as
+	AtkImplementorIface method
+
+	* atk-types.defs (AtkImplementorIface): Revert to registered name.
+
+	* gtk/gtk-base-types.defs: Annotate interfaces with prerequisites
+	and objects with interface implementations
+
+	* gtk/gtk-2.10-types.defs: Annotate interfaces with prerequisites
+	and objects with interface implementations. Reorganize.
+
 	* codegen/reversewrapper.py (VoidReturn.write_conversion) 
 	(DoubleReturn.write_conversion, GBoxedReturn.write_conversion): Use
 	failure_exception instead of failure_cleanup
diff --git a/atk-types.defs b/atk-types.defs
index 1cdd432a..becb6ed2 100644
--- a/atk-types.defs
+++ b/atk-types.defs
@@ -113,9 +113,9 @@
   (gtype-id "ATK_TYPE_IMAGE")
 )
 
-(define-interface Implementor
+(define-interface ImplementorIface
   (in-module "Atk")
-  (c-name "AtkImplementor")
+  (c-name "AtkImplementorIface")
   (gtype-id "ATK_TYPE_IMPLEMENTOR")
 )
 
diff --git a/atk.defs b/atk.defs
index 12d5d693..d592a3ca 100644
--- a/atk.defs
+++ b/atk.defs
@@ -566,7 +566,7 @@
 )
 
 (define-method ref_accessible
-  (of-object "AtkImplementor")
+  (of-object "AtkImplementorIface")
   (c-name "atk_implementor_ref_accessible")
   (return-type "AtkObject*")
 )
diff --git a/gtk/gtk-2.10-types.defs b/gtk/gtk-2.10-types.defs
index e5728f2e..5d00e049 100644
--- a/gtk/gtk-2.10-types.defs
+++ b/gtk/gtk-2.10-types.defs
@@ -1,5 +1,49 @@
 ;; -*- scheme -*-
+; boxed definitions ...
+
+(define-boxed PaperSize
+  (in-module "Gtk")
+  (c-name "GtkPaperSize")
+  (gtype-id "GTK_TYPE_PAPER_SIZE")
+)
+
+(define-boxed RecentInfo
+  (in-module "Gtk")
+  (c-name "GtkRecentInfo")
+  (gtype-id "GTK_TYPE_RECENT_INFO")
+)
+
+(define-boxed TargetList
+  (in-module "Gtk")
+  (c-name "GtkTargetList")
+  (gtype-id "GTK_TYPE_TARGET_LIST")
+)
+
+; interface definitions ...
+
+(define-interface PrintOperationPreview
+  (in-module "Gtk")
+  (c-name "GtkPrintOperationPreview")
+  (gtype-id "GTK_TYPE_PRINT_OPERATION_PREVIEW")
+  (prerequisite "GObject")
+)
+
+(define-interface RecentChooser
+  (in-module "Gtk")
+  (c-name "GtkRecentChooser")
+  (gtype-id "GTK_TYPE_RECENT_CHOOSER")
+  (prerequisite "GtkObject")
+)
+
 ; object definitions ...
+
+(define-object Assistant
+  (in-module "Gtk")
+  (parent "GtkWindow")
+  (c-name "GtkAssistant")
+  (gtype-id "GTK_TYPE_ASSISTANT")
+)
+
 (define-object CellRendererAccel
   (in-module "Gtk")
   (parent "GtkCellRendererText")
@@ -14,10 +58,11 @@
   (gtype-id "GTK_TYPE_CELL_RENDERER_SPIN")
 )
 
-(define-boxed TargetList
+(define-object LinkButton
   (in-module "Gtk")
-  (c-name "GtkTargetList")
-  (gtype-id "GTK_TYPE_TARGET_LIST")
+  (parent "GtkButton")
+  (c-name "GtkLinkButton")
+  (gtype-id "GTK_TYPE_LINK_BUTTON")
 )
 
 (define-object PageSetup
@@ -42,12 +87,6 @@
   (implements "GtkPrintOperationPreview")
 )
 
-(define-interface PrintOperationPreview
-  (in-module "Gtk")
-  (c-name "GtkPrintOperationPreview")
-  (gtype-id "GTK_TYPE_PRINT_OPERATION_PREVIEW")
-)
-
 (define-object PrintSettings
   (in-module "Gtk")
   (parent "GObject")
@@ -55,31 +94,12 @@
   (gtype-id "GTK_TYPE_PRINT_SETTINGS")
 )
 
-(define-interface RecentChooser
-  (in-module "Gtk")
-  (c-name "GtkRecentChooser")
-  (gtype-id "GTK_TYPE_RECENT_CHOOSER")
-)
-
-(define-object RecentFilter
-  (in-module "Gtk")
-  (parent "GtkObject")
-  (c-name "GtkRecentFilter")
-  (gtype-id "GTK_TYPE_RECENT_FILTER")
-)
-
-(define-object RecentManager
-  (in-module "Gtk")
-  (parent "GObject")
-  (c-name "GtkRecentManager")
-  (gtype-id "GTK_TYPE_RECENT_MANAGER")
-)
-
-(define-object StatusIcon
+(define-object RecentChooserDialog
   (in-module "Gtk")
-  (parent "GObject")
-  (c-name "GtkStatusIcon")
-  (gtype-id "GTK_TYPE_STATUS_ICON")
+  (parent "GtkDialog")
+  (c-name "GtkRecentChooserDialog")
+  (gtype-id "GTK_TYPE_RECENT_CHOOSER_DIALOG")
+  (implements "GtkRecentChooser")
 )
 
 (define-object RecentChooserMenu
@@ -90,13 +110,6 @@
   (implements "GtkRecentChooser")
 )
 
-(define-object LinkButton
-  (in-module "Gtk")
-  (parent "GtkButton")
-  (c-name "GtkLinkButton")
-  (gtype-id "GTK_TYPE_LINK_BUTTON")
-)
-
 (define-object RecentChooserWidget
   (in-module "Gtk")
   (parent "GtkVBox")
@@ -105,34 +118,30 @@
   (implements "GtkRecentChooser")
 )
 
-(define-object RecentChooserDialog
+(define-object RecentFilter
   (in-module "Gtk")
-  (parent "GtkDialog")
-  (c-name "GtkRecentChooserDialog")
-  (gtype-id "GTK_TYPE_RECENT_CHOOSER_DIALOG")
-  (implements "GtkRecentChooser")
+  (parent "GtkObject")
+  (c-name "GtkRecentFilter")
+  (gtype-id "GTK_TYPE_RECENT_FILTER")
 )
 
-(define-object Assistant
+(define-object RecentManager
   (in-module "Gtk")
-  (parent "GtkWindow")
-  (c-name "GtkAssistant")
-  (gtype-id "GTK_TYPE_ASSISTANT")
+  (parent "GObject")
+  (c-name "GtkRecentManager")
+  (gtype-id "GTK_TYPE_RECENT_MANAGER")
 )
 
-(define-boxed PaperSize
+(define-object StatusIcon
   (in-module "Gtk")
-  (c-name "GtkPaperSize")
-  (gtype-id "GTK_TYPE_PAPER_SIZE")
+  (parent "GObject")
+  (c-name "GtkStatusIcon")
+  (gtype-id "GTK_TYPE_STATUS_ICON")
 )
 
-(define-boxed RecentInfo
-  (in-module "Gtk")
-  (c-name "GtkRecentInfo")
-  (gtype-id "GTK_TYPE_RECENT_INFO")
-)
+; pointer definitions ...
 
-;; Enumerations and flags ...
+;; Enumerations ...
 
 (define-enum AssistantPageType
   (in-module "Gtk")
@@ -157,39 +166,6 @@
   )
 )
 
-(define-enum SensitivityType
-  (in-module "Gtk")
-  (c-name "GtkSensitivityType")
-  (gtype-id "GTK_TYPE_SENSITIVITY_TYPE")
-  (values
-    '("auto" "GTK_SENSITIVITY_AUTO")
-    '("on" "GTK_SENSITIVITY_ON")
-    '("off" "GTK_SENSITIVITY_OFF")
-  )
-)
-
-(define-enum PrintPages
-  (in-module "Gtk")
-  (c-name "GtkPrintPages")
-  (gtype-id "GTK_TYPE_PRINT_PAGES")
-  (values
-    '("all" "GTK_PRINT_PAGES_ALL")
-    '("current" "GTK_PRINT_PAGES_CURRENT")
-    '("ranges" "GTK_PRINT_PAGES_RANGES")
-  )
-)
-
-(define-enum PageSet
-  (in-module "Gtk")
-  (c-name "GtkPageSet")
-  (gtype-id "GTK_TYPE_PAGE_SET")
-  (values
-    '("all" "GTK_PAGE_SET_ALL")
-    '("even" "GTK_PAGE_SET_EVEN")
-    '("odd" "GTK_PAGE_SET_ODD")
-  )
-)
-
 (define-enum PageOrientation
   (in-module "Gtk")
   (c-name "GtkPageOrientation")
@@ -202,15 +178,14 @@
   )
 )
 
-(define-enum PrintQuality
+(define-enum PageSet
   (in-module "Gtk")
-  (c-name "GtkPrintQuality")
-  (gtype-id "GTK_TYPE_PRINT_QUALITY")
+  (c-name "GtkPageSet")
+  (gtype-id "GTK_TYPE_PAGE_SET")
   (values
-    '("low" "GTK_PRINT_QUALITY_LOW")
-    '("normal" "GTK_PRINT_QUALITY_NORMAL")
-    '("high" "GTK_PRINT_QUALITY_HIGH")
-    '("draft" "GTK_PRINT_QUALITY_DRAFT")
+    '("all" "GTK_PAGE_SET_ALL")
+    '("even" "GTK_PAGE_SET_EVEN")
+    '("odd" "GTK_PAGE_SET_ODD")
   )
 )
 
@@ -225,44 +200,26 @@
   )
 )
 
-(define-enum Unit
-  (in-module "Gtk")
-  (c-name "GtkUnit")
-  (gtype-id "GTK_TYPE_UNIT")
-  (values
-    '("pixel" "GTK_UNIT_PIXEL")
-    '("points" "GTK_UNIT_POINTS")
-    '("inch" "GTK_UNIT_INCH")
-    '("mm" "GTK_UNIT_MM")
-  )
-)
-
-(define-enum TreeViewGridLines
+(define-enum PrintError
   (in-module "Gtk")
-  (c-name "GtkTreeViewGridLines")
-  (gtype-id "GTK_TYPE_TREE_VIEW_GRID_LINES")
+  (c-name "GtkPrintError")
+  (gtype-id "GTK_TYPE_PRINT_ERROR")
   (values
-    '("none" "GTK_TREE_VIEW_GRID_LINES_NONE")
-    '("horizontal" "GTK_TREE_VIEW_GRID_LINES_HORIZONTAL")
-    '("vertical" "GTK_TREE_VIEW_GRID_LINES_VERTICAL")
-    '("both" "GTK_TREE_VIEW_GRID_LINES_BOTH")
+    '("general" "GTK_PRINT_ERROR_GENERAL")
+    '("internal-error" "GTK_PRINT_ERROR_INTERNAL_ERROR")
+    '("nomem" "GTK_PRINT_ERROR_NOMEM")
   )
 )
 
-(define-enum PrintStatus
+(define-enum PrintOperationAction
   (in-module "Gtk")
-  (c-name "GtkPrintStatus")
-  (gtype-id "GTK_TYPE_PRINT_STATUS")
+  (c-name "GtkPrintOperationAction")
+  (gtype-id "GTK_TYPE_PRINT_OPERATION_ACTION")
   (values
-    '("initial" "GTK_PRINT_STATUS_INITIAL")
-    '("preparing" "GTK_PRINT_STATUS_PREPARING")
-    '("generating-data" "GTK_PRINT_STATUS_GENERATING_DATA")
-    '("sending-data" "GTK_PRINT_STATUS_SENDING_DATA")
-    '("pending" "GTK_PRINT_STATUS_PENDING")
-    '("pending-issue" "GTK_PRINT_STATUS_PENDING_ISSUE")
-    '("printing" "GTK_PRINT_STATUS_PRINTING")
-    '("finished" "GTK_PRINT_STATUS_FINISHED")
-    '("finished-aborted" "GTK_PRINT_STATUS_FINISHED_ABORTED")
+    '("print-dialog" "GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG")
+    '("print" "GTK_PRINT_OPERATION_ACTION_PRINT")
+    '("preview" "GTK_PRINT_OPERATION_ACTION_PREVIEW")
+    '("export" "GTK_PRINT_OPERATION_ACTION_EXPORT")
   )
 )
 
@@ -278,38 +235,43 @@
   )
 )
 
-(define-enum PrintOperationAction
+(define-enum PrintPages
   (in-module "Gtk")
-  (c-name "GtkPrintOperationAction")
-  (gtype-id "GTK_TYPE_PRINT_OPERATION_ACTION")
+  (c-name "GtkPrintPages")
+  (gtype-id "GTK_TYPE_PRINT_PAGES")
   (values
-    '("print-dialog" "GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG")
-    '("print" "GTK_PRINT_OPERATION_ACTION_PRINT")
-    '("preview" "GTK_PRINT_OPERATION_ACTION_PREVIEW")
-    '("export" "GTK_PRINT_OPERATION_ACTION_EXPORT")
+    '("all" "GTK_PRINT_PAGES_ALL")
+    '("current" "GTK_PRINT_PAGES_CURRENT")
+    '("ranges" "GTK_PRINT_PAGES_RANGES")
   )
 )
 
-(define-enum PrintError
+(define-enum PrintQuality
   (in-module "Gtk")
-  (c-name "GtkPrintError")
-  (gtype-id "GTK_TYPE_PRINT_ERROR")
+  (c-name "GtkPrintQuality")
+  (gtype-id "GTK_TYPE_PRINT_QUALITY")
   (values
-    '("general" "GTK_PRINT_ERROR_GENERAL")
-    '("internal-error" "GTK_PRINT_ERROR_INTERNAL_ERROR")
-    '("nomem" "GTK_PRINT_ERROR_NOMEM")
+    '("low" "GTK_PRINT_QUALITY_LOW")
+    '("normal" "GTK_PRINT_QUALITY_NORMAL")
+    '("high" "GTK_PRINT_QUALITY_HIGH")
+    '("draft" "GTK_PRINT_QUALITY_DRAFT")
   )
 )
 
-(define-enum RecentSortType
+(define-enum PrintStatus
   (in-module "Gtk")
-  (c-name "GtkRecentSortType")
-  (gtype-id "GTK_TYPE_RECENT_SORT_TYPE")
+  (c-name "GtkPrintStatus")
+  (gtype-id "GTK_TYPE_PRINT_STATUS")
   (values
-    '("none" "GTK_RECENT_SORT_NONE")
-    '("mru" "GTK_RECENT_SORT_MRU")
-    '("lru" "GTK_RECENT_SORT_LRU")
-    '("custom" "GTK_RECENT_SORT_CUSTOM")
+    '("initial" "GTK_PRINT_STATUS_INITIAL")
+    '("preparing" "GTK_PRINT_STATUS_PREPARING")
+    '("generating-data" "GTK_PRINT_STATUS_GENERATING_DATA")
+    '("sending-data" "GTK_PRINT_STATUS_SENDING_DATA")
+    '("pending" "GTK_PRINT_STATUS_PENDING")
+    '("pending-issue" "GTK_PRINT_STATUS_PENDING_ISSUE")
+    '("printing" "GTK_PRINT_STATUS_PRINTING")
+    '("finished" "GTK_PRINT_STATUS_FINISHED")
+    '("finished-aborted" "GTK_PRINT_STATUS_FINISHED_ABORTED")
   )
 )
 
@@ -323,20 +285,6 @@
   )
 )
 
-(define-flags RecentFilterFlags
-  (in-module "Gtk")
-  (c-name "GtkRecentFilterFlags")
-  (gtype-id "GTK_TYPE_RECENT_FILTER_FLAGS")
-  (values
-    '("uri" "GTK_RECENT_FILTER_URI")
-    '("display-name" "GTK_RECENT_FILTER_DISPLAY_NAME")
-    '("mime-type" "GTK_RECENT_FILTER_MIME_TYPE")
-    '("application" "GTK_RECENT_FILTER_APPLICATION")
-    '("group" "GTK_RECENT_FILTER_GROUP")
-    '("age" "GTK_RECENT_FILTER_AGE")
-  )
-)
-
 (define-enum RecentManagerError
   (in-module "Gtk")
   (c-name "GtkRecentManagerError")
@@ -352,6 +300,29 @@
   )
 )
 
+(define-enum RecentSortType
+  (in-module "Gtk")
+  (c-name "GtkRecentSortType")
+  (gtype-id "GTK_TYPE_RECENT_SORT_TYPE")
+  (values
+    '("none" "GTK_RECENT_SORT_NONE")
+    '("mru" "GTK_RECENT_SORT_MRU")
+    '("lru" "GTK_RECENT_SORT_LRU")
+    '("custom" "GTK_RECENT_SORT_CUSTOM")
+  )
+)
+
+(define-enum SensitivityType
+  (in-module "Gtk")
+  (c-name "GtkSensitivityType")
+  (gtype-id "GTK_TYPE_SENSITIVITY_TYPE")
+  (values
+    '("auto" "GTK_SENSITIVITY_AUTO")
+    '("on" "GTK_SENSITIVITY_ON")
+    '("off" "GTK_SENSITIVITY_OFF")
+  )
+)
+
 (define-enum TextBufferTargetInfo
   (in-module "Gtk")
   (c-name "GtkTextBufferTargetInfo")
@@ -363,3 +334,43 @@
   )
 )
 
+(define-enum TreeViewGridLines
+  (in-module "Gtk")
+  (c-name "GtkTreeViewGridLines")
+  (gtype-id "GTK_TYPE_TREE_VIEW_GRID_LINES")
+  (values
+    '("none" "GTK_TREE_VIEW_GRID_LINES_NONE")
+    '("horizontal" "GTK_TREE_VIEW_GRID_LINES_HORIZONTAL")
+    '("vertical" "GTK_TREE_VIEW_GRID_LINES_VERTICAL")
+    '("both" "GTK_TREE_VIEW_GRID_LINES_BOTH")
+  )
+)
+
+(define-enum Unit
+  (in-module "Gtk")
+  (c-name "GtkUnit")
+  (gtype-id "GTK_TYPE_UNIT")
+  (values
+    '("pixel" "GTK_UNIT_PIXEL")
+    '("points" "GTK_UNIT_POINTS")
+    '("inch" "GTK_UNIT_INCH")
+    '("mm" "GTK_UNIT_MM")
+  )
+)
+
+;; Flags ...
+
+(define-flags RecentFilterFlags
+  (in-module "Gtk")
+  (c-name "GtkRecentFilterFlags")
+  (gtype-id "GTK_TYPE_RECENT_FILTER_FLAGS")
+  (values
+    '("uri" "GTK_RECENT_FILTER_URI")
+    '("display-name" "GTK_RECENT_FILTER_DISPLAY_NAME")
+    '("mime-type" "GTK_RECENT_FILTER_MIME_TYPE")
+    '("application" "GTK_RECENT_FILTER_APPLICATION")
+    '("group" "GTK_RECENT_FILTER_GROUP")
+    '("age" "GTK_RECENT_FILTER_AGE")
+  )
+)
+
diff --git a/gtk/gtk-base-types.defs b/gtk/gtk-base-types.defs
index d88df822..a857810f 100644
--- a/gtk/gtk-base-types.defs
+++ b/gtk/gtk-base-types.defs
@@ -1324,12 +1324,14 @@
   (in-module "Gtk")
   (c-name "GtkCellEditable")
   (gtype-id "GTK_TYPE_CELL_EDITABLE")
+  (prerequisite "GtkWidget")
 )
 
 (define-interface CellLayout
   (in-module "Gtk")
   (c-name "GtkCellLayout")
   (gtype-id "GTK_TYPE_CELL_LAYOUT")
+  (prerequisite "GObject")
 )
 
 (define-interface Editable
@@ -1343,6 +1345,7 @@
   (in-module "Gtk")
   (c-name "GtkFileChooser")
   (gtype-id "GTK_TYPE_FILE_CHOOSER")
+  (prerequisite "GtkWidget")
 )
 
 (define-interface TreeDragDest
@@ -1361,12 +1364,15 @@
   (in-module "Gtk")
   (c-name "GtkTreeModel")
   (gtype-id "GTK_TYPE_TREE_MODEL")
+  (prerequisite "GObject")
 )
 
 (define-interface TreeSortable
   (in-module "Gtk")
   (c-name "GtkTreeSortable")
   (gtype-id "GTK_TYPE_TREE_SORTABLE")
+  (prerequisite "GtkTreeModel")
+  (prerequisite "GObject")
 )
 
 ;; Objects ...
@@ -1624,6 +1630,7 @@
   (parent "GtkBin")
   (c-name "GtkComboBox")
   (gtype-id "GTK_TYPE_COMBO_BOX")
+  (implements "GtkCellEditable")
   (implements "GtkCellLayout")
 )
 
@@ -1632,6 +1639,7 @@
   (parent "GtkComboBox")
   (c-name "GtkComboBoxEntry")
   (gtype-id "GTK_TYPE_COMBO_BOX_ENTRY")
+  (implements "GtkCellEditable")
   (implements "GtkCellLayout")
 )
 
@@ -2262,6 +2270,8 @@
   (parent "GtkEntry")
   (c-name "GtkSpinButton")
   (gtype-id "GTK_TYPE_SPIN_BUTTON")
+  (implements "GtkEditable")
+  (implements "GtkCellEditable")
 )
 
 (define-object Statusbar
@@ -2441,6 +2451,7 @@
   (c-name "GtkTreeModelSort")
   (gtype-id "GTK_TYPE_TREE_MODEL_SORT")
   (implements "GtkTreeModel")
+  (implements "GtkTreeDragSource")
   (implements "GtkTreeSortable")
 )
 
@@ -2635,16 +2646,18 @@
   (gtype-id "GTK_TYPE_TREE_PATH")
 )
 
-(define-object FileFolder
+(define-interface FileFolder
   (in-module "Gtk")
   (c-name "GtkFileFolder")
   (gtype-id "GTK_TYPE_FILE_FOLDER")
+  (prerequisite "GObject")
 )
 
-(define-object FileSystem
+(define-interface FileSystem
   (in-module "Gtk")
   (c-name "GtkFileSystem")
   (gtype-id "GTK_TYPE_FILE_SYSTEM")
+  (prerequisite "GObject")
 )
 
 (define-object FileSystemHandle
@@ -2666,6 +2679,7 @@
   (parent "GtkOldEditable")
   (c-name "GtkText")
   (gtype-id "GTK_TYPE_TEXT")
+  (implements "GtkEditable")
 )
 
 (define-object Tree