GNOME.org
 

[gtkmm] Added ToolPalette.

commit fb5a5cb550f805e17d6bb8b7dd5d688ff86c4cc9
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Dec 17 11:05:36 2009 +0100

    Added ToolPalette.
    
    	* gtk/src/gtk_enums.defs: Regenerated with enums.pl.
    	* gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
    	* gtk/src/toolpalette.[hg|ccg]: An initial wrapper for GtkToolPalette.
    	* gtk/gtkmm.h: Include the new toolpalette.h header.

 ChangeLog                |    9 +
 gtk/gtkmm.h              |    1 +
 gtk/src/filelist.am      |    1 +
 gtk/src/gtk_enums.defs   |   40 +---
 gtk/src/gtk_methods.defs |  518 ++++++++++++++++++++++++++++++++++++++++++++--
 gtk/src/toolpalette.ccg  |   31 +++
 gtk/src/toolpalette.hg   |   85 ++++++++
 gtk/src/treeview.hg      |    2 +
 tools/m4/convert_gtk.m4  |    1 +
 9 files changed, 643 insertions(+), 45 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 394f9c6..48f3f16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-17  Murray Cumming  <murrayc murrayc com>
+
+	Added ToolPalette.
+
+	* gtk/src/gtk_enums.defs: Regenerated with enums.pl.
+	* gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
+	* gtk/src/toolpalette.[hg|ccg]: An initial wrapper for GtkToolPalette.
+	* gtk/gtkmm.h: Include the new toolpalette.h header.
+
 2009-12-16  Armin Burgmeier  <armin arbur net>
 
 	* win32_installer/translations/english.nsh:
diff --git a/gtk/gtkmm.h b/gtk/gtkmm.h
index 248ac25..19c30dc 100644
--- a/gtk/gtkmm.h
+++ b/gtk/gtkmm.h
@@ -169,6 +169,7 @@ extern const int gtkmm_micro_version;
 #include <gtkmm/toolbar.h>
 #include <gtkmm/toolitem.h>
 #include <gtkmm/toolbutton.h>
+#include <gtkmm/toolpalette.h>
 #include <gtkmm/toggletoolbutton.h>
 #include <gtkmm/menutoolbutton.h>
 #include <gtkmm/tooltip.h>
diff --git a/gtk/src/filelist.am b/gtk/src/filelist.am
index f01c2d5..c4125b3 100644
--- a/gtk/src/filelist.am
+++ b/gtk/src/filelist.am
@@ -156,6 +156,7 @@ gtkmm_files_any_hg =		\
 	toolbar.hg		\
 	toolbutton.hg		\
 	toolitem.hg		\
+	toolpalette.hg		\
 	toolshell.hg		\
 	tooltip.hg		\
 	tooltips.hg		\
diff --git a/gtk/src/gtk_enums.defs b/gtk/src/gtk_enums.defs
index 1dafbcd..782ee0d 100644
--- a/gtk/src/gtk_enums.defs
+++ b/gtk/src/gtk_enums.defs
@@ -976,18 +976,6 @@
   )
 )
 
-;; From 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 gtkicontheme.h
 
 (define-flags-extended IconLookupFlags
@@ -1485,6 +1473,17 @@
   )
 )
 
+;; From gtktoolpalette.h
+
+(define-flags-extended ToolPaletteDragTargets
+  (in-module "Gtk")
+  (c-name "GtkToolPaletteDragTargets")
+  (values
+    '("items" "GTK_TOOL_PALETTE_DRAG_ITEMS" "1 << 0")
+    '("groups" "GTK_TOOL_PALETTE_DRAG_GROUPS" "1 << 1")
+  )
+)
+
 ;; From gtktree.h
 
 (define-enum-extended TreeViewMode
@@ -1507,23 +1506,6 @@
   )
 )
 
-;; From 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 gtktreeviewcolumn.h
 
 (define-enum-extended TreeViewColumnSizing
diff --git a/gtk/src/gtk_methods.defs b/gtk/src/gtk_methods.defs
index ad8ee35..8042fcb 100644
--- a/gtk/src/gtk_methods.defs
+++ b/gtk/src/gtk_methods.defs
@@ -769,6 +769,20 @@
   (gtype-id "GTK_TYPE_TOOLBAR")
 )
 
