[gtkmm] Update for the latest gtk+4 (news in FontChooser and ListBoxRow)
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Update for the latest gtk+4 (news in FontChooser and ListBoxRow)
- Date: Sun, 7 Jan 2018 09:24:34 +0000 (UTC)
commit 09de4a14a28fc1d89ab1de6a760eb79b58e1b437
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date: Sun Jan 7 10:20:13 2018 +0100
Update for the latest gtk+4 (news in FontChooser and ListBoxRow)
* gtk/src/aboutdialog.[ccg|hg]: Add set/get/property_system_information().
Remove unset_license(). Can now be unset with set_license("").
* gtk/src/flowbox.hg:
* gtk/src/listbox.hg: Add property_accept_unpaired_release().
* gtk/src/fontbutton.hg: Remove show_style and show_size.
* gtk/src/fontchooser.[ccg|hg]: Add the Gtk::FontChooser::Level enum and
set/get/property_level(), get/property_font_features(),
get/property_language().
* gtk/src/listboxrow.hg: Implement the Gtk::Actionable interface.
* tools/m4/convert_gtk.m4: Add conversions for GtkFontChooserLevel.
gtk/src/aboutdialog.ccg | 5 -----
gtk/src/aboutdialog.hg | 23 ++++++++++++++++++-----
gtk/src/flowbox.hg | 1 +
gtk/src/fontbutton.hg | 6 ------
gtk/src/fontchooser.ccg | 1 +
gtk/src/fontchooser.hg | 10 +++++++++-
gtk/src/listbox.hg | 1 +
gtk/src/listboxrow.hg | 4 +++-
tools/m4/convert_gtk.m4 | 1 +
9 files changed, 34 insertions(+), 18 deletions(-)
---
diff --git a/gtk/src/aboutdialog.ccg b/gtk/src/aboutdialog.ccg
index 6382f3c..cabbbf9 100644
--- a/gtk/src/aboutdialog.ccg
+++ b/gtk/src/aboutdialog.ccg
@@ -31,11 +31,6 @@ AboutDialog::AboutDialog(bool use_header_bar)
{
}
-void AboutDialog::unset_license()
-{
- gtk_about_dialog_set_license(gobj(), nullptr);
-}
-
void AboutDialog::set_logo_default()
{
gtk_about_dialog_set_logo(gobj(), nullptr);
diff --git a/gtk/src/aboutdialog.hg b/gtk/src/aboutdialog.hg
index 018bbf9..84c3aef 100644
--- a/gtk/src/aboutdialog.hg
+++ b/gtk/src/aboutdialog.hg
@@ -73,15 +73,27 @@ public:
_WRAP_METHOD(Glib::ustring get_comments() const, gtk_about_dialog_get_comments)
_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)
-
- /** Hides the license button.
+ /** Sets the license information to be displayed in the secondary license dialog.
+ * If @a license is an empty string, the license button is hidden.
*
- * @newin{3,4}
+ * @newin{2,6}
+ *
+ * @param license The license information.
*/
- void unset_license();
+ _WRAP_METHOD(void set_license(const Glib::ustring& license{NULL}), 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_system_information() const, gtk_about_dialog_get_system_information)
+ /** Sets the system information to be displayed in the about dialog.
+ * If @a system_information is an empty string, the system information tab is hidden.
+ *
+ * See Gtk::Aboutdialog::property_system_information().
+ *
+ * @newin{3,92}
+ *
+ * @param system_information System information.
+ */
+ _WRAP_METHOD(void set_system_information(const Glib::ustring& system_information{NULL}),
gtk_about_dialog_set_system_information)
_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)
@@ -130,6 +142,7 @@ public:
_WRAP_PROPERTY("website_label", Glib::ustring)
_WRAP_PROPERTY("license", Glib::ustring)
_WRAP_PROPERTY("license-type", License)
+ _WRAP_PROPERTY("system-information", Glib::ustring, newin "3,92")
_WRAP_PROPERTY("authors", std::vector<Glib::ustring>)
_WRAP_PROPERTY("documenters", std::vector<Glib::ustring>)
_WRAP_PROPERTY("translator_credits", std::vector<Glib::ustring>)
diff --git a/gtk/src/flowbox.hg b/gtk/src/flowbox.hg
index 086ce5d..3ffb2ca 100644
--- a/gtk/src/flowbox.hg
+++ b/gtk/src/flowbox.hg
@@ -295,6 +295,7 @@ public:
_WRAP_PROPERTY("selection-mode", SelectionMode)
_WRAP_PROPERTY("activate-on-single-click", bool)
+ _WRAP_PROPERTY("accept-unpaired-release", bool)
_WRAP_PROPERTY("homogeneous", bool)
_WRAP_PROPERTY("min-children-per-line", guint)
_WRAP_PROPERTY("max-children-per-line", guint)
diff --git a/gtk/src/fontbutton.hg b/gtk/src/fontbutton.hg
index 34180ed..bebac2b 100644
--- a/gtk/src/fontbutton.hg
+++ b/gtk/src/fontbutton.hg
@@ -53,16 +53,10 @@ public:
_WRAP_METHOD(void set_use_font(bool use_font = true), gtk_font_button_set_use_font)
_WRAP_METHOD(bool get_use_size() const, gtk_font_button_get_use_size)
_WRAP_METHOD(void set_use_size(bool use_size = true), gtk_font_button_set_use_size)
- _WRAP_METHOD(bool get_show_style() const, gtk_font_button_get_show_style)
- _WRAP_METHOD(void set_show_style(bool show_style = true), gtk_font_button_set_show_style)
- _WRAP_METHOD(bool get_show_size() const, gtk_font_button_get_show_size)
- _WRAP_METHOD(void set_show_size(bool show_size = true), gtk_font_button_set_show_size)
_WRAP_PROPERTY("title", Glib::ustring)
_WRAP_PROPERTY("use-font", bool)
_WRAP_PROPERTY("use-size", bool)
- _WRAP_PROPERTY("show-style", bool)
- _WRAP_PROPERTY("show-size", bool)
_WRAP_SIGNAL(void font_set(), "font-set")
};
diff --git a/gtk/src/fontchooser.ccg b/gtk/src/fontchooser.ccg
index dec1fd3..86cc05d 100644
--- a/gtk/src/fontchooser.ccg
+++ b/gtk/src/fontchooser.ccg
@@ -17,6 +17,7 @@
#include <gtk/gtk.h>
+using Level = Gtk::FontChooser::Level;
namespace
{
diff --git a/gtk/src/fontchooser.hg b/gtk/src/fontchooser.hg
index ec7cd0b..3198860 100644
--- a/gtk/src/fontchooser.hg
+++ b/gtk/src/fontchooser.hg
@@ -52,6 +52,7 @@ class FontChooser : public Glib::Interface
{
_CLASS_INTERFACE(FontChooser, GtkFontChooser, GTK_FONT_CHOOSER, GtkFontChooserIface)
public:
+ _WRAP_ENUM(Level, GtkFontChooserLevel)
_WRAP_METHOD(Glib::RefPtr<Pango::FontFamily> get_font_family(), gtk_font_chooser_get_font_family,
refreturn)
_WRAP_METHOD(Glib::RefPtr<const Pango::FontFamily> get_font_family() const,
gtk_font_chooser_get_font_family, refreturn, constversion)
@@ -104,13 +105,20 @@ public:
_WRAP_METHOD(Glib::RefPtr<Pango::FontMap> get_font_map(), gtk_font_chooser_get_font_map, refreturn)
_WRAP_METHOD(Glib::RefPtr<const Pango::FontMap> get_font_map() const, gtk_font_chooser_get_font_map,
refreturn, constversion)
+ _WRAP_METHOD(void set_level(Level level), gtk_font_chooser_set_level)
+ _WRAP_METHOD(Level get_level() const, gtk_font_chooser_get_level)
+ _WRAP_METHOD(Glib::ustring get_font_features() const, gtk_font_chooser_get_font_features)
+ _WRAP_METHOD(Glib::ustring get_language() const, gtk_font_chooser_get_language)
_WRAP_SIGNAL(void font_activated(const Glib::ustring& fontname), "font-activated")
_WRAP_PROPERTY("font", Glib::ustring)
_WRAP_PROPERTY("font-desc", Pango::FontDescription)
- _WRAP_PROPERTY("preview_text", Glib::ustring)
+ _WRAP_PROPERTY("preview-text", Glib::ustring)
_WRAP_PROPERTY("show-preview-entry", bool)
+ _WRAP_PROPERTY("level", Level)
+ _WRAP_PROPERTY("font-features", Glib::ustring)
+ _WRAP_PROPERTY("language", Glib::ustring)
};
} // namespace Gtk
diff --git a/gtk/src/listbox.hg b/gtk/src/listbox.hg
index 3b0471f..a5cfe6e 100644
--- a/gtk/src/listbox.hg
+++ b/gtk/src/listbox.hg
@@ -325,6 +325,7 @@ public:
_WRAP_PROPERTY("selection-mode", SelectionMode)
_WRAP_PROPERTY("activate-on-single-click", bool)
+ _WRAP_PROPERTY("accept-unpaired-release", bool)
_WRAP_SIGNAL(void row_selected(ListBoxRow* row), row-selected)
_WRAP_SIGNAL(void row_activated(ListBoxRow* row), row-activated)
diff --git a/gtk/src/listboxrow.hg b/gtk/src/listboxrow.hg
index f25a19f..0df998c 100644
--- a/gtk/src/listboxrow.hg
+++ b/gtk/src/listboxrow.hg
@@ -15,6 +15,7 @@
*/
#include <gtkmm/bin.h>
+#include <gtkmm/actionable.h>
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/bin_p.h)
@@ -29,9 +30,10 @@ namespace Gtk
*
* @newin{3,10}
*/
-class ListBoxRow : public Bin
+class ListBoxRow : public Bin, public Actionable
{
_CLASS_GTKOBJECT(ListBoxRow, GtkListBoxRow, GTK_LIST_BOX_ROW, Gtk::Bin, GtkBin)
+ _IMPLEMENTS_INTERFACE(Actionable)
public:
_CTOR_DEFAULT()
diff --git a/tools/m4/convert_gtk.m4 b/tools/m4/convert_gtk.m4
index 17dc6f9..3d59353 100644
--- a/tools/m4/convert_gtk.m4
+++ b/tools/m4/convert_gtk.m4
@@ -46,6 +46,7 @@ _CONV_ENUM(Gtk,DeleteType)
_CONV_ENUM(Gtk,DestDefaults)
_CONV_ENUM(Gtk,DirectionType)
_CONV_ENUM(Gtk,EventSequenceState)
+_CONV_INCLASS_ENUM(Gtk,FontChooser,Level)
_CONV_INCLASS_ENUM(Gtk,Image,Type)
_CONV_ENUM(Gtk,IconSize)
_CONV_ENUM(Gtk,Justification)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]