[libgda-uimm] BasicForm: Add new methods and signals.
- From: Josà Alburquerque <jaalburqu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda-uimm] BasicForm: Add new methods and signals.
- Date: Mon, 3 Oct 2011 04:43:00 +0000 (UTC)
commit 5115e252af762fdc28eced7b700fe59d2c8fe792
Author: Josà Alburquerque <jaalburqu svn gnome org>
Date: Mon Oct 3 00:27:05 2011 -0400
BasicForm: Add new methods and signals.
* libgda-ui/src/basicform.{hg,ccg} (BasicFormPart): Add new enum.
(add_to_size_group):
(remove_from_size_group): Add new methods.
(populate_popup): Add new signal.
(can-expand): Rename property to "can-expand-v" as in the C API.
(param-list): Rename property to "paramlist" as in the C API.
* tools/m4/convert_libgda_uimm.m4: Add necessary conversions.
* libgda-ui/src/cloud.hg:
* libgda-ui/src/dataproxy.hg: Add some IGNORE()'s.
ChangeLog | 15 +++++++++++++++
libgda-ui/src/basicform.ccg | 3 +++
libgda-ui/src/basicform.hg | 13 +++++++++++--
libgda-ui/src/cloud.hg | 1 +
libgda-ui/src/dataproxy.hg | 4 ++++
tools/m4/convert_libgda_uimm.m4 | 4 ++++
6 files changed, 38 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 932ae53..f78b296 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2011-10-03 Josà Alburquerque <jaalburqu svn gnome org>
+
+ BasicForm: Add new methods and signals.
+
+ * libgda-ui/src/basicform.{hg,ccg} (BasicFormPart): Add new enum.
+ (add_to_size_group):
+ (remove_from_size_group): Add new methods.
+ (populate_popup): Add new signal.
+ (can-expand): Rename property to "can-expand-v" as in the C API.
+ (param-list): Rename property to "paramlist" as in the C API.
+ * tools/m4/convert_libgda_uimm.m4: Add necessary conversions.
+
+ * libgda-ui/src/cloud.hg:
+ * libgda-ui/src/dataproxy.hg: Add some IGNORE()'s.
+
2011-10-02 Josà Alburquerque <jaalburqu svn gnome org>
DataEntry: Rename create_data_entry() method to just create().
diff --git a/libgda-ui/src/basicform.ccg b/libgda-ui/src/basicform.ccg
index 194294e..64ba911 100644
--- a/libgda-ui/src/basicform.ccg
+++ b/libgda-ui/src/basicform.ccg
@@ -18,7 +18,10 @@
*/
#include <libgda-ui/gdaui-basic-form.h>
+#include <libgda-ui/gdaui-enum-types.h>
#include <libgdamm/set.h>
+#include <gtkmm/menu.h>
+#include <gtkmm/sizegroup.h>
#include <gtkmm/window.h>
namespace Gnome
diff --git a/libgda-ui/src/basicform.hg b/libgda-ui/src/basicform.hg
index 867fe5d..5c2dc58 100644
--- a/libgda-ui/src/basicform.hg
+++ b/libgda-ui/src/basicform.hg
@@ -27,6 +27,8 @@ _DEFS(libgda-uimm,libgda_ui)
namespace Gtk
{
+class Menu;
+class SizeGroup;
class Widget;
class Window;
@@ -47,6 +49,8 @@ class Set;
namespace GdaUI
{
+_WRAP_ENUM(BasicFormPart, GdauiBasicFormPart)
+
/** BasicForm - Form widget mapping the values contained in a Gnome::Gda::Set.
* The BasicForm widget is a form containing an entry for each
* Gnome::Gda::Holder object contained in a Gnome::Gda::Set (specified when
@@ -145,6 +149,9 @@ public:
_WRAP_METHOD(Gtk::Widget* get_place_holder(const Glib::ustring& placeholder_id), gdaui_basic_form_get_place_holder)
_WRAP_METHOD(const Gtk::Widget* get_place_holder(const Glib::ustring& placeholder_id) const, gdaui_basic_form_get_place_holder)
+ _WRAP_METHOD(void add_to_size_group(const Glib::RefPtr<Gtk::SizeGroup>& size_group, BasicFormPart part = BASIC_FORM_LABELS), gdaui_basic_form_add_to_size_group)
+ _WRAP_METHOD(void remove_from_size_group(const Glib::RefPtr<Gtk::SizeGroup>& size_group, BasicFormPart part = BASIC_FORM_LABELS), gdaui_basic_form_remove_from_size_group)
+
_WRAP_SIGNAL(void activated(), "activated")
#m4 _CONVERSION(`GdaHolder*', `const Glib::RefPtr<Gnome::Gda::Holder>&', `Glib::wrap($3, true)')
@@ -152,10 +159,12 @@ public:
_WRAP_SIGNAL(void layout_changed(), "layout-changed")
- _WRAP_PROPERTY("can-expand", bool)
+ _WRAP_SIGNAL(void populate_popup(Gtk::Menu* menu), "populate-popup", no_default_handler)
+
+ _WRAP_PROPERTY("can-expand-v", bool)
_WRAP_PROPERTY("entries-auto-default", bool)
_WRAP_PROPERTY("headers-sensitive", bool)
- //TODO: _WRAP_PROPERTY("param-list", gpointer)
+ //TODO: _WRAP_PROPERTY("paramlist", gpointer)
_WRAP_PROPERTY("show-actions", bool)
//TODO: _WRAP_PROPERTY("xml-layout", gpointer)
};
diff --git a/libgda-ui/src/cloud.hg b/libgda-ui/src/cloud.hg
index 6d0da73..60c42cc 100644
--- a/libgda-ui/src/cloud.hg
+++ b/libgda-ui/src/cloud.hg
@@ -76,6 +76,7 @@ typedef sigc::slot<double, const Glib::RefPtr<Gnome::Gda::DataModel>&, int> Slot
* @newin{4,2}
*/
void set_weight_slot(const SlotWeight& slot);
+ _IGNORE(gdaui_cloud_set_weight_func)
/** Unsets a previously set weight computing slot.
* @newin{4,2}
diff --git a/libgda-ui/src/dataproxy.hg b/libgda-ui/src/dataproxy.hg
index a2556af..d500147 100644
--- a/libgda-ui/src/dataproxy.hg
+++ b/libgda-ui/src/dataproxy.hg
@@ -57,6 +57,10 @@ class DataProxy :
{
_CLASS_INTERFACE(DataProxy, GdauiDataProxy, GDAUI_DATA_PROXY, GdauiDataProxyIface)
+ // gmmproc thinks this function should be wrapped here, but it is wrapped in
+ // DataProxyInfo.
+ _IGNORE(gdaui_data_proxy_info_new)
+
public:
_WRAP_METHOD(Glib::RefPtr<Gnome::Gda::DataProxy> get_proxy(), gdaui_data_proxy_get_proxy)
_WRAP_METHOD(Glib::RefPtr<const Gnome::Gda::DataProxy> get_proxy() const, gdaui_data_proxy_get_proxy, constversion)
diff --git a/tools/m4/convert_libgda_uimm.m4 b/tools/m4/convert_libgda_uimm.m4
index bbd29ff..c9801f1 100644
--- a/tools/m4/convert_libgda_uimm.m4
+++ b/tools/m4/convert_libgda_uimm.m4
@@ -2,6 +2,7 @@ dnl Copyright (c) 2009 The libgda-uimm Development Team
dnl Enums:
_CONV_ENUM(Gdaui,Action)
+_CONV_ENUM(Gdaui,BasicFormPart)
_CONV_ENUM(Gdaui,DataProxyInfoFlag)
_CONV_ENUM(Gdaui,DataProxyWriteMode)
_CONV_ENUM(Gdaui,LoginMode)
@@ -52,6 +53,9 @@ dnl Set:
_CONVERSION(`const Glib::RefPtr<Gnome::Gda::Set>&', `GdaSet*', `Glib::unwrap($3)')
_CONVERSION(`GdaSet*', `Glib::RefPtr<Gnome::Gda::Set>', `Glib::wrap($3)')
+dnl SizeGroup:
+_CONVERSION(`const Glib::RefPtr<Gtk::SizeGroup>&', `GtkSizeGroup*', `Glib::unwrap($3)')
+
dnl Gtk::TreeModel::iterator:
_CONVERSION(`const Gtk::TreeModel::const_iterator&', `GtkTreeIter*', `const_cast<GtkTreeIter*>($3->gobj())')
_CONVERSION(`const Gtk::TreeModel::iterator&', `GtkTreeIter*', `const_cast<GtkTreeIter*>($3->gobj())')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]