Fix build with LTO

[geeqie.git] / src / advanced-exif.cc

diff --git a/src/advanced-exif.cc b/src/advanced-exif.cc
index 3cfc33b..e271c42 100644 (file)
--- a/src/advanced-exif.cc
+++ b/src/advanced-exif.cc
@@ -19,19 +19,37 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "main.h"
 #include "advanced-exif.h"
 
+#include <cstring>
+
+#include <gdk/gdk.h>
+#include <glib-object.h>
+#include <glib.h>
+#include <pango/pango.h>
+
+#include <config.h>
+
+#include "compat.h"
+#include "debug.h"
+#include "dnd.h"
 #include "exif.h"
 #include "filedata.h"
 #include "history-list.h"
+#include "intl.h"
 #include "layout-util.h"
+#include "layout.h"
 #include "misc.h"
+#include "options.h"
 #include "ui-misc.h"
 #include "window.h"
-#include "dnd.h"
 
-#define ADVANCED_EXIF_DATA_COLUMN_WIDTH 200
+struct ExifData;
+struct ExifItem;
+
+enum {
+       ADVANCED_EXIF_DATA_COLUMN_WIDTH = 200
+};
 
 /*
  *-------------------------------------------------------------------
@@ -303,7 +321,8 @@ static gint advanced_exif_sort_cb(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIt
                case EXIF_ADVCOL_FORMAT:
                case EXIF_ADVCOL_ELEMENTS:
                        {
-                       gchar *s1, *s2;
+                       gchar *s1;
+                       gchar *s2;
 
                        gtk_tree_model_get(model, a, n, &s1, -1);
                        gtk_tree_model_get(model, b, n, &s2, -1);
@@ -330,7 +349,7 @@ static gint advanced_exif_sort_cb(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIt
        return ret;
 }
 
-#ifdef HAVE_GTK4
+#if HAVE_GTK4
 static gboolean advanced_exif_mouseclick(GtkWidget *, GdkEventButton *, gpointer data)
 {
 /* @FIXME GTK4 stub */
@@ -431,7 +450,7 @@ GtkWidget *advanced_exif_new(LayoutWindow *lw)
 
        ew = g_new0(ExifWin, 1);
 
-       ew->window = window_new(GTK_WINDOW_TOPLEVEL, "view", nullptr, nullptr, _("Metadata"));
+       ew->window = window_new("view", nullptr, nullptr, _("Metadata"));
        DEBUG_NAME(ew->window);
 
        geometry.min_width = 900;
@@ -443,14 +462,14 @@ GtkWidget *advanced_exif_new(LayoutWindow *lw)
        gtk_window_resize(GTK_WINDOW(ew->window), lw->options.advanced_exif_window.w, lw->options.advanced_exif_window.h);
        if (lw->options.advanced_exif_window.x != 0 && lw->options.advanced_exif_window.y != 0)
                {
-               gtk_window_move(GTK_WINDOW(ew->window), lw->options.advanced_exif_window.x, lw->options.advanced_exif_window.y);
+               gq_gtk_window_move(GTK_WINDOW(ew->window), lw->options.advanced_exif_window.x, lw->options.advanced_exif_window.y);
                }
 
        g_object_set_data(G_OBJECT(ew->window), "advanced_exif_data", ew);
        g_signal_connect(G_OBJECT(ew->window), "delete_event", G_CALLBACK(advanced_exif_delete_cb), ew);
 
        ew->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
-       gtk_container_add(GTK_CONTAINER(ew->window), ew->vbox);
+       gq_gtk_container_add(GTK_WIDGET(ew->window), ew->vbox);
        gtk_widget_show(ew->vbox);
 
        box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
@@ -519,7 +538,7 @@ GtkWidget *advanced_exif_new(LayoutWindow *lw)
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ew->scrolled),
                                       GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
        gq_gtk_box_pack_start(GTK_BOX(ew->vbox), ew->scrolled, TRUE, TRUE, 0);
-       gtk_container_add(GTK_CONTAINER(ew->scrolled), ew->listview);
+       gq_gtk_container_add(GTK_WIDGET(ew->scrolled), ew->listview);
        gtk_widget_show(ew->listview);
        gtk_widget_show(ew->scrolled);