+(define-object ToolPalette
+  (in-module "Gtk")
+  (parent "GtkContainer")
+  (c-name "GtkToolPalette")
+  (gtype-id "GTK_TYPE_TOOL_PALETTE")
+)
+
+(define-object ToolItemGroup
+  (in-module "Gtk")
+  (parent "GtkContainer")
+  (c-name "GtkToolItemGroup")
+  (gtype-id "GTK_TYPE_TOOL_ITEM_GROUP")
+)
+
 (define-object TextView
   (in-module "Gtk")
   (parent "GtkContainer")
@@ -2477,17 +2491,6 @@
   )
 )
 
-(define-enum FileSystemModelColumns
-  (in-module "Gtk")
-  (c-name "GtkFileSystemModelColumns")
-  (gtype-id "GTK_TYPE_FILE_SYSTEM_MODEL_COLUMNS")
-  (values
-    '("info" "GTK_FILE_SYSTEM_MODEL_INFO")
-    '("display-name" "GTK_FILE_SYSTEM_MODEL_DISPLAY_NAME")
-    '("n-columns" "GTK_FILE_SYSTEM_MODEL_N_COLUMNS")
-  )
-)
-
 (define-flags IconLookupFlags
   (in-module "Gtk")
   (c-name "GtkIconLookupFlags")
@@ -3000,6 +3003,16 @@
   )
 )
 
+(define-flags ToolPaletteDragTargets
+  (in-module "Gtk")
+  (c-name "GtkToolPaletteDragTargets")
+  (gtype-id "GTK_TYPE_TOOL_PALETTE_DRAG_TARGETS")
+  (values
+    '("items" "GTK_TOOL_PALETTE_DRAG_ITEMS")
+    '("groups" "GTK_TOOL_PALETTE_DRAG_GROUPS")
+  )
+)
+
 (define-enum TreeViewMode
   (in-module "Gtk")
   (c-name "GtkTreeViewMode")
@@ -4316,6 +4329,21 @@
   (return-type "gboolean")
 )
 
+(define-method set_always_show_image
+  (of-object "GtkAction")
+  (c-name "gtk_action_set_always_show_image")
+  (return-type "none")
+  (parameters
+    '("gboolean" "always_show")
+  )
+)
+
+(define-method get_always_show_image
+  (of-object "GtkAction")
+  (c-name "gtk_action_get_always_show_image")
+  (return-type "gboolean")
+)
+
 
 
 ;; From gtkactivatable.h
@@ -15588,9 +15616,9 @@
   (parameters
     '("int*" "argc")
     '("char***" "argv")
-    '("char*" "parameter_string")
+    '("const-char*" "parameter_string")
     '("GOptionEntry*" "entries")
-    '("char*" "translation_domain")
+    '("const-char*" "translation_domain")
     '("GError**" "error")
   )
 )
@@ -17137,6 +17165,25 @@
   )
 )
 
+(define-method get_action_widget
+  (of-object "GtkNotebook")
+  (c-name "gtk_notebook_get_action_widget")
+  (return-type "GtkWidget*")
+  (parameters
+    '("GtkPackType" "pack_type")
+  )
+)
+
+(define-method set_action_widget
+  (of-object "GtkNotebook")
+  (c-name "gtk_notebook_set_action_widget")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("GtkPackType" "pack_type")
+  )
+)
+
 
 
 ;; From gtkobject.h
@@ -18318,9 +18365,8 @@
   (c-name "gtk_print_backend_set_password")
   (return-type "none")
   (parameters
-    '("const-gchar*" "hostname")
-    '("const-gchar*" "username")
-    '("const-gchar*" "password")
+    '("gchar**" "auth_info_required")
+    '("gchar**" "auth_info")
   )
 )
 
@@ -18509,6 +18555,18 @@
   (return-type "gdouble")
 )
 
+(define-method get_hard_margins
+  (of-object "GtkPrintContext")
+  (c-name "gtk_print_context_get_hard_margins")
+  (return-type "gboolean")
+  (parameters
+    '("gdouble*" "top")
+    '("gdouble*" "bottom")
+    '("gdouble*" "left")
+    '("gdouble*" "right")
+  )
+)
+
 (define-method get_pango_fontmap
   (of-object "GtkPrintContext")
   (c-name "gtk_print_context_get_pango_fontmap")
@@ -18686,6 +18744,18 @@
   (return-type "GtkPrintCapabilities")
 )
 
