[gnome-todo] Drop GtkBin



commit 34fbdab66de669310ebed55d7d0717a18f5ddcec
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Tue May 5 23:02:24 2020 -0300

    Drop GtkBin

 src/gtd-omni-area.c                                    | 4 ++--
 src/gtd-omni-area.h                                    | 2 +-
 src/gtd-omni-area.ui                                   | 2 +-
 src/gtd-plugin-dialog.c                                | 4 ++--
 src/gtd-rows-common.c                                  | 6 +++---
 src/gtd-text-width-layout.c                            | 2 +-
 src/gtd-text-width-layout.h                            | 2 +-
 src/notification/gtd-notification-widget.c             | 6 +++---
 src/notification/gtd-notification-widget.h             | 5 ++---
 src/notification/gtd-notification-widget.ui            | 2 +-
 src/plugins/task-lists-workspace/gtd-sidebar.c         | 4 ++--
 src/plugins/task-lists-workspace/gtd-sidebar.h         | 3 +--
 src/plugins/task-lists-workspace/gtd-sidebar.ui        | 2 +-
 src/plugins/task-lists-workspace/gtd-task-list-panel.c | 2 +-
 src/plugins/todoist/gtd-todoist-preferences-panel.c    | 4 ++--
 src/plugins/todoist/gtd-todoist-preferences-panel.h    | 2 +-
 src/plugins/todoist/ui/preferences.ui                  | 2 +-
 src/task-list-view/gtd-new-task-row.c                  | 4 ++--
 src/task-list-view/gtd-new-task-row.h                  | 4 ++--
 src/task-list-view/gtd-new-task-row.ui                 | 2 +-
 src/task-list-view/gtd-task-list-view.c                | 2 +-
 src/task-list-view/gtd-task-row.c                      | 4 ++--
 src/task-list-view/gtd-task-row.h                      | 5 ++---
 src/task-list-view/gtd-task-row.ui                     | 2 +-
 src/widgets/gtd-menu-button.c                          | 8 ++++----
 src/widgets/gtd-row-header.c                           | 6 +++---
 src/widgets/gtd-row-header.h                           | 4 ++--
 27 files changed, 46 insertions(+), 49 deletions(-)
---
diff --git a/src/gtd-omni-area.c b/src/gtd-omni-area.c
index 0390ca6..deb268c 100644
--- a/src/gtd-omni-area.c
+++ b/src/gtd-omni-area.c
@@ -30,7 +30,7 @@
 
 struct _GtdOmniArea
 {
-  GtkBin              parent;
+  GtkWidget           parent;
 
   GtkStack           *main_stack;
   GtkStack           *status_stack;
@@ -43,7 +43,7 @@ struct _GtdOmniArea
   guint               switch_messages_timeout_id;
 };
 
-G_DEFINE_TYPE (GtdOmniArea, gtd_omni_area, GTK_TYPE_BIN)
+G_DEFINE_TYPE (GtdOmniArea, gtd_omni_area, GTK_TYPE_WIDGET)
 
 
 /*
diff --git a/src/gtd-omni-area.h b/src/gtd-omni-area.h
index a49ffd8..a08def0 100644
--- a/src/gtd-omni-area.h
+++ b/src/gtd-omni-area.h
@@ -26,7 +26,7 @@
 G_BEGIN_DECLS
 
 #define GTD_TYPE_OMNI_AREA (gtd_omni_area_get_type())
-G_DECLARE_FINAL_TYPE (GtdOmniArea, gtd_omni_area, GTD, OMNI_AREA, GtkBin)
+G_DECLARE_FINAL_TYPE (GtdOmniArea, gtd_omni_area, GTD, OMNI_AREA, GtkWidget)
 
 void                 gtd_omni_area_push_message                  (GtdOmniArea        *self,
                                                                   const gchar        *id,
diff --git a/src/gtd-omni-area.ui b/src/gtd-omni-area.ui
index dd521a0..b26aca6 100644
--- a/src/gtd-omni-area.ui
+++ b/src/gtd-omni-area.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="GtdOmniArea" parent="GtkBin">
+  <template class="GtdOmniArea" parent="GtkWidget">
 
     <child>
       <object class="GtkCenterBox">
diff --git a/src/gtd-plugin-dialog.c b/src/gtd-plugin-dialog.c
index b28924c..efb18f9 100644
--- a/src/gtd-plugin-dialog.c
+++ b/src/gtd-plugin-dialog.c
@@ -1,6 +1,6 @@
 /* gtd-plugin-dialog.c
  *
- * Copyright (C) 2016 Georges Basile Stavracas Neto <georges stavracas gmail com>
+ * Copyright (C) 2016-2020 Georges Basile Stavracas Neto <georges stavracas gmail com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -60,7 +60,7 @@ show_preferences_cb (GtdPluginDialogRow *row,
   GtkWidget *panel;
 
   /* First, remove the old panel */
