From 64fc453594aa87a95cf449d7fbd76b067e994a4f Mon Sep 17 00:00:00 2001 From: Alban Browaeys <prahal@yahoo.com> Date: Mon, 12 Nov 2012 05:38:39 +0000 Subject: Upgrade to gdl 3.6. --- diff --git a/codegen/m4/convert_gdl.m4 b/codegen/m4/convert_gdl.m4 index ba23edd..9190afd 100644 --- a/codegen/m4/convert_gdl.m4 +++ b/codegen/m4/convert_gdl.m4 @@ -7,6 +7,7 @@ _CONVERSION(`DockItem&', `GdlDockItem*', $3.gobj()) _CONVERSION(`Gtk::Requisition&', `GtkRequisition*', &$3) _CONVERSION(`const DockObject&', `GdlDockObject*', $3.gobj()) _CONVERSION(`GdlDockObject*', `DockObject&', `*Glib::wrap($3)') +_CONVERSION(`GObject*', `Glib::RefPtr<DockMaster>', Glib::wrap(GDL_DOCK_MASTER($3), true)) _CONVERSION(`GList*',`Glib::ListHandle<Glib::ustring>',__FL2H_SHALLOW) _CONVERSION(`GList*',`Glib::ListHandle<DockItem*>',__FL2H_SHALLOW) diff --git a/gdl/src/dockbar.ccg b/gdl/src/dockbar.ccg index 2b41af2..a11018c 100644 --- a/gdl/src/dockbar.ccg +++ b/gdl/src/dockbar.ccg @@ -23,7 +23,7 @@ namespace Gdl DockBar::DockBar(Dock& dock) : - _CONSTRUCT("master", GDL_DOCK_OBJECT_GET_MASTER(dock.gobj())) + _CONSTRUCT("master", gdl_dock_object_get_master(GDL_DOCK_OBJECT(dock.gobj()))) { } diff --git a/gdl/src/dockitem.ccg b/gdl/src/dockitem.ccg index 8ad987e..b671522 100644 --- a/gdl/src/dockitem.ccg +++ b/gdl/src/dockitem.ccg @@ -26,9 +26,7 @@ DockItem::DockItem(const Glib::ustring& name, const Glib::ustring& long_name, Do _CONSTRUCT("name", name.c_str(), "long-name", long_name.c_str(), "behavior", static_cast<GdlDockItemBehavior>(behavior)) { GdlDockItem* item = this->gobj(); - int flags = GDL_DOCK_OBJECT(item)->flags; - flags &= ~GDL_DOCK_AUTOMATIC; - GDL_DOCK_OBJECT(item)->flags = static_cast<GdlDockObjectFlags>(flags); + gdl_dock_object_set_manual(GDL_DOCK_OBJECT(item)); gdl_dock_item_set_tablabel(item, gtk_label_new(long_name.c_str())); } @@ -37,9 +35,7 @@ DockItem::DockItem(const Glib::ustring& name, const Glib::ustring& long_name, co _CONSTRUCT("name", name.c_str(), "long-name", long_name.c_str(), "stock-id", stock_id.get_c_str(), "behavior", static_cast<GdlDockItemBehavior>(behavior)) { GdlDockItem* item = this->gobj(); - int flags = GDL_DOCK_OBJECT(item)->flags; - flags &= ~GDL_DOCK_AUTOMATIC; - GDL_DOCK_OBJECT(item)->flags = static_cast<GdlDockObjectFlags>(flags); + gdl_dock_object_set_manual(GDL_DOCK_OBJECT(item)); gdl_dock_item_set_tablabel(item, gtk_label_new(long_name.c_str())); } diff --git a/gdl/src/docklayout.ccg b/gdl/src/docklayout.ccg index 6938833..69b4c95 100644 --- a/gdl/src/docklayout.ccg +++ b/gdl/src/docklayout.ccg @@ -21,7 +21,7 @@ namespace Gdl DockLayout::DockLayout(Dock& dock) : - _CONSTRUCT("master", GDL_DOCK_OBJECT_GET_MASTER(dock.gobj())) + _CONSTRUCT("master", gdl_dock_object_get_master(GDL_DOCK_OBJECT(dock.gobj()))) { } diff --git a/gdl/src/dockobject.ccg b/gdl/src/dockobject.ccg index 118a494..48e0003 100644 --- a/gdl/src/dockobject.ccg +++ b/gdl/src/dockobject.ccg @@ -44,9 +44,4 @@ bool DockObject::reorder(DockObject& child, const Glib::ValueBase& other_data, D return gdl_dock_object_reorder(gobj(), child.gobj(), static_cast<GdlDockPlacement>(new_position), const_cast<GValue*>(other_data.gobj())); } -Glib::RefPtr<DockMaster> DockObject::get_master() -{ - return Glib::wrap(GDL_DOCK_OBJECT_GET_MASTER(gobj()), true); -} - } // namespace Gdl diff --git a/gdl/src/dockobject.hg b/gdl/src/dockobject.hg index d3524ff..720fdfe 100644 --- a/gdl/src/dockobject.hg +++ b/gdl/src/dockobject.hg @@ -30,7 +30,6 @@ _CC_INCLUDE(gdl/gdl-dock-object.h) class DockMaster; _WRAP_ENUM(DockParamFlags, GdlDockParamFlags) -_WRAP_ENUM(DockObjectFlags, GdlDockObjectFlags, NO_GTYPE) _WRAP_ENUM(DockPlacement, GdlDockPlacement, NO_GTYPE) class DockObject : public Gtk::Container @@ -74,8 +73,10 @@ public: _WRAP_METHOD(void present(DockObject& child), gdl_dock_object_present) _WRAP_METHOD(bool child_placement(DockObject& child, DockPlacement placement = static_cast<DockPlacement>(DOCK_NONE)), gdl_dock_object_child_placement) + _WRAP_METHOD(bool is_automatic(), gdl_dock_object_is_automatic) + _WRAP_METHOD(void set_manual(), gdl_dock_object_set_manual) - Glib::RefPtr<DockMaster> get_master(); + _WRAP_METHOD(Glib::RefPtr<DockMaster> get_master(), gdl_dock_object_get_master) _WRAP_PROPERTY("long-name", Glib::ustring) diff --git a/gdl/src/gdl_enum.defs b/gdl/src/gdl_enum.defs index c5077d5..ffa32db 100644 --- a/gdl/src/gdl_enum.defs +++ b/gdl/src/gdl_enum.defs @@ -70,17 +70,6 @@ ) ) -(define-flags-extended DockObjectFlags - (in-module "Gdl") - (c-name "GdlDockObjectFlags") - (values - '("automatic" "GDL_DOCK_AUTOMATIC" "1 << 0") - '("attached" "GDL_DOCK_ATTACHED" "1 << 1") - '("in-reflow" "GDL_DOCK_IN_REFLOW" "1 << 2") - '("in-detach" "GDL_DOCK_IN_DETACH" "1 << 3") - ) -) - (define-enum-extended DockPlacement (in-module "Gdl") (c-name "GdlDockPlacement") diff --git a/gdl/src/gdl_method.defs b/gdl/src/gdl_method.defs index a7f84bb..1ae8da1 100644 --- a/gdl/src/gdl_method.defs +++ b/gdl/src/gdl_method.defs @@ -1,5 +1,12 @@ ;; -*- scheme -*- ; object definitions ... +(define-object DockBar + (in-module "Gdl") + (parent "GtkBox") + (c-name "GdlDockBar") + (gtype-id "GDL_TYPE_DOCK_BAR") +) + (define-object DockItemGrip (in-module "Gdl") (parent "GtkContainer") @@ -155,24 +162,12 @@ (return-type "GType") ) -(define-method bar_new - (of-object "GdlDock") +(define-function gdl_dock_bar_new (c-name "gdl_dock_bar_new") + (is-constructor-of "GdlDockBar") (return-type "GtkWidget*") -) - -(define-method get_orientation - (of-object "GdlDockBar") - (c-name "gdl_dock_bar_get_orientation") - (return-type "GtkOrientation") -) - -(define-method set_orientation - (of-object "GdlDockBar") - (c-name "gdl_dock_bar_set_orientation") - (return-type "none") (parameters - '("GtkOrientation" "orientation") + '("GObject*" "master") ) ) @@ -191,6 +186,12 @@ (return-type "GdlDockBarStyle") ) +(define-method get_orientation + (of-object "GdlDockBar") + (c-name "gdl_dock_bar_get_orientation") + (return-type "GtkOrientation") +) + ;; From gdl-dock.h @@ -221,7 +222,7 @@ (return-type "none") (parameters '("GdlDockItem*" "item") - '("GdlDockPlacement" "place") + '("GdlDockPlacement" "placement") ) ) @@ -247,15 +248,6 @@ ) ) -(define-method get_placeholder_by_name - (of-object "GdlDock") - (c-name "gdl_dock_get_placeholder_by_name") - (return-type "GdlDockPlaceholder*") - (parameters - '("const-gchar*" "name") - ) -) - (define-method get_named_items (of-object "GdlDock") (c-name "gdl_dock_get_named_items") @@ -268,21 +260,54 @@ (return-type "GdlDock*") ) -(define-method xor_rect +(define-method get_root (of-object "GdlDock") - (c-name "gdl_dock_xor_rect") + (c-name "gdl_dock_get_root") + (return-type "GdlDockObject*") +) + +(define-method show_preview + (of-object "GdlDock") + (c-name "gdl_dock_show_preview") (return-type "none") (parameters '("GdkRectangle*" "rect") ) ) -(define-method xor_rect_hide +(define-method hide_preview (of-object "GdlDock") - (c-name "gdl_dock_xor_rect_hide") + (c-name "gdl_dock_hide_preview") (return-type "none") ) +(define-method set_skip_taskbar + (of-object "GdlDock") + (c-name "gdl_dock_set_skip_taskbar") + (return-type "none") + (parameters + '("gboolean" "skip") + ) +) + +(define-method get_placeholder_by_name + (of-object "GdlDock") + (c-name "gdl_dock_get_placeholder_by_name") + (return-type "GdlDockPlaceholder*") + (parameters + '("const-gchar*" "name") + ) +) + +(define-method xor_rect + (of-object "GdlDock") + (c-name "gdl_dock_xor_rect") + (return-type "none") + (parameters + '("GdkRectangle*" "rect") + ) +) + ;; From gdl-dock-item-grip.h @@ -319,6 +344,24 @@ (return-type "none") ) +(define-method set_cursor + (of-object "GdlDockItemGrip") + (c-name "gdl_dock_item_grip_set_cursor") + (return-type "none") + (parameters + '("gboolean" "in_drag") + ) +) + +(define-method has_event + (of-object "GdlDockItemGrip") + (c-name "gdl_dock_item_grip_has_event") + (return-type "gboolean") + (parameters + '("GdkEvent*" "event") + ) +) + ;; From gdl-dock-item.h @@ -345,6 +388,17 @@ ) ) +(define-function gdl_dock_item_new_with_pixbuf_icon + (c-name "gdl_dock_item_new_with_pixbuf_icon") + (return-type "GtkWidget*") + (parameters + '("const-gchar*" "name") + '("const-gchar*" "long_name") + '("const-GdkPixbuf*" "pixbuf_icon") + '("GdlDockItemBehavior" "behavior") + ) +) + (define-function gdl_dock_item_get_type (c-name "gdl_dock_item_get_type") (return-type "GType") @@ -370,6 +424,37 @@ ) ) +(define-method get_orientation + (of-object "GdlDockItem") + (c-name "gdl_dock_item_get_orientation") + (return-type "GtkOrientation") +) + +(define-method set_behavior_flags + (of-object "GdlDockItem") + (c-name "gdl_dock_item_set_behavior_flags") + (return-type "none") + (parameters + '("GdlDockItemBehavior" "behavior") + '("gboolean" "clear") + ) +) + +(define-method unset_behavior_flags + (of-object "GdlDockItem") + (c-name "gdl_dock_item_unset_behavior_flags") + (return-type "none") + (parameters + '("GdlDockItemBehavior" "behavior") + ) +) + +(define-method get_behavior_flags + (of-object "GdlDockItem") + (c-name "gdl_dock_item_get_behavior_flags") + (return-type "GdlDockItemBehavior") +) + (define-method get_tablabel (of-object "GdlDockItem") (c-name "gdl_dock_item_get_tablabel") @@ -409,6 +494,12 @@ (return-type "none") ) +(define-method notify_deselected + (of-object "GdlDockItem") + (c-name "gdl_dock_item_notify_deselected") + (return-type "none") +) + (define-method bind (of-object "GdlDockItem") (c-name "gdl_dock_item_bind") @@ -472,6 +563,63 @@ ) ) +(define-method get_drag_area + (of-object "GdlDockItem") + (c-name "gdl_dock_item_get_drag_area") + (return-type "none") + (parameters + '("GdkRectangle*" "rect") + ) +) + +(define-method or_child_has_focus + (of-object "GdlDockItem") + (c-name "gdl_dock_item_or_child_has_focus") + (return-type "gboolean") +) + +(define-method is_placeholder + (of-object "GdlDockItem") + (c-name "gdl_dock_item_is_placeholder") + (return-type "gboolean") +) + +(define-method is_closed + (of-object "GdlDockItem") + (c-name "gdl_dock_item_is_closed") + (return-type "gboolean") +) + +(define-method is_iconified + (of-object "GdlDockItem") + (c-name "gdl_dock_item_is_iconified") + (return-type "gboolean") +) + +(define-method set_child + (of-object "GdlDockItem") + (c-name "gdl_dock_item_set_child") + (return-type "none") + (parameters + '("GtkWidget*" "child") + ) +) + +(define-method get_child + (of-object "GdlDockItem") + (c-name "gdl_dock_item_get_child") + (return-type "GtkWidget*") +) + +(define-method set_has_grip + (of-object "GdlDockItemClass") + (c-name "gdl_dock_item_class_set_has_grip") + (return-type "none") + (parameters + '("gboolean" "has_grip") + ) +) + ;; From gdl-dock-layout.h @@ -481,21 +629,30 @@ (return-type "GType") ) -(define-method layout_new - (of-object "GdlDock") +(define-function gdl_dock_layout_new (c-name "gdl_dock_layout_new") + (is-constructor-of "GdlDockLayout") (return-type "GdlDockLayout*") + (parameters + '("GObject*" "master") + ) ) -(define-method attach +(define-method set_master (of-object "GdlDockLayout") - (c-name "gdl_dock_layout_attach") + (c-name "gdl_dock_layout_set_master") (return-type "none") (parameters - '("GdlDockMaster*" "master") + '("GObject*" "master") ) ) +(define-method get_master + (of-object "GdlDockLayout") + (c-name "gdl_dock_layout_get_master") + (return-type "GObject*") +) + (define-method load_layout (of-object "GdlDockLayout") (c-name "gdl_dock_layout_load_layout") @@ -556,10 +713,13 @@ (return-type "gboolean") ) -(define-method get_layouts_ui +(define-method attach (of-object "GdlDockLayout") - (c-name "gdl_dock_layout_get_layouts_ui") - (return-type "GtkWidget*") + (c-name "gdl_dock_layout_attach") + (return-type "none") + (parameters + '("GdlDockMaster*" "master") + ) ) @@ -634,6 +794,12 @@ ) ) +(define-method get_dock_name + (of-object "GdlDockMaster") + (c-name "gdl_dock_master_get_dock_name") + (return-type "gchar*") +) + ;; From gdl-dock-object.h @@ -676,6 +842,12 @@ (return-type "none") ) +(define-method is_frozen + (of-object "GdlDockObject") + (c-name "gdl_dock_object_is_frozen") + (return-type "gboolean") +) + (define-method reduce (of-object "GdlDockObject") (c-name "gdl_dock_object_reduce") @@ -725,6 +897,24 @@ (return-type "gboolean") ) +(define-method get_master + (of-object "GdlDockObject") + (c-name "gdl_dock_object_get_master") + (return-type "GObject*") +) + +(define-method get_controller + (of-object "GdlDockObject") + (c-name "gdl_dock_object_get_controller") + (return-type "GdlDockObject*") +) + +(define-method layout_changed_notify + (of-object "GdlDockObject") + (c-name "gdl_dock_object_layout_changed_notify") + (return-type "none") +) + (define-method reorder (of-object "GdlDockObject") (c-name "gdl_dock_object_reorder") @@ -755,6 +945,84 @@ ) ) +(define-method is_closed + (of-object "GdlDockObject") + (c-name "gdl_dock_object_is_closed") + (return-type "gboolean") +) + +(define-method is_automatic + (of-object "GdlDockObject") + (c-name "gdl_dock_object_is_automatic") + (return-type "gboolean") +) + +(define-method set_manual + (of-object "GdlDockObject") + (c-name "gdl_dock_object_set_manual") + (return-type "none") +) + +(define-method get_name + (of-object "GdlDockObject") + (c-name "gdl_dock_object_get_name") + (return-type "const-gchar*") +) + +(define-method set_name + (of-object "GdlDockObject") + (c-name "gdl_dock_object_set_name") + (return-type "none") + (parameters + '("const-gchar*" "name") + ) +) + +(define-method get_long_name + (of-object "GdlDockObject") + (c-name "gdl_dock_object_get_long_name") + (return-type "const-gchar*") +) + +(define-method set_long_name + (of-object "GdlDockObject") + (c-name "gdl_dock_object_set_long_name") + (return-type "none") + (parameters + '("const-gchar*" "name") + ) +) + +(define-method get_stock_id + (of-object "GdlDockObject") + (c-name "gdl_dock_object_get_stock_id") + (return-type "const-gchar*") +) + +(define-method set_stock_id + (of-object "GdlDockObject") + (c-name "gdl_dock_object_set_stock_id") + (return-type "none") + (parameters + '("const-gchar*" "stock_id") + ) +) + +(define-method get_pixbuf + (of-object "GdlDockObject") + (c-name "gdl_dock_object_get_pixbuf") + (return-type "GdkPixbuf*") +) + +(define-method set_pixbuf + (of-object "GdlDockObject") + (c-name "gdl_dock_object_set_pixbuf") + (return-type "none") + (parameters + '("GdkPixbuf*" "icon") + ) +) + (define-function gdl_dock_param_get_type (c-name "gdl_dock_param_get_type") (return-type "GType") -- cgit v0.9.0.2