+(define-method get_hard_margins
+  (of-object "GtkPrinter")
+  (c-name "gtk_printer_get_hard_margins")
+  (return-type "gboolean")
+  (parameters
+    '("gdouble*" "top")
+    '("gdouble*" "bottom")
+    '("gdouble*" "left")
+    '("gdouble*" "right")
+  )
+)
+
 (define-function gtk_enumerate_printers
   (c-name "gtk_enumerate_printers")
   (return-type "none")
@@ -23456,6 +23526,12 @@
   (return-type "gboolean")
 )
 
+(define-method get_message_area
+  (of-object "GtkStatusbar")
+  (c-name "gtk_statusbar_get_message_area")
+  (return-type "GtkWidget*")
+)
+
 
 
 ;; From gtkstatusicon.h
@@ -24592,6 +24668,9 @@
     '("GtkStyle*" "style")
     '("GdkWindow*" "window")
     '("GtkStateType" "state_type")
+    '("const-GdkRectangle*" "area")
+    '("GtkWidget*" "widget")
+    '("const-gchar*" "detail")
     '("guint" "step")
     '("gint" "x")
     '("gint" "y")
@@ -28485,6 +28564,153 @@
 
 
 
+;; From gtktoolitemgroup.h
+
+(define-function gtk_tool_item_group_get_type
+  (c-name "gtk_tool_item_group_get_type")
+  (return-type "GType")
+)
+
+(define-function gtk_tool_item_group_new
+  (c-name "gtk_tool_item_group_new")
+  (is-constructor-of "GtkToolItemGroup")
+  (return-type "GtkWidget*")
+  (parameters
+    '("const-gchar*" "label")
+  )
+)
+
+(define-method set_label
+  (of-object "GtkToolItemGroup")
+  (c-name "gtk_tool_item_group_set_label")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "label")
+  )
+)
+
+(define-method set_label_widget
+  (of-object "GtkToolItemGroup")
+  (c-name "gtk_tool_item_group_set_label_widget")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "label_widget")
+  )
+)
+
+(define-method set_collapsed
+  (of-object "GtkToolItemGroup")
+  (c-name "gtk_tool_item_group_set_collapsed")
+  (return-type "none")
+  (parameters
+    '("gboolean" "collapsed")
+  )
+)
+
+(define-method set_ellipsize
+  (of-object "GtkToolItemGroup")
+  (c-name "gtk_tool_item_group_set_ellipsize")
+  (return-type "none")
+  (parameters
+    '("PangoEllipsizeMode" "ellipsize")
+  )
+)
+
+(define-method set_header_relief
+  (of-object "GtkToolItemGroup")
+  (c-name "gtk_tool_item_group_set_header_relief")
+  (return-type "none")
+  (parameters
+    '("GtkReliefStyle" "style")
+  )
+)
+
+(define-method get_label
+  (of-object "GtkToolItemGroup")
+  (c-name "gtk_tool_item_group_get_label")
+  (return-type "const-gchar*")
+)
+
+(define-method get_label_widget
+  (of-object "GtkToolItemGroup")
+  (c-name "gtk_tool_item_group_get_label_widget")
+  (return-type "GtkWidget*")
+)
+
+(define-method get_collapsed
+  (of-object "GtkToolItemGroup")
+  (c-name "gtk_tool_item_group_get_collapsed")
+  (return-type "gboolean")
+)
+
+(define-method get_ellipsize
+  (of-object "GtkToolItemGroup")
+  (c-name "gtk_tool_item_group_get_ellipsize")
+  (return-type "PangoEllipsizeMode")
+)
+
+(define-method get_header_relief
+  (of-object "GtkToolItemGroup")
+  (c-name "gtk_tool_item_group_get_header_relief")
+  (return-type "GtkReliefStyle")
+)
+
+(define-method insert
+  (of-object "GtkToolItemGroup")
+  (c-name "gtk_tool_item_group_insert")
+  (return-type "none")
+  (parameters
+    '("GtkToolItem*" "item")
+    '("gint" "position")
+  )
+)
+
+(define-method set_item_position
+  (of-object "GtkToolItemGroup")
+  (c-name "gtk_tool_item_group_set_item_position")
+  (return-type "none")
+  (parameters
+    '("GtkToolItem*" "item")
+    '("gint" "position")
+  )
+)
+
+(define-method get_item_position
+  (of-object "GtkToolItemGroup")
+  (c-name "gtk_tool_item_group_get_item_position")
+  (return-type "gint")
+  (parameters
+    '("GtkToolItem*" "item")
+  )
+)
+
+(define-method get_n_items
+  (of-object "GtkToolItemGroup")
+  (c-name "gtk_tool_item_group_get_n_items")
+  (return-type "guint")
+)
+
+(define-method get_nth_item
+  (of-object "GtkToolItemGroup")
+  (c-name "gtk_tool_item_group_get_nth_item")
+  (return-type "GtkToolItem*")
+  (parameters
+    '("guint" "index")
+  )
+)
+
+(define-method get_drop_item
+  (of-object "GtkToolItemGroup")
+  (c-name "gtk_tool_item_group_get_drop_item")
+  (return-type "GtkToolItem*")
+  (parameters
+    '("gint" "x")
+    '("gint" "y")
+  )
+)
+
+
+
 ;; From gtktoolitem.h
 
 (define-function gtk_tool_item_get_type
@@ -28617,6 +28843,12 @@
   )
 )
 
