[balsa/wip/gtk4] Adapt to new size-allocate signal handler API



commit d00e7cbdabc572e272b05a03ea3c7fb2e4651f5a
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Fri Nov 16 18:26:31 2018 -0500

    Adapt to new size-allocate signal handler API

 libbalsa/source-viewer.c        | 2 +-
 src/balsa-index.c               | 6 ++++--
 src/balsa-mblist.c              | 6 +++---
 src/balsa-mime-widget-message.c | 2 +-
 src/compose-window.c            | 8 +++++---
 src/main-window.c               | 8 +++++---
 src/message-window.c            | 8 +++++---
 7 files changed, 24 insertions(+), 16 deletions(-)
---
diff --git a/libbalsa/source-viewer.c b/libbalsa/source-viewer.c
index 6d9ed0524..1583200b3 100644
--- a/libbalsa/source-viewer.c
+++ b/libbalsa/source-viewer.c
@@ -196,7 +196,7 @@ static GActionEntry win_entries[] = {
 */
 
 static void
-lsv_size_allocate_cb(GtkWidget * window, GtkAllocation * alloc,
+lsv_size_allocate_cb(GtkWidget * window, gint width, gint height,
                      gint baseline, LibBalsaSourceViewer * source_viewer)
 {
     GdkSurface *surface;
diff --git a/src/balsa-index.c b/src/balsa-index.c
index f72f4a664..75fac6ba3 100644
--- a/src/balsa-index.c
+++ b/src/balsa-index.c
@@ -89,7 +89,8 @@ static void bndx_row_activated(GtkTreeView       *tree_view,
                                GtkTreeViewColumn *column,
                                gpointer           user_data);
 static void bndx_column_resize(GtkWidget     *widget,
-                               GtkAllocation *allocation,
+                               gint           width,
+                               gint           height,
                                gint           baseline,
                                gpointer       user_data);
 static void bndx_tree_expand_cb(GtkTreeView *tree_view,
@@ -808,7 +809,8 @@ bndx_tree_collapse_cb(GtkTreeView *tree_view,
 /* When a column is resized, store the new size for later use */
 static void
 bndx_column_resize(GtkWidget     *widget,
-                   GtkAllocation *allocation,
+                   gint           width,
+                   gint           height,
                    gint           baseline,
                    gpointer       user_data)
 {
diff --git a/src/balsa-mblist.c b/src/balsa-mblist.c
index 2bc17950d..54080db86 100644
--- a/src/balsa-mblist.c
+++ b/src/balsa-mblist.c
@@ -101,7 +101,7 @@ static void bmbl_tree_collapse(GtkTreeView * tree_view, GtkTreeIter * iter,
 static gint bmbl_row_compare(GtkTreeModel * model,
                              GtkTreeIter * iter1,
                              GtkTreeIter * iter2, gpointer data);
-static void bmbl_column_resize(GtkWidget * widget, GtkAllocation * allocation,
+static void bmbl_column_resize(GtkWidget * widget, gint width, gint height,
                                gint baseline, gpointer data);
 static void bmbl_drag_data_received_cb(GtkWidget        *widget,
                                        GdkDrop          *drop,
@@ -749,7 +749,7 @@ bmbl_do_popup(GtkTreeView * tree_view, GtkTreePath * path,
  * so they can be saved and restored between sessions.
  * */
 static void
-bmbl_column_resize(GtkWidget * widget, GtkAllocation * allocation,
+bmbl_column_resize(GtkWidget * widget, gint width, gint height,
                    gint baseline, gpointer data)
 {
     GtkTreeView *tree_view = GTK_TREE_VIEW(widget);
@@ -1766,7 +1766,7 @@ bmbl_mru_activate_cb(GtkWidget * item, gpointer data)
  * Remember the width and height.
  */
 static void
-bmbl_mru_size_allocate_cb(GtkWidget * widget, GdkRectangle * allocation,
+bmbl_mru_size_allocate_cb(GtkWidget * widget, gint width, gint height,
                           gint baseline, gpointer user_data)
 {
     GdkSurface *surface;
diff --git a/src/balsa-mime-widget-message.c b/src/balsa-mime-widget-message.c
index 91da23b84..459a900d0 100644
--- a/src/balsa-mime-widget-message.c
+++ b/src/balsa-mime-widget-message.c
@@ -546,7 +546,7 @@ bm_header_widget_new(BalsaMessage * bm, GtkWidget * const * buttons)
 }
 
 static gboolean
-label_size_allocate_cb(GtkLabel * label, GdkRectangle * rectangle,
+label_size_allocate_cb(GtkLabel * label, gint width, gint height,
                        gint baseline, GtkWidget * expander)
 {
     PangoLayout *layout;
diff --git a/src/compose-window.c b/src/compose-window.c
index 9eed120bd..981dd5c7d 100644
--- a/src/compose-window.c
+++ b/src/compose-window.c
@@ -152,7 +152,8 @@ G_DEFINE_TYPE(BalsaComposeWindow, balsa_compose_window, GTK_TYPE_APPLICATION_WIN
 
 static void balsa_compose_window_destroy(GtkWidget *widget);
 static void balsa_compose_window_size_allocate(GtkWidget           *widget,
-                                               const GtkAllocation *allocation,
+                                               int                  width,
+                                               int                  height,
                                                int                  baseline);
 static void balsa_compose_window_drag_data_received(GtkWidget        *widget,
                                                     GdkDrop          *drop,
@@ -1491,13 +1492,14 @@ update_compose_window_identity(BalsaComposeWindow     *compose_window,
 
 static void
 balsa_compose_window_size_allocate(GtkWidget           *widget,
-                                   const GtkAllocation *allocation,
+                                   int                  width,
+                                   int                  height,
                                    int                  baseline)
 {
     GdkSurface *surface;
 
     GTK_WIDGET_CLASS(balsa_compose_window_parent_class)->size_allocate
-        (widget, allocation, baseline);
+        (widget, width, height, baseline);
 
     surface = gtk_widget_get_surface(widget);
     if (surface == NULL)
diff --git a/src/main-window.c b/src/main-window.c
index ce3a0d2e7..07843dc6c 100644
--- a/src/main-window.c
+++ b/src/main-window.c
@@ -224,7 +224,8 @@ G_DEFINE_TYPE_WITH_PRIVATE(BalsaWindow, balsa_window, GTK_TYPE_APPLICATION_WINDO
 static guint window_signals[LAST_SIGNAL] = { 0 };
 
 static void balsa_window_size_allocate(GtkWidget           *widget,
-                                       const GtkAllocation *allocation,
+                                       int                  width,
+                                       int                  height,
                                        int                  baseline);
 static gboolean balsa_window_close_request(GtkWindow * window);
 
@@ -4216,13 +4217,14 @@ bw_slave_position_cb(GtkPaned   * paned_slave,
 
 static void
 balsa_window_size_allocate(GtkWidget           *widget,
-                           const GtkAllocation *allocation,
+                           int                  width,
+                           int                  height,
                            int                  baseline)
 {
     GdkSurface *surface;
 
     GTK_WIDGET_CLASS(balsa_window_parent_class)->size_allocate
-        (widget, allocation, baseline);
+        (widget, width, height, baseline);
 
     surface = gtk_widget_get_surface(widget);
     if (surface == NULL)
diff --git a/src/message-window.c b/src/message-window.c
index 437affac7..39ad0c72e 100644
--- a/src/message-window.c
+++ b/src/message-window.c
@@ -57,7 +57,8 @@ G_DEFINE_TYPE(BalsaMessageWindow, balsa_message_window, GTK_TYPE_APPLICATION_WIN
 
 static void destroy_message_window(GtkWidget *widget);
 static void size_alloc_cb(GtkWidget           *widget,
-                          const GtkAllocation *allocation,
+                          int                  width,
+                          int                  height,
                           int                  baseline);
 
 static void
@@ -534,13 +535,14 @@ mw_close_activated(GSimpleAction * action, GVariant * parameter,
 
 static void
 size_alloc_cb(GtkWidget           *widget,
-              const GtkAllocation *allocation,
+              int                  width,
+              int                  height,
               int                  baseline)
 {
     GdkSurface *surface;
 
     GTK_WIDGET_CLASS(balsa_message_window_parent_class)->size_allocate
-        (widget, allocation, baseline);
+        (widget, width, height, baseline);
 
     surface = gtk_widget_get_surface(widget);
 


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