GNOME.org
 

[gtkmm] Gtk: Update for the latest gtk+4 (Remove ButtonBox and Invisible)

commit 1557ac0bba411c6ca5f3fed635228b5486e4948a
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Thu Feb 7 10:51:57 2019 +0100

    Gtk: Update for the latest gtk+4 (Remove ButtonBox and Invisible)
    
    * gtk/src/buttonbox.[ccg|hg]:
    * gtk/src/invisible.[ccg|hg]: Remove these files
    * gtk/src/dialog.hg: Remove an unnecessary #include
    * gtk/src/enums.hg: Remove ButtonBoxStyle
    * gtk/src/popovermenu.hg: Remove child_property_position()
    * gtk/src/window.hg: Remove many icon methods
    * .gitignore:
    * gtk/gtkmm.h:
    * gtk/src/filelist.am:
    * tools/extra_defs_gen/generate_defs_gtk.cc:
    * tools/m4/convert_gtk.m4: Remove entries for ButtonBox, ButtonBoxStyle
    and Invisible.

 .gitignore                                |  4 --
 gtk/gtkmm.h                               |  2 -
 gtk/src/buttonbox.ccg                     | 25 -----------
 gtk/src/buttonbox.hg                      | 71 -------------------------------
 gtk/src/dialog.hg                         |  1 -
 gtk/src/enums.hg                          |  1 -
 gtk/src/filelist.am                       |  2 -
 gtk/src/invisible.ccg                     | 26 -----------
 gtk/src/invisible.hg                      | 46 --------------------
 gtk/src/popovermenu.hg                    |  1 -
 gtk/src/window.hg                         | 27 +-----------
 tools/extra_defs_gen/generate_defs_gtk.cc |  5 ---
 tools/m4/convert_gtk.m4                   |  2 -
 13 files changed, 1 insertion(+), 212 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 261ae73f..7420ebbc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -167,8 +167,6 @@ gtk/gtkmm/builder.cc
 gtk/gtkmm/builder.h
 gtk/gtkmm/button.cc
 gtk/gtkmm/button.h
-gtk/gtkmm/buttonbox.cc
-gtk/gtkmm/buttonbox.h
 gtk/gtkmm/calendar.cc
 gtk/gtkmm/calendar.h
 gtk/gtkmm/cellarea.cc
@@ -311,8 +309,6 @@ gtk/gtkmm/image.cc
 gtk/gtkmm/image.h
 gtk/gtkmm/infobar.cc
 gtk/gtkmm/infobar.h
-gtk/gtkmm/invisible.cc
-gtk/gtkmm/invisible.h
 gtk/gtkmm/label.cc
 gtk/gtkmm/label.h
 gtk/gtkmm/layout.cc
diff --git a/gtk/gtkmm.h b/gtk/gtkmm.h
index 9715e0b6..3fd888fe 100644
--- a/gtk/gtkmm.h
+++ b/gtk/gtkmm.h
@@ -110,7 +110,6 @@ extern const int gtkmm_micro_version;
 #include <gtkmm/box.h>
 #include <gtkmm/builder.h>
 #include <gtkmm/button.h>
-#include <gtkmm/buttonbox.h>
 #include <gtkmm/cellarea.h>
 #include <gtkmm/cellareabox.h>
 #include <gtkmm/cellareacontext.h>
@@ -178,7 +177,6 @@ extern const int gtkmm_micro_version;
 #include <gtkmm/image.h>
 #include <gtkmm/infobar.h>
 #include <gtkmm/calendar.h>
-#include <gtkmm/invisible.h>
 #include <gtkmm/label.h>
 #include <gtkmm/layout.h>
 #include <gtkmm/levelbar.h>
diff --git a/gtk/src/dialog.hg b/gtk/src/dialog.hg
index b3700e38..09f99479 100644
--- a/gtk/src/dialog.hg
+++ b/gtk/src/dialog.hg
@@ -21,7 +21,6 @@
 #include <gtkmm/window.h>
 #include <gtkmm/box.h>
 #include <gtkmm/button.h>
-#include <gtkmm/buttonbox.h>
 #include <gtkmm/headerbar.h>
 
 _DEFS(gtkmm,gtk)
diff --git a/gtk/src/enums.hg b/gtk/src/enums.hg
index 606bac8f..dbe1853f 100644
--- a/gtk/src/enums.hg
+++ b/gtk/src/enums.hg
@@ -29,7 +29,6 @@ _CC_INCLUDE(gtk/gtk.h)
 _WRAP_ENUM(AccelFlags, GtkAccelFlags)
 _WRAP_ENUM(Align, GtkAlign)
 _WRAP_ENUM(ArrowType, GtkArrowType)
-_WRAP_ENUM(ButtonBoxStyle, GtkButtonBoxStyle)
 _WRAP_ENUM(DeleteType, GtkDeleteType)
 _WRAP_ENUM(DirectionType, GtkDirectionType)
 _WRAP_ENUM(IconSize, GtkIconSize)