+(define-method get_ellipsize_mode
+  (of-object "GtkToolItem")
+  (c-name "gtk_tool_item_get_ellipsize_mode")
+  (return-type "PangoEllipsizeMode")
+)
+
 (define-method get_icon_size
   (of-object "GtkToolItem")
   (c-name "gtk_tool_item_get_icon_size")
@@ -28641,6 +28873,24 @@
   (return-type "GtkReliefStyle")
 )
 
+(define-method get_text_alignment
+  (of-object "GtkToolItem")
+  (c-name "gtk_tool_item_get_text_alignment")
+  (return-type "gfloat")
+)
+
+(define-method get_text_orientation
+  (of-object "GtkToolItem")
+  (c-name "gtk_tool_item_get_text_orientation")
+  (return-type "GtkOrientation")
+)
+
+(define-method get_text_size_group
+  (of-object "GtkToolItem")
+  (c-name "gtk_tool_item_get_text_size_group")
+  (return-type "GtkSizeGroup*")
+)
+
 (define-method retrieve_proxy_menu_item
   (of-object "GtkToolItem")
   (c-name "gtk_tool_item_retrieve_proxy_menu_item")
@@ -28680,6 +28930,196 @@
 
 
 
+;; From gtktoolpalette.h
+
+(define-function gtk_tool_palette_get_type
+  (c-name "gtk_tool_palette_get_type")
+  (return-type "GType")
+)
+
+(define-function gtk_tool_palette_new
+  (c-name "gtk_tool_palette_new")
+  (is-constructor-of "GtkToolPalette")
+  (return-type "GtkWidget*")
+)
+
+(define-method set_group_position
+  (of-object "GtkToolPalette")
+  (c-name "gtk_tool_palette_set_group_position")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "group")
+    '("gint" "position")
+  )
+)
+
+(define-method set_exclusive
+  (of-object "GtkToolPalette")
+  (c-name "gtk_tool_palette_set_exclusive")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "group")
+    '("gboolean" "exclusive")
+  )
+)
+
+(define-method set_expand
+  (of-object "GtkToolPalette")
+  (c-name "gtk_tool_palette_set_expand")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "group")
+    '("gboolean" "expand")
+  )
+)
+
+(define-method get_group_position
+  (of-object "GtkToolPalette")
+  (c-name "gtk_tool_palette_get_group_position")
+  (return-type "gint")
+  (parameters
+    '("GtkWidget*" "group")
+  )
+)
+
+(define-method get_exclusive
+  (of-object "GtkToolPalette")
+  (c-name "gtk_tool_palette_get_exclusive")
+  (return-type "gboolean")
+  (parameters
+    '("GtkWidget*" "group")
+  )
+)
+
+(define-method get_expand
+  (of-object "GtkToolPalette")
+  (c-name "gtk_tool_palette_get_expand")
+  (return-type "gboolean")
+  (parameters
+    '("GtkWidget*" "group")
+  )
+)
+
+(define-method set_icon_size
+  (of-object "GtkToolPalette")
+  (c-name "gtk_tool_palette_set_icon_size")
+  (return-type "none")
+  (parameters
+    '("GtkIconSize" "icon_size")
+  )
+)
+
+(define-method unset_icon_size
+  (of-object "GtkToolPalette")
+  (c-name "gtk_tool_palette_unset_icon_size")
+  (return-type "none")
+)
+
+(define-method set_style
+  (of-object "GtkToolPalette")
+  (c-name "gtk_tool_palette_set_style")
+  (return-type "none")
+  (parameters
+    '("GtkToolbarStyle" "style")
+  )
+)
+
+(define-method unset_style
+  (of-object "GtkToolPalette")
+  (c-name "gtk_tool_palette_unset_style")
+  (return-type "none")
+)
+
+(define-method get_icon_size
+  (of-object "GtkToolPalette")
+  (c-name "gtk_tool_palette_get_icon_size")
+  (return-type "GtkIconSize")
+)
+
+(define-method get_style
+  (of-object "GtkToolPalette")
+  (c-name "gtk_tool_palette_get_style")
+  (return-type "GtkToolbarStyle")
+)
+
+(define-method get_drop_item
+  (of-object "GtkToolPalette")
+  (c-name "gtk_tool_palette_get_drop_item")
+  (return-type "GtkToolItem*")
+  (parameters
+    '("gint" "x")
+    '("gint" "y")
+  )
+)
+
+(define-method get_drop_group
+  (of-object "GtkToolPalette")
+  (c-name "gtk_tool_palette_get_drop_group")
+  (return-type "GtkWidget*")
+  (parameters
+    '("gint" "x")
+    '("gint" "y")
+  )
+)
+
+(define-method get_drag_item
+  (of-object "GtkToolPalette")
+  (c-name "gtk_tool_palette_get_drag_item")
+  (return-type "GtkWidget*")
+  (parameters
+    '("const-GtkSelectionData*" "selection")
+  )
+)
+
+(define-method set_drag_source
+  (of-object "GtkToolPalette")
+  (c-name "gtk_tool_palette_set_drag_source")
+  (return-type "none")
+  (parameters
+    '("GtkToolPaletteDragTargets" "targets")
+  )
+)
+
+(define-method add_drag_dest
+  (of-object "GtkToolPalette")
+  (c-name "gtk_tool_palette_add_drag_dest")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("GtkDestDefaults" "flags")
+    '("GtkToolPaletteDragTargets" "targets")
+    '("GdkDragAction" "actions")
+  )
+)
+
+(define-method get_hadjustment
+  (of-object "GtkToolPalette")
+  (c-name "gtk_tool_palette_get_hadjustment")
+  (return-type "GtkAdjustment*")
+)
+
+(define-method get_vadjustment
+  (of-object "GtkToolPalette")
+  (c-name "gtk_tool_palette_get_vadjustment")
+  (return-type "GtkAdjustment*")
+)
+
+(define-function gtk_tool_palette_get_drag_target_item
+  (c-name "gtk_tool_palette_get_drag_target_item")
+  (return-type "const-GtkTargetEntry*")
+)
+
+(define-function gtk_tool_palette_get_drag_target_group
+  (c-name "gtk_tool_palette_get_drag_target_group")
+  (return-type "const-GtkTargetEntry*")
+)
+
+
+
+;; From gtktoolpaletteprivate.h
+
+
+
 ;; From gtktoolshell.h
 
 (define-function gtk_tool_shell_get_type
@@ -28717,6 +29157,30 @@
   (return-type "none")
 )
 
