gtkmm r1036 - in trunk: . gtk/src tools/m4

[murrayc svn gnome org]

Author: murrayc
Date: Wed Sep  3 14:03:30 2008
New Revision: 1036
URL: http://svn.gnome.org/viewvc/gtkmm?rev=1036&view=rev

Log:
2008-09-03  Murray Cumming  <murrayc murrayc com>

* gtk/src/Makefile.am:
* gtk/src/gtk.defs:
* gtk/src/gtk_methods_maemo.defs: Restored the maemo-only .defs, putting 
them in a separate file this time so they are not lost next time.
* gtk/src/gtk_enums.defs: Regenerated, with some hand-coding.
* tools/m4/convert_gtk.m4:
* gtk/src/printsettings.hg: Added get/set_number_up_layout(), using the 
new NumberUpLayout enum.

Added:
   trunk/gtk/src/gtk_methods_maemo.defs
Modified:
   trunk/ChangeLog
   trunk/gtk/src/Makefile.am
   trunk/gtk/src/gtk.defs
   trunk/gtk/src/gtk_enums.defs
   trunk/gtk/src/printsettings.hg
   trunk/tools/m4/convert_gtk.m4

Modified: trunk/gtk/src/Makefile.am
==============================================================================
--- trunk/gtk/src/Makefile.am	(original)
+++ trunk/gtk/src/Makefile.am	Wed Sep  3 14:03:30 2008
@@ -4,7 +4,7 @@
 sublib_name = gtkmm
 sublib_namespace = Gtk
 sublib_parentdir = gtkmm
-files_defs = gtk.defs gtk_methods.defs gtk_signals.defs gtk_vfuncs.defs gtk_other.defs gtk_enums.defs \
+files_defs = gtk.defs gtk_methods.defs gtk_methods_maemo.defs gtk_signals.defs gtk_vfuncs.defs gtk_other.defs gtk_enums.defs \
              gtk_docs.xml gtk_docs_override.xml
 
 include $(top_srcdir)/build_shared/Makefile_gensrc.am_fragment

Modified: trunk/gtk/src/gtk.defs
==============================================================================
--- trunk/gtk/src/gtk.defs	(original)
+++ trunk/gtk/src/gtk.defs	Wed Sep  3 14:03:30 2008
@@ -1,4 +1,5 @@
 (include gtk_methods.defs)
+(include gtk_methods_maemo.defs)
 (include gtk_signals.defs)
 (include gtk_vfuncs.defs)
 (include gtk_enums.defs)