-  old_panel = gtk_bin_get_child (GTK_BIN (self->frame));
+  old_panel = gtk_widget_get_first_child (self->frame);
 
   if (old_panel)
     {
diff --git a/src/gtd-rows-common.c b/src/gtd-rows-common.c
index 04b54b5..716eee9 100644
--- a/src/gtd-rows-common.c
+++ b/src/gtd-rows-common.c
@@ -1,6 +1,6 @@
 /* gtd-rows-common.c
  *
- * Copyright (C) 2017 Georges Basile Stavracas Neto <georges stavracas gmail com>
+ * Copyright (C) 2017-2020 Georges Basile Stavracas Neto <georges stavracas gmail com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@ gtd_row_measure_with_max (GtkWidget      *widget,
 {
   if (orientation == GTK_ORIENTATION_VERTICAL)
     {
-      gtk_widget_measure (gtk_bin_get_child (GTK_BIN (widget)),
+      gtk_widget_measure (gtk_widget_get_first_child (widget),
                           orientation,
                           for_size,
                           minimum,
@@ -46,7 +46,7 @@ gtd_row_measure_with_max (GtkWidget      *widget,
       gint scale_factor;
       gint margins;
 
-      gtk_widget_measure (gtk_bin_get_child (GTK_BIN (widget)),
+      gtk_widget_measure (gtk_widget_get_first_child (widget),
                           orientation,
                           for_size,
                           &local_minimum_width,
diff --git a/src/gtd-text-width-layout.c b/src/gtd-text-width-layout.c
index 1227b59..2cca130 100644
--- a/src/gtd-text-width-layout.c
+++ b/src/gtd-text-width-layout.c
@@ -28,7 +28,7 @@ struct _GtdTextWidthLayout
   gint                width_chars;
 };
 
-G_DEFINE_TYPE (GtdTextWidthLayout, gtd_text_width_layout, GTK_TYPE_BIN_LAYOUT)
+G_DEFINE_TYPE (GtdTextWidthLayout, gtd_text_width_layout, GTK_TYPE_LAYOUT_MANAGER)
 
 enum
 {
diff --git a/src/gtd-text-width-layout.h b/src/gtd-text-width-layout.h
index e1ea2e7..f7754a7 100644
--- a/src/gtd-text-width-layout.h
+++ b/src/gtd-text-width-layout.h
@@ -25,7 +25,7 @@
 G_BEGIN_DECLS
 
 #define GTD_TYPE_TEXT_WIDTH_LAYOUT (gtd_text_width_layout_get_type())
-G_DECLARE_FINAL_TYPE (GtdTextWidthLayout, gtd_text_width_layout, GTD, TEXT_WIDTH_LAYOUT, GtkBinLayout)
+G_DECLARE_FINAL_TYPE (GtdTextWidthLayout, gtd_text_width_layout, GTD, TEXT_WIDTH_LAYOUT, GtkLayoutManager)
 
 GtkLayoutManager*    gtd_text_width_layout_new                   (void);
 
diff --git a/src/notification/gtd-notification-widget.c b/src/notification/gtd-notification-widget.c
index ea0d1d4..6a38e22 100644
--- a/src/notification/gtd-notification-widget.c
+++ b/src/notification/gtd-notification-widget.c
@@ -1,6 +1,6 @@
 /* gtd-notification-widget.c
  *
- * Copyright (C) 2015 Georges Basile Stavracas Neto <georges stavracas gmail com>
+ * Copyright (C) 2015-2020 Georges Basile Stavracas Neto <georges stavracas gmail com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@ typedef enum
 
 struct _GtdNotificationWidget
 {
-  GtkBin              parent;
+  GtkWidget           parent;
 
   /* widgets */
   GtkButton          *secondary_button;
@@ -56,7 +56,7 @@ static void          execute_notification                        (GtdNotificatio
 static void          on_notification_executed_cb                 (GtdNotification       *notification,
                                                                   GtdNotificationWidget *self);
 
-G_DEFINE_TYPE (GtdNotificationWidget, gtd_notification_widget, GTK_TYPE_BIN)
+G_DEFINE_TYPE (GtdNotificationWidget, gtd_notification_widget, GTK_TYPE_WIDGET)
 
 static void
 clear_bindings (GtdNotificationWidget *self)
diff --git a/src/notification/gtd-notification-widget.h b/src/notification/gtd-notification-widget.h
index a4e7510..93ecb74 100644
--- a/src/notification/gtd-notification-widget.h
+++ b/src/notification/gtd-notification-widget.h
@@ -1,6 +1,6 @@
 /* gtd-notification-widget.h
  *
- * Copyright (C) 2015 Georges Basile Stavracas Neto <georges stavracas gmail com>
+ * Copyright (C) 2015-2020 Georges Basile Stavracas Neto <georges stavracas gmail com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,8 +26,7 @@
 G_BEGIN_DECLS
 
 #define GTD_TYPE_NOTIFICATION_WIDGET (gtd_notification_widget_get_type())
-
-G_DECLARE_FINAL_TYPE (GtdNotificationWidget, gtd_notification_widget, GTD, NOTIFICATION_WIDGET, GtkBin)
+G_DECLARE_FINAL_TYPE (GtdNotificationWidget, gtd_notification_widget, GTD, NOTIFICATION_WIDGET, GtkWidget)
 
 GtkWidget*           gtd_notification_widget_new                 (void);
 
diff --git a/src/notification/gtd-notification-widget.ui b/src/notification/gtd-notification-widget.ui
index 92957c3..f6e3477 100644
--- a/src/notification/gtd-notification-widget.ui
+++ b/src/notification/gtd-notification-widget.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="3.16"/>
-  <template class="GtdNotificationWidget" parent="GtkBin">
+  <template class="GtdNotificationWidget" parent="GtkWidget">
     <child>
       <object class="GtkRevealer" id="revealer">
         <child>
diff --git a/src/plugins/task-lists-workspace/gtd-sidebar.c b/src/plugins/task-lists-workspace/gtd-sidebar.c
index aa03ce0..9416c02 100644
--- a/src/plugins/task-lists-workspace/gtd-sidebar.c
+++ b/src/plugins/task-lists-workspace/gtd-sidebar.c
@@ -38,7 +38,7 @@
 
 struct _GtdSidebar
 {
-  GtkBin              parent;
+  GtkWidget           parent;
 
   GtkListBox         *archive_listbox;
   GtkListBoxRow      *archive_row;
@@ -51,7 +51,7 @@ struct _GtdSidebar
   GSimpleActionGroup *action_group;
 };
 
-G_DEFINE_TYPE (GtdSidebar, gtd_sidebar, GTK_TYPE_BIN)
+G_DEFINE_TYPE (GtdSidebar, gtd_sidebar, GTK_TYPE_WIDGET)
 
 
 /*
diff --git a/src/plugins/task-lists-workspace/gtd-sidebar.h b/src/plugins/task-lists-workspace/gtd-sidebar.h
index f706674..1bca639 100644
--- a/src/plugins/task-lists-workspace/gtd-sidebar.h
+++ b/src/plugins/task-lists-workspace/gtd-sidebar.h
@@ -27,8 +27,7 @@
 G_BEGIN_DECLS
 
 #define GTD_TYPE_SIDEBAR (gtd_sidebar_get_type())
-
-G_DECLARE_FINAL_TYPE (GtdSidebar, gtd_sidebar, GTD, SIDEBAR, GtkBin)
+G_DECLARE_FINAL_TYPE (GtdSidebar, gtd_sidebar, GTD, SIDEBAR, GtkWidget)
 
 void                 gtd_sidebar_set_panel_stack                 (GtdSidebar         *self,
                                                                   GtkStack           *stack);
diff --git a/src/plugins/task-lists-workspace/gtd-sidebar.ui b/src/plugins/task-lists-workspace/gtd-sidebar.ui
index 1e2774b..90d1966 100644
--- a/src/plugins/task-lists-workspace/gtd-sidebar.ui
+++ b/src/plugins/task-lists-workspace/gtd-sidebar.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="GtdSidebar" parent="GtkBin">
+  <template class="GtdSidebar" parent="GtkWidget">
     <property name="hexpand">0</property>
     <property name="layout-manager">
       <object class="GtdTextWidthLayout">
diff --git a/src/plugins/task-lists-workspace/gtd-task-list-panel.c 
b/src/plugins/task-lists-workspace/gtd-task-list-panel.c
index e3fbecc..9e4da85 100644
--- a/src/plugins/task-lists-workspace/gtd-task-list-panel.c
+++ b/src/plugins/task-lists-workspace/gtd-task-list-panel.c
@@ -278,7 +278,7 @@ on_colors_flowbox_child_activated_cb (GtkFlowBox       *colors_flowbox,
 
   g_assert (list != NULL);
 
-  color_button = gtk_bin_get_child (GTK_BIN (child));
+  color_button = gtk_flow_box_child_get_child (child);
 
   if (self->previous_color_button == color_button)
     return;
diff --git a/src/plugins/todoist/gtd-todoist-preferences-panel.c 
b/src/plugins/todoist/gtd-todoist-preferences-panel.c
index a65f2aa..03bc1c0 100644
--- a/src/plugins/todoist/gtd-todoist-preferences-panel.c
+++ b/src/plugins/todoist/gtd-todoist-preferences-panel.c
@@ -25,7 +25,7 @@
 
 struct _GtdTodoistPreferencesPanel
 {
-  GtkBin              parent;
+  GtkWidget              parent;
 
   GtkStack           *stack;
   GoaClient          *client;
@@ -35,7 +35,7 @@ struct _GtdTodoistPreferencesPanel
   GtkWidget          *empty_page;
 };
 
-G_DEFINE_TYPE (GtdTodoistPreferencesPanel, gtd_todoist_preferences_panel, GTK_TYPE_BIN)
+G_DEFINE_TYPE (GtdTodoistPreferencesPanel, gtd_todoist_preferences_panel, GTK_TYPE_WIDGET)
 
 GtdTodoistPreferencesPanel*
 gtd_todoist_preferences_panel_new (void)
diff --git a/src/plugins/todoist/gtd-todoist-preferences-panel.h 
b/src/plugins/todoist/gtd-todoist-preferences-panel.h
index bda7057..95f3636 100644
--- a/src/plugins/todoist/gtd-todoist-preferences-panel.h
+++ b/src/plugins/todoist/gtd-todoist-preferences-panel.h
@@ -30,7 +30,7 @@ G_BEGIN_DECLS
 
 #define GTD_TYPE_TODOIST_PREFERENCES_PANEL (gtd_todoist_preferences_panel_get_type())
 
-G_DECLARE_FINAL_TYPE (GtdTodoistPreferencesPanel, gtd_todoist_preferences_panel, GTD, 
TODOIST_PREFERENCES_PANEL, GtkBin)
+G_DECLARE_FINAL_TYPE (GtdTodoistPreferencesPanel, gtd_todoist_preferences_panel, GTD, 
TODOIST_PREFERENCES_PANEL, GtkWidget)
 
 GtdTodoistPreferencesPanel*   gtd_todoist_preferences_panel_new           (void);
 
diff --git a/src/plugins/todoist/ui/preferences.ui b/src/plugins/todoist/ui/preferences.ui
index 31999ab..bf39536 100644
--- a/src/plugins/todoist/ui/preferences.ui
+++ b/src/plugins/todoist/ui/preferences.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="3.16"/>
-  <template class="GtdTodoistPreferencesPanel" parent="GtkBin">
+  <template class="GtdTodoistPreferencesPanel" parent="GtkWidget">
     <child>
       <object class="GtkStack" id="stack">
         <property name="transition_type">crossfade</property>
diff --git a/src/task-list-view/gtd-new-task-row.c b/src/task-list-view/gtd-new-task-row.c
index ec14b05..4f57267 100644
--- a/src/task-list-view/gtd-new-task-row.c
+++ b/src/task-list-view/gtd-new-task-row.c
@@ -34,7 +34,7 @@
 
 struct _GtdNewTaskRow
 {
-  GtkBin              parent;
+  GtkWidget           parent;
 
   GtkEntry           *entry;
   GtdTaskListPopover *tasklist_popover;
@@ -42,7 +42,7 @@ struct _GtdNewTaskRow
   gboolean            show_list_selector;
 };
 
-G_DEFINE_TYPE (GtdNewTaskRow, gtd_new_task_row, GTK_TYPE_BIN)
+G_DEFINE_TYPE (GtdNewTaskRow, gtd_new_task_row, GTK_TYPE_WIDGET)
 
 enum
 {
diff --git a/src/task-list-view/gtd-new-task-row.h b/src/task-list-view/gtd-new-task-row.h
index 658e914..5a4e05f 100644
--- a/src/task-list-view/gtd-new-task-row.h
+++ b/src/task-list-view/gtd-new-task-row.h
@@ -1,6 +1,6 @@
 /* gtd-new-task-row.h
  *
- * Copyright (C) 2017 Georges Basile Stavracas Neto <georges stavracas gmail com>
+ * Copyright (C) 2017-2020 Georges Basile Stavracas Neto <georges stavracas gmail com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@ G_BEGIN_DECLS
 
 #define GTD_TYPE_NEW_TASK_ROW (gtd_new_task_row_get_type())
 
-G_DECLARE_FINAL_TYPE (GtdNewTaskRow, gtd_new_task_row, GTD, NEW_TASK_ROW, GtkBin)
+G_DECLARE_FINAL_TYPE (GtdNewTaskRow, gtd_new_task_row, GTD, NEW_TASK_ROW, GtkWidget)
 
 GtkWidget*           gtd_new_task_row_new                        (void);
 
diff --git a/src/task-list-view/gtd-new-task-row.ui b/src/task-list-view/gtd-new-task-row.ui
index 6113ed3..6df271d 100644
--- a/src/task-list-view/gtd-new-task-row.ui
+++ b/src/task-list-view/gtd-new-task-row.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="3.16"/>
-  <template class="GtdNewTaskRow" parent="GtkBin">
+  <template class="GtdNewTaskRow" parent="GtkWidget">
     <property name="can_focus">1</property>
     <property name="margin-top">12</property>
     <property name="height-request">42</property>
diff --git a/src/task-list-view/gtd-task-list-view.c b/src/task-list-view/gtd-task-list-view.c
index d109c04..42fc65c 100644
--- a/src/task-list-view/gtd-task-list-view.c
+++ b/src/task-list-view/gtd-task-list-view.c
@@ -191,7 +191,7 @@ typedef gboolean     (*IterateSubtaskFunc)                       (GtdTaskListVie
 static inline GtdTaskRow*
 task_row_from_row (GtkListBoxRow *row)
 {
-  return GTD_TASK_ROW (gtk_bin_get_child (GTK_BIN (row)));
+  return GTD_TASK_ROW (gtk_list_box_row_get_child (row));
 }
 
 static void
diff --git a/src/task-list-view/gtd-task-row.c b/src/task-list-view/gtd-task-row.c
index 6d6c835..5dde43b 100644
--- a/src/task-list-view/gtd-task-row.c
+++ b/src/task-list-view/gtd-task-row.c
@@ -37,7 +37,7 @@
 
 struct _GtdTaskRow
 {
-  GtkBin              parent;
+  GtkWidget           parent;
 
   /*<private>*/
   GtkWidget          *content_box;
@@ -79,7 +79,7 @@ static void          on_star_widget_activated_cb                 (GtdStarWidget
                                                                   GParamSpec         *pspec,
                                                                   GtdTaskRow         *self);
 
-G_DEFINE_TYPE (GtdTaskRow, gtd_task_row, GTK_TYPE_BIN)
+G_DEFINE_TYPE (GtdTaskRow, gtd_task_row, GTK_TYPE_WIDGET)
 
 enum
 {
diff --git a/src/task-list-view/gtd-task-row.h b/src/task-list-view/gtd-task-row.h
index 939ae34..011e2d6 100644
--- a/src/task-list-view/gtd-task-row.h
+++ b/src/task-list-view/gtd-task-row.h
@@ -1,6 +1,6 @@
 /* gtd-task-row.h
  *
- * Copyright (C) 2015 Georges Basile Stavracas Neto <georges stavracas gmail com>
+ * Copyright (C) 2015-2020 Georges Basile Stavracas Neto <georges stavracas gmail com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,8 +27,7 @@
 G_BEGIN_DECLS
 
 #define GTD_TYPE_TASK_ROW (gtd_task_row_get_type())
-
-G_DECLARE_FINAL_TYPE (GtdTaskRow, gtd_task_row, GTD, TASK_ROW, GtkBin)
+G_DECLARE_FINAL_TYPE (GtdTaskRow, gtd_task_row, GTD, TASK_ROW, GtkWidget)
 
 GtkWidget*                gtd_task_row_new                      (GtdTask             *task,
                                                                  GtdMarkdownRenderer *renderer);
diff --git a/src/task-list-view/gtd-task-row.ui b/src/task-list-view/gtd-task-row.ui
index fc9fd6a..9b75d9a 100644
--- a/src/task-list-view/gtd-task-row.ui
+++ b/src/task-list-view/gtd-task-row.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="3.16"/>
-  <template class="GtdTaskRow" parent="GtkBin">
+  <template class="GtdTaskRow" parent="GtkWidget">
     <property name="halign">center</property>
     <child>
       <object class="GtkEventControllerKey">
diff --git a/src/widgets/gtd-menu-button.c b/src/widgets/gtd-menu-button.c
index 0939282..a2427ef 100644
--- a/src/widgets/gtd-menu-button.c
+++ b/src/widgets/gtd-menu-button.c
@@ -684,7 +684,7 @@ gtd_menu_button_set_direction (GtdMenuButton *self,
   g_object_notify_by_pspec (G_OBJECT (self), menu_button_props[PROP_DIRECTION]);
 
   /* Is it custom content? We don't change that */
-  child = gtk_bin_get_child (GTK_BIN (priv->button));
+  child = gtk_button_get_child (GTK_BUTTON (priv->button));
   if (priv->arrow_widget != child)
     return;
 
@@ -801,7 +801,7 @@ gtd_menu_button_set_gicon (GtdMenuButton *self,
 
   g_return_if_fail (GTD_IS_MENU_BUTTON (self));
 
-  child = gtk_bin_get_child (GTK_BIN (priv->button));
+  child = gtk_button_get_child (GTK_BUTTON (priv->button));
   if (child)
     gtk_container_remove (GTK_CONTAINER (priv->button), child);
 
@@ -858,7 +858,7 @@ gtd_menu_button_set_label (GtdMenuButton *self,
 
   g_return_if_fail (GTD_IS_MENU_BUTTON (self));
 
-  child = gtk_bin_get_child (GTK_BIN (priv->button));
+  child = gtk_button_get_child (GTK_BUTTON (priv->button));
   if (child)
     gtk_container_remove (GTK_CONTAINER (priv->button), child);
 
@@ -896,7 +896,7 @@ gtd_menu_button_get_label (GtdMenuButton *self)
 
   g_return_val_if_fail (GTD_IS_MENU_BUTTON (self), NULL);
 
-  child = gtk_bin_get_child (GTK_BIN (priv->button));
+  child = gtk_button_get_child (GTK_BUTTON (priv->button));
   if (GTK_IS_BOX (child))
     {
       child = gtk_widget_get_first_child (child);
diff --git a/src/widgets/gtd-row-header.c b/src/widgets/gtd-row-header.c
index aabd2f8..25a5ad9 100644
--- a/src/widgets/gtd-row-header.c
+++ b/src/widgets/gtd-row-header.c
@@ -1,6 +1,6 @@
 /* gtd-row-header.c
  *
- * Copyright 2018 Georges Basile Stavracas Neto <georges stavracas gmail com>
+ * Copyright 2018-2020 Georges Basile Stavracas Neto <georges stavracas gmail com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,10 +23,10 @@
 
 struct _GtdRowHeader
 {
-  GtkBin parent_instance;
+  GtkWidget parent_instance;
 };
 
-G_DEFINE_TYPE (GtdRowHeader, gtd_row_header, GTK_TYPE_BIN)
+G_DEFINE_TYPE (GtdRowHeader, gtd_row_header, GTK_TYPE_WIDGET)
 
 static void
 gtd_row_header_class_init (GtdRowHeaderClass *klass)
diff --git a/src/widgets/gtd-row-header.h b/src/widgets/gtd-row-header.h
index 6aed087..5e0b110 100644
--- a/src/widgets/gtd-row-header.h
+++ b/src/widgets/gtd-row-header.h
@@ -1,6 +1,6 @@
 /* gtd-row-header.h
  *
- * Copyright 2018 Georges Basile Stavracas Neto <georges stavracas gmail com>
+ * Copyright 2018-2020 Georges Basile Stavracas Neto <georges stavracas gmail com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@ G_BEGIN_DECLS
 
 #define GTD_TYPE_ROW_HEADER (gtd_row_header_get_type())
 
-G_DECLARE_FINAL_TYPE (GtdRowHeader, gtd_row_header, GTD, ROW_HEADER, GtkBin)
+G_DECLARE_FINAL_TYPE (GtdRowHeader, gtd_row_header, GTD, ROW_HEADER, GtkWidget)
 
 GtkWidget*           gtd_row_header_new                          (void);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]