+(define-method get_text_orientation
+  (of-object "GtkToolShell")
+  (c-name "gtk_tool_shell_get_text_orientation")
+  (return-type "GtkOrientation")
+)
+
+(define-method get_text_alignment
+  (of-object "GtkToolShell")
+  (c-name "gtk_tool_shell_get_text_alignment")
+  (return-type "gfloat")
+)
+
+(define-method get_ellipsize_mode
+  (of-object "GtkToolShell")
+  (c-name "gtk_tool_shell_get_ellipsize_mode")
+  (return-type "PangoEllipsizeMode")
+)
+
+(define-method get_text_size_group
+  (of-object "GtkToolShell")
+  (c-name "gtk_tool_shell_get_text_size_group")
+  (return-type "GtkSizeGroup*")
+)
+
 
 
 ;; From gtktooltip.h
@@ -28773,6 +29237,16 @@
   )
 )
 
+(define-method set_icon_from_gicon
+  (of-object "GtkTooltip")
+  (c-name "gtk_tooltip_set_icon_from_gicon")
+  (return-type "none")
+  (parameters
+    '("GIcon*" "gicon")
+    '("GtkIconSize" "size")
+  )
+)
+
 (define-method set_custom
   (of-object "GtkTooltip")
   (c-name "gtk_tooltip_set_custom")
@@ -32554,6 +33028,12 @@
   (return-type "GtkShadowType")
 )
 