diff --git a/gtk/src/filelist.am b/gtk/src/filelist.am
index 2e2356f9..f45484d1 100644
--- a/gtk/src/filelist.am
+++ b/gtk/src/filelist.am
@@ -31,7 +31,6 @@ gtkmm_files_any_hg =          \
        buildable.hg            \
        builder.hg              \
        button.hg               \
-       buttonbox.hg            \
        calendar.hg             \
        cellarea.hg             \
        cellareabox.hg          \
@@ -103,7 +102,6 @@ gtkmm_files_any_hg =                \
        iconview.hg             \
        image.hg                \
        infobar.hg              \
-       invisible.hg            \
        label.hg                \
        layout.hg               \
        levelbar.hg             \
diff --git a/gtk/src/popovermenu.hg b/gtk/src/popovermenu.hg
index aab0e9df..39c378b4 100644
--- a/gtk/src/popovermenu.hg
+++ b/gtk/src/popovermenu.hg
@@ -60,7 +60,6 @@ public:
   _WRAP_PROPERTY("visible-submenu", Glib::ustring)
 
   _WRAP_CHILD_PROPERTY("submenu", Glib::ustring)
-  _WRAP_CHILD_PROPERTY("position", int)
 
   // PopoverMenu has no signals nor vfuncs.
 };
diff --git a/gtk/src/window.hg b/gtk/src/window.hg
index 2f74a16d..41207d2d 100644
--- a/gtk/src/window.hg
+++ b/gtk/src/window.hg
@@ -68,7 +68,6 @@ public:
   _WRAP_PROPERTY("default_height", int)
   _WRAP_PROPERTY("destroy_with_parent", bool)
   _WRAP_PROPERTY("hide-on-close", bool)
-  _WRAP_PROPERTY("icon", Glib::RefPtr<Gdk::Texture>)
   _WRAP_PROPERTY("mnemonics-visible", bool)
   _WRAP_PROPERTY("icon-name", Glib::ustring)
   _WRAP_PROPERTY("display", Glib::RefPtr<Gdk::Display>)
@@ -221,35 +220,11 @@ dnl
   _WRAP_METHOD(void set_deletable(bool setting = true), gtk_window_set_deletable)
   _WRAP_METHOD(bool get_deletable() const, gtk_window_get_deletable)
 
-#m4 
_CONVERSION(`GList*',`std::vector<Glib::RefPtr<Gdk::Texture>>',`Glib::ListHandler<Glib::RefPtr<Gdk::Texture>>::list_to_vector($3,
 Glib::OWNERSHIP_SHALLOW)')