Modified: trunk/gtk/src/gtk_enums.defs
==============================================================================
--- trunk/gtk/src/gtk_enums.defs	(original)
+++ trunk/gtk/src/gtk_enums.defs	Wed Sep  3 14:03:30 2008
@@ -1,4 +1,4 @@
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkaccelgroup.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtkaccelgroup.h
 
 (define-flags-extended AccelFlags
   (in-module "Gtk")
@@ -10,7 +10,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkassistant.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtkassistant.h
 
 (define-enum-extended AssistantPageType
   (in-module "Gtk")
@@ -24,7 +24,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkbuilder.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtkbuilder.h
 
 (define-enum-extended BuilderError
   (in-module "Gtk")
@@ -37,10 +37,11 @@
     '("invalid-tag" "GTK_BUILDER_ERROR_INVALID_TAG" "4")
     '("missing-property-value" "GTK_BUILDER_ERROR_MISSING_PROPERTY_VALUE" "5")
     '("invalid-value" "GTK_BUILDER_ERROR_INVALID_VALUE" "6")
+    '("version-mismatch" "GTK_BUILDER_ERROR_VERSION_MISMATCH" "7")
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkcalendar.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtkcalendar.h
 
 (define-flags-extended CalendarDisplayOptions
   (in-module "Gtk")
@@ -55,7 +56,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkcellrendereraccel.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtkcellrendereraccel.h
 
 (define-enum-extended CellRendererAccelMode
   (in-module "Gtk")
@@ -66,7 +67,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkcellrenderer.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtkcellrenderer.h
 
 (define-flags-extended CellRendererState
   (in-module "Gtk")
@@ -90,7 +91,90 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkdebug.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtkclist.h
+
+(define-enum-extended CellType
+  (in-module "Gtk")
+  (c-name "GtkCellType")
+  (values
+    '("empty" "GTK_CELL_EMPTY" "0")
+    '("text" "GTK_CELL_TEXT" "1")
+    '("pixmap" "GTK_CELL_PIXMAP" "2")
+    '("pixtext" "GTK_CELL_PIXTEXT" "3")
+    '("widget" "GTK_CELL_WIDGET" "4")
+  )
+)
+
+(define-enum-extended CListDragPos
+  (in-module "Gtk")
+  (c-name "GtkCListDragPos")
+  (values
+    '("none" "GTK_CLIST_DRAG_NONE" "0")
+    '("before" "GTK_CLIST_DRAG_BEFORE" "1")
+    '("into" "GTK_CLIST_DRAG_INTO" "2")
+    '("after" "GTK_CLIST_DRAG_AFTER" "3")
+  )
+)
+
+(define-flags-extended ButtonAction
+  (in-module "Gtk")
+  (c-name "GtkButtonAction")
+  (values
+    '("ignored" "GTK_BUTTON_IGNORED" "0")
+    '("selects" "GTK_BUTTON_SELECTS" "1 << 0")
+    '("drags" "GTK_BUTTON_DRAGS" "1 << 1")
+    '("expands" "GTK_BUTTON_EXPANDS" "1 << 2")
+  )
+)
+
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtkctree.h
+
+(define-enum-extended CTreePos
+  (in-module "Gtk")
+  (c-name "GtkCTreePos")
+  (values
+    '("before" "GTK_CTREE_POS_BEFORE" "0")
+    '("as-child" "GTK_CTREE_POS_AS_CHILD" "1")
+    '("after" "GTK_CTREE_POS_AFTER" "2")
+  )
+)
+
+(define-enum-extended CTreeLineStyle
+  (in-module "Gtk")
+  (c-name "GtkCTreeLineStyle")
+  (values
+    '("none" "GTK_CTREE_LINES_NONE" "0")
+    '("solid" "GTK_CTREE_LINES_SOLID" "1")
+    '("dotted" "GTK_CTREE_LINES_DOTTED" "2")
+    '("tabbed" "GTK_CTREE_LINES_TABBED" "3")
+  )
+)
+
+(define-enum-extended CTreeExpanderStyle
+  (in-module "Gtk")
+  (c-name "GtkCTreeExpanderStyle")
+  (values
+    '("none" "GTK_CTREE_EXPANDER_NONE" "0")
+    '("square" "GTK_CTREE_EXPANDER_SQUARE" "1")
+    '("triangle" "GTK_CTREE_EXPANDER_TRIANGLE" "2")
+    '("circular" "GTK_CTREE_EXPANDER_CIRCULAR" "3")
+  )
+)
+
+(define-enum-extended CTreeExpansionType
+  (in-module "Gtk")
+  (c-name "GtkCTreeExpansionType")
+  (values
+    '("expand" "GTK_CTREE_EXPANSION_EXPAND" "0")
+    '("expand-recursive" "GTK_CTREE_EXPANSION_EXPAND_RECURSIVE" "1")
+    '("collapse" "GTK_CTREE_EXPANSION_COLLAPSE" "2")
+    '("collapse-recursive" "GTK_CTREE_EXPANSION_COLLAPSE_RECURSIVE" "3")
+    '("toggle" "GTK_CTREE_EXPANSION_TOGGLE" "4")
+    '("toggle-recursive" "GTK_CTREE_EXPANSION_TOGGLE_RECURSIVE" "5")
+  )
+)
+
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtkdebug.h
 
 (define-flags-extended DebugFlag
   (in-module "Gtk")
@@ -111,7 +195,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkdialog.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtkdialog.h
 
 (define-flags-extended DialogFlags
   (in-module "Gtk")
@@ -141,7 +225,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkdnd.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtkdnd.h
 
 (define-flags-extended DestDefaults
   (in-module "Gtk")
@@ -165,7 +249,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkenums.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtkenums.h
 
 (define-enum-extended AnchorType
   (in-module "Gtk")
@@ -663,6 +747,21 @@
   )
 )
 
+(define-enum-extended NumberUpLayout
+  (in-module "Gtk")
+  (c-name "GtkNumberUpLayout")
+  (values
+    '("left-to-right-top-to-bottom" "GTK_NUMBER_UP_LAYOUT_LEFT_TO_RIGHT_TOP_TO_BOTTOM" "0")
+    '("left-to-right-bottom-to-top" "GTK_NUMBER_UP_LAYOUT_LEFT_TO_RIGHT_BOTTOM_TO_TOP" "1")
+    '("right-to-left-top-to-bottom" "GTK_NUMBER_UP_LAYOUT_RIGHT_TO_LEFT_TOP_TO_BOTTOM" "2")
+    '("right-to-left-bottom-to-top" "GTK_NUMBER_UP_LAYOUT_RIGHT_TO_LEFT_BOTTOM_TO_TOP" "3")
+    '("top-to-bottom-left-to-right" "GTK_NUMBER_UP_LAYOUT_TOP_TO_BOTTOM_LEFT_TO_RIGHT" "4")
+    '("top-to-bottom-right-to-left" "GTK_NUMBER_UP_LAYOUT_TOP_TO_BOTTOM_RIGHT_TO_LEFT" "5")
+    '("bottom-to-top-left-to-right" "GTK_NUMBER_UP_LAYOUT_BOTTOM_TO_TOP_LEFT_TO_RIGHT" "6")
+    '("bottom-to-top-right-to-left" "GTK_NUMBER_UP_LAYOUT_BOTTOM_TO_TOP_RIGHT_TO_LEFT" "7")
+  )
+)
+
 (define-enum-extended PageOrientation
   (in-module "Gtk")
   (c-name "GtkPageOrientation")
@@ -730,7 +829,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkfilechooser.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtkfilechooser.h
 
 (define-enum-extended FileChooserAction
   (in-module "Gtk")
@@ -763,71 +862,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkfilechooserprivate.h
-
-(define-enum-extended State
-  (in-module "Load")
-  (c-name "LoadState")
-  (values
-    '("empty" "LOAD_EMPTY" "0")
-    '("preload" "LOAD_PRELOAD" "1")
-    '("loading" "LOAD_LOADING" "2")
-    '("finished" "LOAD_FINISHED" "3")
-  )
-)
-
-(define-enum-extended State
-  (in-module "Reload")
-  (c-name "ReloadState")
-  (values
-    '("empty" "RELOAD_EMPTY" "0")
-    '("has-folder" "RELOAD_HAS_FOLDER" "1")
-    '("was-unmapped" "RELOAD_WAS_UNMAPPED" "2")
-  )
-)
-
-(define-enum-extended Mode
-  (in-module "Location")
-  (c-name "LocationMode")
-  (values
-    '("path-bar" "LOCATION_MODE_PATH_BAR" "0")
-    '("filename-entry" "LOCATION_MODE_FILENAME_ENTRY" "1")
-  )
-)
-
-(define-enum-extended Mode
-  (in-module "Operation")
-  (c-name "OperationMode")
-  (values
-    '("browse" "OPERATION_MODE_BROWSE" "0")
-    '("search" "OPERATION_MODE_SEARCH" "1")
-    '("recent" "OPERATION_MODE_RECENT" "2")
-  )
-)
-
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkfilechooserutils.h
-
-(define-flags-extended FileChooserProp
-  (in-module "Gtk")
-  (c-name "GtkFileChooserProp")
-  (values
-    '("first" "GTK_FILE_CHOOSER_PROP_FIRST" "0x1000")
-    '("action" "GTK_FILE_CHOOSER_PROP_ACTION" "0x1000")
-    '("file-system-backend" "GTK_FILE_CHOOSER_PROP_FILE_SYSTEM_BACKEND" "1")
-    '("filter" "GTK_FILE_CHOOSER_PROP_FILTER" "2")
-    '("local-only" "GTK_FILE_CHOOSER_PROP_LOCAL_ONLY" "3")
-    '("preview-widget" "GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET" "4")
-    '("preview-widget-active" "GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET_ACTIVE" "5")
-    '("use-preview-label" "GTK_FILE_CHOOSER_PROP_USE_PREVIEW_LABEL" "6")
-    '("extra-widget" "GTK_FILE_CHOOSER_PROP_EXTRA_WIDGET" "7")
-    '("select-multiple" "GTK_FILE_CHOOSER_PROP_SELECT_MULTIPLE" "8")
-    '("show-hidden" "GTK_FILE_CHOOSER_PROP_SHOW_HIDDEN" "9")
-    '("do-overwrite-confirmation" "GTK_FILE_CHOOSER_PROP_DO_OVERWRITE_CONFIRMATION" "10")
-    '("last" "GTK_FILE_CHOOSER_PROP_LAST" "0xA")
-  )
-)
-
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkfilefilter.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtkfilefilter.h
 
 (define-flags-extended FileFilterFlags
   (in-module "Gtk")
@@ -840,7 +875,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkfilesystem.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtkfilesystem.h
 
 (define-flags-extended FileInfoType
   (in-module "Gtk")
@@ -869,19 +904,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkfilesystemmodel.h
-
-(define-enum-extended FileSystemModelColumns
-  (in-module "Gtk")
-  (c-name "GtkFileSystemModelColumns")
-  (values
-    '("info" "GTK_FILE_SYSTEM_MODEL_INFO" "0")
-    '("display-name" "GTK_FILE_SYSTEM_MODEL_DISPLAY_NAME" "1")
-    '("n-columns" "GTK_FILE_SYSTEM_MODEL_N_COLUMNS" "2")
-  )
-)
-
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkicontheme.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtkicontheme.h
 
 (define-flags-extended IconLookupFlags
   (in-module "Gtk")
@@ -891,6 +914,7 @@
     '("force-svg" "GTK_ICON_LOOKUP_FORCE_SVG" "1 << 1")
     '("use-builtin" "GTK_ICON_LOOKUP_USE_BUILTIN" "1 << 2")
     '("generic-fallback" "GTK_ICON_LOOKUP_GENERIC_FALLBACK" "1 << 3")
+    '("force-size" "GTK_ICON_LOOKUP_FORCE_SIZE" "1 << 4")
   )
 )
 
@@ -903,7 +927,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkiconview.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtkiconview.h
 
 (define-enum-extended IconViewDropPosition
   (in-module "Gtk")
@@ -918,7 +942,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkimage.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtkimage.h
 
 (define-enum-extended ImageType
   (in-module "Gtk")
@@ -932,10 +956,11 @@
     '("icon-set" "GTK_IMAGE_ICON_SET" "5")
     '("animation" "GTK_IMAGE_ANIMATION" "6")
     '("icon-name" "GTK_IMAGE_ICON_NAME" "7")
+    '("gicon" "GTK_IMAGE_GICON" "8")
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkmessagedialog.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtkmessagedialog.h
 
 (define-enum-extended MessageType
   (in-module "Gtk")
@@ -962,7 +987,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtknotebook.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtknotebook.h
 
 (define-enum-extended NotebookTab
   (in-module "Gtk")
@@ -973,7 +998,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkobject.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtkobject.h
 
 (define-flags-extended ObjectFlags
   (in-module "Gtk")
@@ -994,6 +1019,7 @@
   )
 )
 
+;; Hand-coded because enums.pl seems to fail on it. murrayc
 ;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkprinter.h
 
 (define-flags-extended PrintCapabilities
@@ -1009,29 +1035,11 @@
     '("generate-ps" "GTK_PRINT_CAPABILITY_GENERATE_PS" "1 << 6")
     '("preview" "GTK_PRINT_CAPABILITY_PREVIEW" "1 << 7")
     '("number-up" "GTK_PRINT_CAPABILITY_NUMBER_UP" "1 << 8")
+    '("number-up-layout" "GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT" "1 << 9")
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkprinteroption.h
-
-(define-enum-extended PrinterOptionType
-  (in-module "Gtk")
-  (c-name "GtkPrinterOptionType")
-  (values
-    '("boolean" "GTK_PRINTER_OPTION_TYPE_BOOLEAN" "0")
-    '("pickone" "GTK_PRINTER_OPTION_TYPE_PICKONE" "1")
-    '("pickone-password" "GTK_PRINTER_OPTION_TYPE_PICKONE_PASSWORD" "2")
-    '("pickone-passcode" "GTK_PRINTER_OPTION_TYPE_PICKONE_PASSCODE" "3")
-    '("pickone-real" "GTK_PRINTER_OPTION_TYPE_PICKONE_REAL" "4")
-    '("pickone-int" "GTK_PRINTER_OPTION_TYPE_PICKONE_INT" "5")
-    '("pickone-string" "GTK_PRINTER_OPTION_TYPE_PICKONE_STRING" "6")
-    '("alternative" "GTK_PRINTER_OPTION_TYPE_ALTERNATIVE" "7")
-    '("string" "GTK_PRINTER_OPTION_TYPE_STRING" "8")
-    '("filesave" "GTK_PRINTER_OPTION_TYPE_FILESAVE" "9")
-  )
-)
-
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkprintoperation.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtkprintoperation.h
 
 (define-enum-extended PrintStatus
   (in-module "Gtk")
@@ -1082,7 +1090,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkprivate.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtkprivate.h
 
 (define-flags-extended PrivateFlags
   (in-module "Gtk")
@@ -1090,7 +1098,8 @@
   (values
     '("user-style" "PRIVATE_GTK_USER_STYLE" "1 << 0")
     '("resize-pending" "PRIVATE_GTK_RESIZE_PENDING" "1 << 2")
-    '("leave-pending" "PRIVATE_GTK_LEAVE_PENDING" "1 << 4")
+    '("has-pointer" "PRIVATE_GTK_HAS_POINTER" "1 << 3")
+    '("shadowed" "PRIVATE_GTK_SHADOWED" "1 << 4")
     '("has-shape-mask" "PRIVATE_GTK_HAS_SHAPE_MASK" "1 << 5")
     '("in-reparent" "PRIVATE_GTK_IN_REPARENT" "1 << 6")
     '("direction-set" "PRIVATE_GTK_DIRECTION_SET" "1 << 7")
@@ -1103,7 +1112,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkprogressbar.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtkprogressbar.h
 
 (define-enum-extended ProgressBarStyle
   (in-module "Gtk")
@@ -1125,27 +1134,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkrbtree.h
-
-(define-flags-extended RBNodeColor
-  (in-module "Gtk")
-  (c-name "GtkRBNodeColor")
-  (values
-    '("black" "GTK_RBNODE_BLACK" "1 << 0")
-    '("red" "GTK_RBNODE_RED" "1 << 1")
-    '("is-parent" "GTK_RBNODE_IS_PARENT" "1 << 2")
-    '("is-selected" "GTK_RBNODE_IS_SELECTED" "1 << 3")
-    '("is-prelit" "GTK_RBNODE_IS_PRELIT" "1 << 4")
-    '("is-semi-collapsed" "GTK_RBNODE_IS_SEMI_COLLAPSED" "1 << 5")
-    '("is-semi-expanded" "GTK_RBNODE_IS_SEMI_EXPANDED" "1 << 6")
-    '("invalid" "GTK_RBNODE_INVALID" "1 << 7")
-    '("column-invalid" "GTK_RBNODE_COLUMN_INVALID" "1 << 8")
-    '("descendants-invalid" "GTK_RBNODE_DESCENDANTS_INVALID" "1 << 9")
-    '("non-colors" "GTK_RBNODE_NON_COLORS" "0x4")
-  )
-)
-
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkrc.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtkrc.h
 
 (define-flags-extended RcFlags
   (in-module "Gtk")
@@ -1205,7 +1194,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkrecentchooser.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtkrecentchooser.h
 
 (define-enum-extended RecentSortType
   (in-module "Gtk")
@@ -1227,28 +1216,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkrecentchooserutils.h
-
-(define-flags-extended RecentChooserProp
-  (in-module "Gtk")
-  (c-name "GtkRecentChooserProp")
-  (values
-    '("first" "GTK_RECENT_CHOOSER_PROP_FIRST" "0x3000")
-    '("recent-manager" "GTK_RECENT_CHOOSER_PROP_RECENT_MANAGER" "12289")
-    '("show-private" "GTK_RECENT_CHOOSER_PROP_SHOW_PRIVATE" "12290")
-    '("show-not-found" "GTK_RECENT_CHOOSER_PROP_SHOW_NOT_FOUND" "12291")
-    '("show-tips" "GTK_RECENT_CHOOSER_PROP_SHOW_TIPS" "12292")
-    '("show-icons" "GTK_RECENT_CHOOSER_PROP_SHOW_ICONS" "12293")
-    '("select-multiple" "GTK_RECENT_CHOOSER_PROP_SELECT_MULTIPLE" "12294")
-    '("limit" "GTK_RECENT_CHOOSER_PROP_LIMIT" "12295")
-    '("local-only" "GTK_RECENT_CHOOSER_PROP_LOCAL_ONLY" "12296")
-    '("sort-type" "GTK_RECENT_CHOOSER_PROP_SORT_TYPE" "12297")
-    '("filter" "GTK_RECENT_CHOOSER_PROP_FILTER" "12298")
-    '("last" "GTK_RECENT_CHOOSER_PROP_LAST" "12299")
-  )
-)
-
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkrecentfilter.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtkrecentfilter.h
 
 (define-flags-extended RecentFilterFlags
   (in-module "Gtk")
@@ -1263,7 +1231,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkrecentmanager.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtkrecentmanager.h
 
 (define-enum-extended RecentManagerError
   (in-module "Gtk")
@@ -1279,7 +1247,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtksizegroup.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtksizegroup.h
 
 (define-enum-extended SizeGroupMode
   (in-module "Gtk")
@@ -1292,7 +1260,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkspinbutton.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtkspinbutton.h
 
 (define-enum-extended SpinButtonUpdatePolicy
   (in-module "Gtk")
@@ -1317,7 +1285,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtktextbuffer.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtktextbuffer.h
 
 (define-enum-extended TextBufferTargetInfo
   (in-module "Gtk")
@@ -1326,7 +1294,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtktextiter.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtktextiter.h
 
 (define-flags-extended TextSearchFlags
   (in-module "Gtk")
@@ -1337,7 +1305,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtktextview.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtktextview.h
 
 (define-enum-extended TextWindowType
   (in-module "Gtk")
@@ -1353,7 +1321,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtktoolbar.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtktoolbar.h
 
 (define-enum-extended ToolbarSpaceStyle
   (in-module "Gtk")
@@ -1364,7 +1332,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtktree.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtktree.h
 
 (define-enum-extended TreeViewMode
   (in-module "Gtk")
@@ -1375,7 +1343,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtktreemodel.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtktreemodel.h
 
 (define-flags-extended TreeModelFlags
   (in-module "Gtk")
@@ -1386,24 +1354,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtktreeprivate.h
-
-(define-flags-extended TreeViewFlags
-  (in-module "Gtk")
-  (c-name "GtkTreeViewFlags")
-  (values
-    '("is-list" "GTK_TREE_VIEW_IS_LIST" "1 << 0")
-    '("show-expanders" "GTK_TREE_VIEW_SHOW_EXPANDERS" "1 << 1")
-    '("in-column-resize" "GTK_TREE_VIEW_IN_COLUMN_RESIZE" "1 << 2")
-    '("arrow-prelit" "GTK_TREE_VIEW_ARROW_PRELIT" "1 << 3")
-    '("headers-visible" "GTK_TREE_VIEW_HEADERS_VISIBLE" "1 << 4")
-    '("draw-keyfocus" "GTK_TREE_VIEW_DRAW_KEYFOCUS" "1 << 5")
-    '("model-setup" "GTK_TREE_VIEW_MODEL_SETUP" "1 << 6")
-    '("in-column-drag" "GTK_TREE_VIEW_IN_COLUMN_DRAG" "1 << 7")
-  )
-)
-
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtktreeviewcolumn.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtktreeviewcolumn.h
 
 (define-enum-extended TreeViewColumnSizing
   (in-module "Gtk")
@@ -1415,7 +1366,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtktreeview.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtktreeview.h
 
 (define-enum-extended TreeViewDropPosition
   (in-module "Gtk")
@@ -1428,7 +1379,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkuimanager.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtkuimanager.h
 
 (define-flags-extended UIManagerItemType
   (in-module "Gtk")
@@ -1447,7 +1398,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkwidget.h
+;; From /opt/gnome220/include/gtk-2.0/gtk/gtkwidget.h
 
 (define-flags-extended WidgetFlags
   (in-module "Gtk")
@@ -1484,50 +1435,3 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkwin32embed.h
-
-(define-enum-extended Win32EmbedMessageType
-  (in-module "Gtk")
-  (c-name "GtkWin32EmbedMessageType")
-  (values
-    '("window-activate" "GTK_WIN32_EMBED_WINDOW_ACTIVATE" "0")
-    '("window-deactivate" "GTK_WIN32_EMBED_WINDOW_DEACTIVATE" "1")
-    '("focus-in" "GTK_WIN32_EMBED_FOCUS_IN" "2")
-    '("focus-out" "GTK_WIN32_EMBED_FOCUS_OUT" "3")
-    '("modality-on" "GTK_WIN32_EMBED_MODALITY_ON" "4")
-    '("modality-off" "GTK_WIN32_EMBED_MODALITY_OFF" "5")
-    '("parent-notify" "GTK_WIN32_EMBED_PARENT_NOTIFY" "6")
-    '("event-plug-mapped" "GTK_WIN32_EMBED_EVENT_PLUG_MAPPED" "7")
-    '("plug-resized" "GTK_WIN32_EMBED_PLUG_RESIZED" "8")
-    '("request-focus" "GTK_WIN32_EMBED_REQUEST_FOCUS" "9")
-    '("focus-next" "GTK_WIN32_EMBED_FOCUS_NEXT" "10")
-    '("focus-prev" "GTK_WIN32_EMBED_FOCUS_PREV" "11")
-    '("grab-key" "GTK_WIN32_EMBED_GRAB_KEY" "12")
-    '("ungrab-key" "GTK_WIN32_EMBED_UNGRAB_KEY" "13")
-    '("last" "GTK_WIN32_EMBED_LAST" "14")
-  )
-)
-
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/xembed.h
-
-(define-enum-extended EmbedMessageType
-  (in-module "X")
-  (c-name "XEmbedMessageType")
-  (values
-    '("embedded-notify" "XEMBED_EMBEDDED_NOTIFY" "0")
-    '("window-activate" "XEMBED_WINDOW_ACTIVATE" "1")
-    '("window-deactivate" "XEMBED_WINDOW_DEACTIVATE" "2")
-    '("request-focus" "XEMBED_REQUEST_FOCUS" "3")
-    '("focus-in" "XEMBED_FOCUS_IN" "4")
-    '("focus-out" "XEMBED_FOCUS_OUT" "5")
-    '("focus-next" "XEMBED_FOCUS_NEXT" "6")
-    '("focus-prev" "XEMBED_FOCUS_PREV" "7")
-    '("grab-key" "XEMBED_GRAB_KEY" "8")
-    '("ungrab-key" "XEMBED_UNGRAB_KEY" "9")
-    '("modality-on" "XEMBED_MODALITY_ON" "10")
-    '("modality-off" "XEMBED_MODALITY_OFF" "11")
-    '("gtk-grab-key" "XEMBED_GTK_GRAB_KEY" "108")
-    '("gtk-ungrab-key" "XEMBED_GTK_UNGRAB_KEY" "109")
-  )
-)
-

Added: trunk/gtk/src/gtk_methods_maemo.defs
==============================================================================
--- (empty file)
+++ trunk/gtk/src/gtk_methods_maemo.defs	Wed Sep  3 14:03:30 2008
@@ -0,0 +1,33 @@
+;; These functions are only available on the Maemo platform (patched Gtk+).
+;; So they are surrounded by ifdefs in the gtkmm source code.
+
+(define-method set_can_paste_rich_text
+  (of-object "GtkTextBuffer")
+  (c-name "gtk_text_buffer_set_can_paste_rich_text")
+  (return-type "none")
+  (parameters
+    '("gboolean" "can_paste_rich_text")
+  )
+)
+
+(define-method get_can_paste_rich_text
+  (of-object "GtkTextBuffer")
+  (c-name "gtk_text_buffer_get_can_paste_rich_text")
+  (return-type "gboolean")
+)
+
+(define-method set_rich_text_format
+  (of-object "GtkTextBuffer")
+  (c-name "gtk_text_buffer_set_rich_text_format")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "format")
+  )
+)
+
+(define-method get_rich_text_format
+  (of-object "GtkTextBuffer")
+  (c-name "gtk_text_buffer_get_rich_text_format")
+  (return-type "const-gchar*")
+)
+

Modified: trunk/gtk/src/printsettings.hg
==============================================================================
--- trunk/gtk/src/printsettings.hg	(original)
+++ trunk/gtk/src/printsettings.hg	Wed Sep  3 14:03:30 2008
@@ -29,6 +29,7 @@
 _WRAP_ENUM(PrintQuality, GtkPrintQuality)
 _WRAP_ENUM(PrintPages, GtkPrintPages)
 _WRAP_ENUM(PageSet, GtkPageSet)
+_WRAP_ENUM(NumberUpLayout, GtkNumberUpLayout)
 
 /** A PrintSettings object represents the settings of a print dialog in a system-independent way. 
  * The main use for this object is that once you've printed you can get a settings object that 
@@ -137,6 +138,7 @@
     static const Glib::ustring PAGE_SET;
     static const Glib::ustring FINISHINGS;
     static const Glib::ustring NUMBER_UP;
+    static const Glib::ustring NUMBER_UP_LAYOUT;
     static const Glib::ustring OUTPUT_BIN;
 
     static const Glib::ustring OUTPUT_FILE_FORMAT;
@@ -271,6 +273,9 @@
   _WRAP_METHOD(int get_number_up() const, gtk_print_settings_get_number_up)
   _WRAP_METHOD(void set_number_up(int number_up), gtk_print_settings_set_number_up)
 
+  _WRAP_METHOD(NumberUpLayout get_number_up_layout() const, gtk_print_settings_get_number_up_layout)
+  _WRAP_METHOD(void set_number_up(NumberUpLayout number_up_layout), gtk_print_settings_set_number_up_layout)
+
   _WRAP_METHOD(int get_resolution() const, gtk_print_settings_get_resolution)
   _WRAP_METHOD(void set_resolution(int resolution), gtk_print_settings_set_resolution)
 

Modified: trunk/tools/m4/convert_gtk.m4
==============================================================================
--- trunk/tools/m4/convert_gtk.m4	(original)
+++ trunk/tools/m4/convert_gtk.m4	Wed Sep  3 14:03:30 2008
@@ -126,6 +126,7 @@
 _CONV_ENUM(Gtk,PrintError)
 _CONV_ENUM(Gtk,PrintCapabilities)
 _CONV_ENUM(Gtk,DragResult)
+_CONV_ENUM(Gtk,NumberUpLayout)
 
 _CONVERSION(`GtkIconSize',`IconSize',`IconSize(static_cast<int>($3))')
 _CONVERSION(`GtkIconSize',`Gtk::IconSize',`Gtk::IconSize(static_cast<int>($3))')