+(define-method get_bin_window
+  (of-object "GtkViewport")
+  (c-name "gtk_viewport_get_bin_window")
+  (return-type "GdkWindow*")
+)
+
 
 
 ;; From gtkvolumebutton.h
@@ -34840,6 +35320,12 @@
   (return-type "none")
 )
 
+(define-method get_window_type
+  (of-object "GtkWindow")
+  (c-name "gtk_window_get_window_type")
+  (return-type "GtkWindowType")
+)
+
 (define-function gtk_window_group_get_type
   (c-name "gtk_window_group_get_type")
   (return-type "GType")
diff --git a/gtk/src/toolpalette.ccg b/gtk/src/toolpalette.ccg
new file mode 100644
index 0000000..063c038
--- /dev/null
+++ b/gtk/src/toolpalette.ccg
@@ -0,0 +1,31 @@
+// -*- c++ -*-
+/* $Id: toolpalette.ccg,v 1.6 2004/03/03 18:48:04 murrayc Exp $ */
+
+/* 
+ *
+ * Copyright 2009 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.
+ */
+
+#include <glib.h>
+#include <gtk/gtk.h>
+
+namespace Gtk
+{
+
+
+} // namespace Gtk
+
diff --git a/gtk/src/toolpalette.hg b/gtk/src/toolpalette.hg
new file mode 100644
index 0000000..a7860a5
--- /dev/null
+++ b/gtk/src/toolpalette.hg
@@ -0,0 +1,85 @@
+/* Copyright (C) 2009 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.
+ */
+
+#include <gtkmm/container.h>
+#include <gtkmm/toolitem.h>
+#include <gtkmm/orientable.h>
+#include <gtkmm/adjustment.h>
+
+_DEFS(gtkmm,gtk)
+_PINCLUDE(gtkmm/private/container_p.h)
+
+namespace Gtk
+{
+
+_WRAP_ENUM(ToolPaletteDragTargets, GtkToolPaletteDragTargets)
+
+/** TODO
+ * @ingroup Widgets
+ * @ingroup Containers
+ */
+class ToolPalette
+: public Container,
+  public Orientable
+{
+  _CLASS_GTKOBJECT(ToolPalette, GtkToolPalette, GTK_TOOL_PALETTE, Gtk::Container, GtkContainer)
+  _IMPLEMENTS_INTERFACE(Orientable)
+public:
+  _CTOR_DEFAULT()
+
+  _WRAP_METHOD(void set_group_position(Widget& group, int position), gtk_tool_palette_set_group_position)
+  _WRAP_METHOD(void set_exclusive(Widget& group, bool exclusive), gtk_tool_palette_set_exclusive)
+  _WRAP_METHOD(void set_expand(Widget& group, bool expand = true), gtk_tool_palette_set_expand)
+
+  _WRAP_METHOD(int get_group_position(Widget& group) const, gtk_tool_palette_get_group_position)
+  _WRAP_METHOD(bool get_exclusive(Widget& group) const, gtk_tool_palette_get_exclusive)
+  _WRAP_METHOD(bool get_expand(Widget& group), gtk_tool_palette_get_expand)
+
+  _WRAP_METHOD(void set_icon_size(IconSize icon_size), gtk_tool_palette_set_icon_size)
+  _WRAP_METHOD(void unset_icon_size(), gtk_tool_palette_unset_icon_size)
+  _WRAP_METHOD(void set_style(ToolbarStyle style), gtk_tool_palette_set_style)
+  _WRAP_METHOD(void unset_style(), gtk_tool_palette_unset_style)
+
+  _WRAP_METHOD(IconSize get_icon_size(), gtk_tool_palette_get_icon_size)
+  _WRAP_METHOD(ToolbarStyle get_style() const, gtk_tool_palette_get_style)
+
+  _WRAP_METHOD(ToolItem* get_drop_item(int x, int y), gtk_tool_palette_get_drop_item)
+  _WRAP_METHOD(Widget* get_drop_group(int x, int y), gtk_tool_palette_get_drop_group)
+  //_WRAP_METHOD(Widget* get_drag_item(const SelectionData& selection), gtk_tool_palette_get_drag_item )
+
+  _WRAP_METHOD(void set_drag_source(ToolPaletteDragTargets targets), gtk_tool_palette_set_drag_source)
+  _WRAP_METHOD(void add_drag_dest(Gtk::Widget& widget, DestDefaults flags, ToolPaletteDragTargets targets, Gdk::DragAction actions), gtk_tool_palette_add_drag_dest)
+
+  _WRAP_METHOD(Adjustment* get_hadjustment(), gtk_tool_palette_get_hadjustment)
+  _WRAP_METHOD(const Adjustment* get_hadjustment() const, gtk_tool_palette_get_hadjustment, constversion)
+  _WRAP_METHOD(Adjustment* get_vadjustment (), gtk_tool_palette_get_vadjustment)
+  _WRAP_METHOD(const Adjustment* get_vadjustment () const, gtk_tool_palette_get_vadjustment, constversion)
+
+  //_WRAP_METHOD(static const TargetEntry* get_drag_target_item(), gtk_tool_palette_get_drag_target_item)
+  //_WRAP_METHOD(static const TargetEntry* get_drag_target_group(), gtk_tool_palette_get_drag_target_group)
+  
+  //TODO: Ignore this? It's in many widgets and seems internals.
+  //Ignore action signal: _WRAP_SIGNAL(void set_scroll_adjustments(Adjustment* hadjustment, Adjustment* vadjustment), "set-scroll-adjustments")
+
+  _WRAP_PROPERTY("icon-size", IconSize)
+  _WRAP_PROPERTY("icon-size-set", bool)
+  _WRAP_PROPERTY("toolbar-style", ToolbarStyle)
+  _WRAP_PROPERTY("exclusive", bool)
+};
+
+} // namespace Gtk
+
diff --git a/gtk/src/treeview.hg b/gtk/src/treeview.hg
index 409fd1c..8eaa1bf 100644
--- a/gtk/src/treeview.hg
+++ b/gtk/src/treeview.hg
@@ -789,7 +789,9 @@ dnl // GtkTreeModel*.
 _CONVERSION(`GtkTreeIter*',`const TreeModel::iterator&',`TreeModel::iterator(gtk_tree_view_get_model(self), $3)')
 #m4end
 
+//TODO: Ignore this? It's in many widgets and seems internals.
   _WRAP_SIGNAL(void set_scroll_adjustments(Adjustment* hadjustment, Adjustment* vadjustment), "set-scroll-adjustments")
+
   _WRAP_SIGNAL(void row_activated(const TreeModel::Path& path, TreeViewColumn* column) , "row-activated")
   _WRAP_SIGNAL(bool test_expand_row(const TreeModel::iterator& iter, const TreeModel::Path& path), "test-expand-row")
   _WRAP_SIGNAL(bool test_collapse_row(const TreeModel::iterator& iter, const TreeModel::Path& path), "test-collapse-row")
diff --git a/tools/m4/convert_gtk.m4 b/tools/m4/convert_gtk.m4
index 8514faf..ff02505 100644
--- a/tools/m4/convert_gtk.m4
+++ b/tools/m4/convert_gtk.m4
@@ -92,6 +92,7 @@ _CONV_ENUM(Gtk,TextSearchFlags)
 _CONV_ENUM(Gtk,TextWindowType)
 _CONV_ENUM(Gtk,ToolbarChildType)
 _CONV_ENUM(Gtk,ToolbarStyle)
+_CONV_ENUM(Gtk,ToolPaletteDragTargets)
 _CONV_ENUM(Gtk,TreeModelFlags)
 _CONV_ENUM(Gtk,TreeViewColumnSizing)
 _CONV_ENUM(Gtk,TreeViewDropPosition)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]