[easytag/wip/application-window: 9/19] Remove redundant et_grid_new() define



commit 1d7ae1606ab3703b99f1d73b9aa0c1bc32ea8cd1
Author: David King <amigadave amigadave com>
Date:   Sat Aug 16 22:22:03 2014 +0100

    Remove redundant et_grid_new() define
    
    Call gtk_grid_new() directly.

 src/cddb_dialog.c   |    3 +--
 src/gtk2_compat.h   |    2 --
 src/scan_dialog.c   |    2 +-
 src/search_dialog.c |    2 +-
 src/tag_area.c      |    4 ++--
 5 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/src/cddb_dialog.c b/src/cddb_dialog.c
index 6946258..1bf6d59 100644
--- a/src/cddb_dialog.c
+++ b/src/cddb_dialog.c
@@ -38,7 +38,6 @@
 #endif /* !G_OS_WIN32 */
 #include <errno.h>
 
-#include "gtk2_compat.h"
 #include "application_window.h"
 #include "cddb_dialog.h"
 #include "easytag.h"
@@ -3093,7 +3092,7 @@ create_cddb_dialog (EtCDDBDialog *self)
     Frame = gtk_frame_new(_("Search In:"));
     gtk_box_pack_start(GTK_BOX(notebookvbox),Frame,FALSE,TRUE,0);
 
-    Table = et_grid_new (7,4);
+    Table = gtk_grid_new ();
     gtk_container_add(GTK_CONTAINER(Frame),Table);
     gtk_grid_set_row_spacing (GTK_GRID (Table), 1);
     gtk_grid_set_column_spacing (GTK_GRID (Table), 1);
diff --git a/src/gtk2_compat.h b/src/gtk2_compat.h
index 2093f92..1dd2909 100644
--- a/src/gtk2_compat.h
+++ b/src/gtk2_compat.h
@@ -23,8 +23,6 @@
 
 G_BEGIN_DECLS
 
-#define et_grid_new(r,c) gtk_grid_new()
-
 void et_grid_attach_full (GtkGrid *grid, GtkWidget *child, gint left, gint top,
                           gint width, gint height, gboolean hexpand,
                           gboolean vexpand, gint hmargin, gint vmargin);
diff --git a/src/scan_dialog.c b/src/scan_dialog.c
index 887b7ca..35a6492 100644
--- a/src/scan_dialog.c
+++ b/src/scan_dialog.c
@@ -3003,7 +3003,7 @@ create_scan_dialog (EtScanDialog *self)
     priv->legend_frame = gtk_frame_new (_("Legend"));
     gtk_box_pack_start(GTK_BOX(ScanVBox),priv->legend_frame,FALSE,FALSE,0);
     /* Legend labels */
-    Table = et_grid_new (3, 6);
+    Table = gtk_grid_new ();
     gtk_container_add(GTK_CONTAINER(priv->legend_frame),Table);
     gtk_container_set_border_width(GTK_CONTAINER(Table),4);
     Label = gtk_label_new(_("%a: artist"));
diff --git a/src/search_dialog.c b/src/search_dialog.c
index 86d6994..5e1cce4 100644
--- a/src/search_dialog.c
+++ b/src/search_dialog.c
@@ -618,7 +618,7 @@ create_search_dialog (EtSearchDialog *self)
     gtk_container_set_border_width (GTK_CONTAINER (self),
                                     BOX_SPACING);
 
-    Table = et_grid_new (3, 6);
+    Table = gtk_grid_new ();
     gtk_container_add (GTK_CONTAINER (content_area), Table);
     gtk_grid_set_row_spacing (GTK_GRID (Table), BOX_SPACING);
     gtk_grid_set_column_spacing (GTK_GRID (Table), BOX_SPACING);
diff --git a/src/tag_area.c b/src/tag_area.c
index c986a47..1bce256 100644
--- a/src/tag_area.c
+++ b/src/tag_area.c
@@ -2073,7 +2073,7 @@ create_tag_area (EtTagArea *self)
      */
     label = gtk_label_new (_("Common"));
 
-    table = et_grid_new (11, 11);
+    table = gtk_grid_new ();
     gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), table, label);
     gtk_container_set_border_width (GTK_CONTAINER (table), 2);
 
@@ -2450,7 +2450,7 @@ create_tag_area (EtTagArea *self)
     /* Also used in ET_Display_File_Tag_To_UI. */
     label = gtk_label_new (_("Images"));
 
-    priv->images_tab = table = et_grid_new (1, 2);
+    priv->images_tab = table = gtk_grid_new ();
     gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), table, label);
     gtk_container_set_border_width (GTK_CONTAINER (table), 2);
 


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