ped->all_hidden = TRUE;
- list = gtk_container_get_children(GTK_CONTAINER(ped->vbox));
+ list = gtk_container_get_children(GTK_CONTAINER(ped->vbox));
work = list;
while (work)
{
ped = g_object_get_data(G_OBJECT(bar), "pane_data");
if (!ped) return FALSE;
- list = gtk_container_get_children(GTK_CONTAINER(ped->vbox));
+ list = gtk_container_get_children(GTK_CONTAINER(ped->vbox));
work = list;
while (!ret && work)
{
ExifEntry *ee = g_object_get_data(G_OBJECT(entry), "entry_data");
work = work->next;
-#if GTK_CHECK_VERSION(2,20,0)
if (ee->editable && gtk_widget_has_focus(ee->value_widget)) ret = gtk_widget_event(ee->value_widget, event);
-#else
- if (ee->editable && GTK_WIDGET_HAS_FOCUS(ee->value_widget)) ret = gtk_widget_event(ee->value_widget, event);
-#endif
}
g_list_free(list);
return ret;
static void bar_pane_exif_notify_cb(FileData *fd, NotifyType type, gpointer data)
{
PaneExifData *ped = data;
- if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_METADATA)) && fd == ped->fd)
+ if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_METADATA)) && fd == ped->fd)
{
DEBUG_1("Notify pane_exif: %s %04x", fd->path, type);
bar_pane_exif_update(ped);
switch (info)
{
case TARGET_APP_EXIF_ENTRY:
- gtk_selection_data_set(selection_data, selection_data->target,
+ gtk_selection_data_set(selection_data, gtk_selection_data_get_target(selection_data),
8, (gpointer) &entry, sizeof(entry));
break;
switch (info)
{
case TARGET_APP_EXIF_ENTRY:
- new_entry = *(gpointer *)selection_data->data;
+ new_entry = *(gpointer *)gtk_selection_data_get_data(selection_data);
- if (new_entry->parent && new_entry->parent != ped->vbox) bar_pane_exif_reparent_entry(new_entry, pane);
+ if (gtk_widget_get_parent(new_entry) && gtk_widget_get_parent(new_entry) != ped->vbox) bar_pane_exif_reparent_entry(new_entry, pane);
break;
default:
/* FIXME: this needs a check for valid exif keys */
- new_entry = bar_pane_exif_add_entry(ped, (gchar *)selection_data->data, NULL, TRUE, FALSE);
+ new_entry = bar_pane_exif_add_entry(ped, (gchar *)gtk_selection_data_get_data(selection_data), NULL, TRUE, FALSE);
break;
}
- list = gtk_container_get_children(GTK_CONTAINER(ped->vbox));
+ list = gtk_container_get_children(GTK_CONTAINER(ped->vbox));
work = list;
pos = 0;
while (work)
{
gint nx, ny;
GtkWidget *entry = work->data;
+ GtkAllocation allocation;
work = work->next;
if (entry == new_entry) continue;
-#if GTK_CHECK_VERSION(2,20,0)
+ gtk_widget_get_allocation(entry, &allocation);
+
if (gtk_widget_is_drawable(entry) &&
-#else
- if (GTK_WIDGET_DRAWABLE(entry) &&
-#endif
gtk_widget_translate_coordinates(pane, entry, x, y, &nx, &ny) &&
- ny < entry->allocation.height / 2) break;
+ ny < allocation.height / 2) break;
pos++;
}
g_list_free(list);
if (ped)
{
- bar_pane_exif_add_entry(ped,
+ bar_pane_exif_add_entry(ped,
gtk_entry_get_text(GTK_ENTRY(cdd->key_entry)),
gtk_entry_get_text(GTK_ENTRY(cdd->title_entry)),
cdd->if_set, cdd->editable);
if (ee)
{
const gchar *title;
- GtkWidget *pane = cdd->widget->parent;
+ GtkWidget *pane = gtk_widget_get_parent(cdd->widget);
while (pane)
{
ped = g_object_get_data(G_OBJECT(pane), "pane_data");
if (ped) break;
- pane = pane->parent;
+ pane = gtk_widget_get_parent(pane);
}
if (!pane) return;
gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 0, GDK_CURRENT_TIME);
}
-static gboolean bar_pane_exif_menu_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
-{
+static gboolean bar_pane_exif_menu_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+{
PaneExifData *ped = data;
if (bevent->button == MOUSE_BUTTON_RIGHT)
{
return TRUE;
}
return FALSE;
-}
+}
WRITE_STRING(">");
indent++;
- list = gtk_container_get_children(GTK_CONTAINER(ped->vbox));
+ list = gtk_container_get_children(GTK_CONTAINER(ped->vbox));
work = list;
while (work)
{
g_free(ped);
}
+#if !GTK_CHECK_VERSION(3,0,0)
static void bar_pane_exif_size_request(GtkWidget *pane, GtkRequisition *requisition, gpointer data)
{
PaneExifData *ped = data;
requisition->height = ped->min_height;
}
}
+#endif
static void bar_pane_exif_size_allocate(GtkWidget *pane, GtkAllocation *alloc, gpointer data)
{
PaneExifData *ped = data;
ped->min_height = alloc->height;
+#if GTK_CHECK_VERSION(3,0,0)
+ gtk_widget_set_size_request(ped->widget, -1, ped->min_height);
+#endif
}
static GtkWidget *bar_pane_exif_new(const gchar *id, const gchar *title, gboolean expanded)
g_object_set_data(G_OBJECT(ped->widget), "pane_data", ped);
g_signal_connect_after(G_OBJECT(ped->widget), "destroy",
G_CALLBACK(bar_pane_exif_destroy), ped);
+#if GTK_CHECK_VERSION(3,0,0)
+ gtk_widget_set_size_request(ped->widget, -1, ped->min_height);
+#else
g_signal_connect(G_OBJECT(ped->widget), "size-request",
G_CALLBACK(bar_pane_exif_size_request), ped);
+#endif
g_signal_connect(G_OBJECT(ped->widget), "size-allocate",
G_CALLBACK(bar_pane_exif_size_allocate), ped);