-  _WRAP_METHOD(std::vector<Glib::RefPtr<Gdk::Texture>> get_icon_list(), gtk_window_get_icon_list)
-#m4 _CONVERSION(`GList*',`std::vector<Glib::RefPtr<const 
Gdk::Texture>>',`Glib::ListHandler<Glib::RefPtr<const Gdk::Texture>>::list_to_vector($3, 
Glib::OWNERSHIP_SHALLOW)')
-  _WRAP_METHOD(std::vector<Glib::RefPtr<const Gdk::Texture>> get_icon_list() const, gtk_window_get_icon_list)
-
-#m4 _CONVERSION(`const 
std::vector<Glib::RefPtr<Gdk::Texture>>&',`GList*',`Glib::ListHandler<Glib::RefPtr<Gdk::Texture>>::vector_to_list($3).data()')
-  _WRAP_METHOD(void set_icon_list(const std::vector<Glib::RefPtr<Gdk::Texture>>& list),
-               gtk_window_set_icon_list)
-
-  _WRAP_METHOD(void set_icon(const Glib::RefPtr<Gdk::Texture>& icon),
-               gtk_window_set_icon)
-
   _WRAP_METHOD(void set_icon_name(const Glib::ustring& name), gtk_window_set_icon_name, newin "2,18")
-  _WRAP_METHOD(bool set_icon_from_file(const std::string& filename), gtk_window_set_icon_from_file, errthrow)
-
-  _WRAP_METHOD(Glib::RefPtr<Gdk::Texture> get_icon(), gtk_window_get_icon, refreturn)
-  _WRAP_METHOD(Glib::RefPtr<const Gdk::Texture> get_icon() const, gtk_window_get_icon, refreturn, 
constversion)
-
   _WRAP_METHOD(Glib::ustring get_icon_name() const, gtk_window_get_icon_name)
 
- _WRAP_METHOD(static void set_default_icon_list(
-              const std::vector<Glib::RefPtr<Gdk::Texture>>& list),
-              gtk_window_set_default_icon_list)
-
-  _WRAP_METHOD(static std::vector<Glib::RefPtr<Gdk::Texture>> get_default_icon_list(), 
gtk_window_get_default_icon_list)
-
-  _WRAP_METHOD(static void set_default_icon(const Glib::RefPtr<Gdk::Texture>& icon), 
gtk_window_set_default_icon)
   _WRAP_METHOD(static void set_default_icon_name(const Glib::ustring& name), 
gtk_window_set_default_icon_name)
-  _WRAP_METHOD(static bool set_default_icon_from_file(const std::string& filename), 
gtk_window_set_default_icon_from_file, errthrow)
+  _WRAP_METHOD(static Glib::ustring get_default_icon_name(), gtk_window_get_default_icon_name)
   _WRAP_METHOD(static void set_auto_startup_notification(bool setting = true), 
gtk_window_set_auto_startup_notification)
 
   _WRAP_METHOD(void set_modal(bool modal = true), gtk_window_set_modal)
diff --git a/tools/extra_defs_gen/generate_defs_gtk.cc b/tools/extra_defs_gen/generate_defs_gtk.cc
index 0f0b917b..a411f56e 100644
--- a/tools/extra_defs_gen/generate_defs_gtk.cc
+++ b/tools/extra_defs_gen/generate_defs_gtk.cc
@@ -61,7 +61,6 @@ int main(int /* argc */, char** /* argv */)
             << get_defs( GTK_TYPE_BOX )
             << get_defs( GTK_TYPE_BUILDER )
             << get_defs( GTK_TYPE_BUTTON )
-            << get_defs( GTK_TYPE_BUTTON_BOX )
             << get_defs( GTK_TYPE_CALENDAR )
             << get_defs( GTK_TYPE_CHECK_BUTTON )
             << get_defs( GTK_TYPE_CHECK_MENU_ITEM )
@@ -129,7 +128,6 @@ int main(int /* argc */, char** /* argv */)
             << get_defs( GTK_TYPE_ICON_THEME )
             << get_defs( GTK_TYPE_IMAGE )
             << get_defs( GTK_TYPE_INFO_BAR )
-            << get_defs( GTK_TYPE_INVISIBLE )
             << get_defs( GTK_TYPE_ICON_VIEW )
             << get_defs( GTK_TYPE_LABEL )
             << get_defs( GTK_TYPE_LAYOUT )
@@ -232,8 +230,6 @@ int main(int /* argc */, char** /* argv */)
   std::cout << get_child_properties( GTK_TYPE_ACTION_BAR )
             << get_child_properties( GTK_TYPE_ASSISTANT )
             << get_child_properties( GTK_TYPE_BIN )
-            << get_child_properties( GTK_TYPE_BOX )
-            << get_child_properties( GTK_TYPE_BUTTON_BOX )
             << get_child_properties( GTK_TYPE_FIXED )
             << get_child_properties( GTK_TYPE_FLOW_BOX )
             << get_child_properties( GTK_TYPE_GRID )
@@ -241,7 +237,6 @@ int main(int /* argc */, char** /* argv */)
             << get_child_properties( GTK_TYPE_ICON_VIEW )
             << get_child_properties( GTK_TYPE_LAYOUT )
             << get_child_properties( GTK_TYPE_LIST_BOX )
-            << get_child_properties( GTK_TYPE_MENU )
             << get_child_properties( GTK_TYPE_MENU_SHELL )
             << get_child_properties( GTK_TYPE_NOTEBOOK )
             << get_child_properties( GTK_TYPE_OVERLAY )
diff --git a/tools/m4/convert_gtk.m4 b/tools/m4/convert_gtk.m4
index 9357eb41..b1f55e23 100644
--- a/tools/m4/convert_gtk.m4
+++ b/tools/m4/convert_gtk.m4
@@ -32,7 +32,6 @@ _CONVERSION(`guint',`ui_merge_id',`$3')
 _CONV_ENUM(Gtk,AccelFlags)
 _CONV_ENUM(Gtk,Align)
 _CONV_ENUM(Gtk,ArrowType)
-_CONV_ENUM(Gtk,ButtonBoxStyle)
 _CONV_ENUM(Gtk,ButtonRole)
 _CONV_ENUM(Gtk,ButtonsType)
 _CONV_INCLASS_ENUM(Gtk,Calendar,DisplayOptions)
@@ -219,7 +218,6 @@ _CONVERSION(`GtkWidget*',`Gtk::Tree*',__RP2PD)
 _CONVERSION(`GtkWidget*',`ScrolledWindow*',`Glib::wrap((GtkScrolledWindow*)($3))')
 _CONVERSION(`GtkWidget*',`Window*',`Glib::wrap((GtkWindow*)($3))')
 _CONVERSION(`GtkWidget*',`TreeView*',`Glib::wrap((GtkTreeView*)($3))')
-_CONVERSION(`GtkWidget*',`ButtonBox*',`Glib::wrap((GtkButtonBox*)($3))')
 _CONVERSION(`GtkWidget*',`Image*',`Glib::wrap((GtkImage*)($3))')
 _CONVERSION(`GtkWidget*',`ToolItem*',`Glib::wrap((GtkToolItem*)($3))')
 _CONVERSION(`GtkWidget*',`FileChooserDialog*',`Glib::wrap((GtkFileChooserDialog*)($3))')
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]