[gtkmm] AboutDialog: Added get/set_license_type().
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] AboutDialog: Added get/set_license_type().
- Date: Sat, 4 Sep 2010 11:47:56 +0000 (UTC)
commit 6a155b809886f84adb9c4179ad6586612fb95ab6
Author: Murray Cumming <murrayc murrayc com>
Date: Sat Sep 4 13:31:07 2010 +0200
AboutDialog: Added get/set_license_type().
* gtk/src/aboutdialog.hg: Added License enum and get/set_license_type().
* tools/m4/convert_gtk.m4: Added conversion for the License enum.
* gtk/src/calendar.hg: Addef get_day_is_marked().
ChangeLog | 8 ++++++++
gtk/src/aboutdialog.hg | 5 +++++
gtk/src/calendar.hg | 2 ++
gtk/src/filechooserwidget.hg | 1 -
tools/m4/convert_gtk.m4 | 1 +
5 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 36373b3..acd30b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2010-09-04 Murray Cumming <murrayc murrayc com>
+ AboutDialog: Added get/set_license_type().
+
+ * gtk/src/aboutdialog.hg: Added License enum and get/set_license_type().
+ * tools/m4/convert_gtk.m4: Added conversion for the License enum.
+ * gtk/src/calendar.hg: Addef get_day_is_marked().
+
+2010-09-04 Murray Cumming <murrayc murrayc com>
+
gtkmm: Fix the function .defs again, fixing the build.
* gtk/src/gtk_methods.defs:
diff --git a/gtk/src/aboutdialog.hg b/gtk/src/aboutdialog.hg
index a16329d..ea82d56 100644
--- a/gtk/src/aboutdialog.hg
+++ b/gtk/src/aboutdialog.hg
@@ -27,6 +27,8 @@ _PINCLUDE(gtkmm/private/dialog_p.h)
namespace Gtk
{
+_WRAP_ENUM(License, GtkLicense)
+
/** The AboutDialog offers a simple way to display information about a program like its logo, name, copyright,
* website and license. It is also possible to give credits to the authors, documenters, translators and artists
* who have worked on the program. An about dialog is typically opened when the user selects the About option
@@ -62,6 +64,8 @@ public:
_WRAP_METHOD(void set_comments(const Glib::ustring& comments), gtk_about_dialog_set_comments)
_WRAP_METHOD(Glib::ustring get_license() const, gtk_about_dialog_get_license)
_WRAP_METHOD(void set_license(const Glib::ustring& license), gtk_about_dialog_set_license)
+ _WRAP_METHOD(License get_license_type() const, gtk_about_dialog_get_license_type)
+ _WRAP_METHOD(void set_license_type(License license_type), gtk_about_dialog_set_license_type)
_WRAP_METHOD(Glib::ustring get_website() const, gtk_about_dialog_get_website)
_WRAP_METHOD(void set_website(const Glib::ustring& website), gtk_about_dialog_set_website)
_WRAP_METHOD(Glib::ustring get_website_label() const, gtk_about_dialog_get_website_label)
@@ -119,6 +123,7 @@ public:
_WRAP_PROPERTY("website", Glib::ustring)
_WRAP_PROPERTY("website_label", Glib::ustring)
_WRAP_PROPERTY("license", Glib::ustring)
+ _WRAP_PROPERTY("license-type", License)
_WRAP_PROPERTY("authors", Glib::StringArrayHandle)
_WRAP_PROPERTY("documenters", Glib::StringArrayHandle)
_WRAP_PROPERTY("translator_credits", Glib::StringArrayHandle)
diff --git a/gtk/src/calendar.hg b/gtk/src/calendar.hg
index 77a5640..1443c9a 100644
--- a/gtk/src/calendar.hg
+++ b/gtk/src/calendar.hg
@@ -116,6 +116,8 @@ public:
_WRAP_METHOD(int get_detail_width_chars() const, gtk_calendar_get_detail_width_chars)
_WRAP_METHOD(int get_detail_height_rows() const, gtk_calendar_get_detail_height_rows)
+
+ _WRAP_METHOD(bool get_day_is_marked(guint day) const, gtk_calendar_get_day_is_marked)
_IGNORE(gtk_calendar_freeze, gtk_calendar_thaw) //deprecated
diff --git a/gtk/src/filechooserwidget.hg b/gtk/src/filechooserwidget.hg
index 93036cc..fd07a45 100644
--- a/gtk/src/filechooserwidget.hg
+++ b/gtk/src/filechooserwidget.hg
@@ -57,7 +57,6 @@ public:
* @newin{2,4}
*/
_WRAP_CTOR(FileChooserWidget(FileChooserAction action), gtk_file_chooser_widget_new)
- _WRAP_CTOR(FileChooserWidget(FileChooserAction action, const Glib::ustring& backend), gtk_file_chooser_widget_new_with_backend)
};
} // namespace Gtk
diff --git a/tools/m4/convert_gtk.m4 b/tools/m4/convert_gtk.m4
index f460c5d..b62dbfa 100644
--- a/tools/m4/convert_gtk.m4
+++ b/tools/m4/convert_gtk.m4
@@ -80,6 +80,7 @@ _CONV_ENUM(Gtk,DirectionType)
_CONV_ENUM(Gtk,ExpanderStyle)
_CONV_ENUM(Gtk,ImageType)
_CONV_ENUM(Gtk,Justification)
+_CONV_ENUM(Gtk,License)
_CONV_ENUM(Gtk,MenuDirectionType)
_CONV_ENUM(Gtk,MessageType)
_CONV_ENUM(Gtk,MetricType)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]