X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkfilechooserembed.c;h=336c2b3a4539e472470b54ebffae57d32f4fe917;hb=5e2c23214564f7dcc687fa8467020eeb6b9407a9;hp=3e3b625032076fa7aed3edf307cfc5d54d7988e7;hpb=2247fc6659fc9ffeb7d169f01d7e9c11e68f239c;p=~andy%2Fgtk diff --git a/gtk/gtkfilechooserembed.c b/gtk/gtkfilechooserembed.c index 3e3b62503..336c2b3a4 100644 --- a/gtk/gtkfilechooserembed.c +++ b/gtk/gtkfilechooserembed.c @@ -1,18 +1,36 @@ -#include +/* GTK - The GIMP Toolkit + * gtkfilechooserembed.h: Abstract sizing interface for file selector implementations + * Copyright (C) 2004, Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see . + */ + +#include "config.h" #include "gtkfilechooserembed.h" #include "gtkmarshalers.h" +#include "gtkintl.h" static void gtk_file_chooser_embed_class_init (gpointer g_iface); static void delegate_get_default_size (GtkFileChooserEmbed *chooser_embed, gint *default_width, gint *default_height); -static void delegate_get_resizable_hints (GtkFileChooserEmbed *chooser_embed, - gboolean *resize_horizontally, - gboolean *resize_vertically); static gboolean delegate_should_respond (GtkFileChooserEmbed *chooser_embed); static void delegate_initial_focus (GtkFileChooserEmbed *chooser_embed); static void delegate_default_size_changed (GtkFileChooserEmbed *chooser_embed, gpointer data); +static void delegate_response_requested (GtkFileChooserEmbed *chooser_embed, + gpointer data); static GtkFileChooserEmbed * get_delegate (GtkFileChooserEmbed *receiver) @@ -33,7 +51,6 @@ void _gtk_file_chooser_embed_delegate_iface_init (GtkFileChooserEmbedIface *iface) { iface->get_default_size = delegate_get_default_size; - iface->get_resizable_hints = delegate_get_resizable_hints; iface->should_respond = delegate_should_respond; iface->initial_focus = delegate_initial_focus; } @@ -45,8 +62,8 @@ _gtk_file_chooser_embed_delegate_iface_init (GtkFileChooserEmbedIface *iface) * * Establishes that calls on @receiver for #GtkFileChooser methods should be * delegated to @delegate, and that #GtkFileChooser signals emitted on @delegate - * should be forwarded to @receiver. Must be used in confunction with - * _gtk_file_chooser_delegate_iface_init(). + * should be forwarded to @receiver. Must be used in conjunction with + * _gtk_file_chooser_embed_delegate_iface_init(). **/ void _gtk_file_chooser_embed_set_delegate (GtkFileChooserEmbed *receiver, @@ -55,10 +72,12 @@ _gtk_file_chooser_embed_set_delegate (GtkFileChooserEmbed *receiver, g_return_if_fail (GTK_IS_FILE_CHOOSER_EMBED (receiver)); g_return_if_fail (GTK_IS_FILE_CHOOSER_EMBED (delegate)); - g_object_set_data (G_OBJECT (receiver), "gtk-file-chooser-embed-delegate", delegate); + g_object_set_data (G_OBJECT (receiver), I_("gtk-file-chooser-embed-delegate"), delegate); - g_signal_connect (delegate, "default_size_changed", + g_signal_connect (delegate, "default-size-changed", G_CALLBACK (delegate_default_size_changed), receiver); + g_signal_connect (delegate, "response-requested", + G_CALLBACK (delegate_response_requested), receiver); } @@ -70,14 +89,6 @@ delegate_get_default_size (GtkFileChooserEmbed *chooser_embed, { _gtk_file_chooser_embed_get_default_size (get_delegate (chooser_embed), default_width, default_height); } - -static void -delegate_get_resizable_hints (GtkFileChooserEmbed *chooser_embed, - gboolean *resize_horizontally, - gboolean *resize_vertically) -{ - _gtk_file_chooser_embed_get_resizable_hints (get_delegate (chooser_embed), resize_horizontally, resize_vertically); -} static gboolean delegate_should_respond (GtkFileChooserEmbed *chooser_embed) @@ -88,7 +99,7 @@ delegate_should_respond (GtkFileChooserEmbed *chooser_embed) static void delegate_initial_focus (GtkFileChooserEmbed *chooser_embed) { - return _gtk_file_chooser_embed_initial_focus (get_delegate (chooser_embed)); + _gtk_file_chooser_embed_initial_focus (get_delegate (chooser_embed)); } static void @@ -98,6 +109,13 @@ delegate_default_size_changed (GtkFileChooserEmbed *chooser_embed, g_signal_emit_by_name (data, "default-size-changed"); } +static void +delegate_response_requested (GtkFileChooserEmbed *chooser_embed, + gpointer data) +{ + g_signal_emit_by_name (data, "response-requested"); +} + /* publicly callable functions */ @@ -108,7 +126,7 @@ _gtk_file_chooser_embed_get_type (void) if (!file_chooser_embed_type) { - static const GTypeInfo file_chooser_embed_info = + const GTypeInfo file_chooser_embed_info = { sizeof (GtkFileChooserEmbedIface), /* class_size */ NULL, /* base_init */ @@ -117,7 +135,7 @@ _gtk_file_chooser_embed_get_type (void) }; file_chooser_embed_type = g_type_register_static (G_TYPE_INTERFACE, - "GtkFileChooserEmbed", + I_("GtkFileChooserEmbed"), &file_chooser_embed_info, 0); g_type_interface_add_prerequisite (file_chooser_embed_type, GTK_TYPE_WIDGET); @@ -131,13 +149,20 @@ gtk_file_chooser_embed_class_init (gpointer g_iface) { GType iface_type = G_TYPE_FROM_INTERFACE (g_iface); - g_signal_new ("default-size-changed", + g_signal_new (I_("default-size-changed"), iface_type, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkFileChooserEmbedIface, default_size_changed), NULL, NULL, _gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); + g_signal_new (I_("response-requested"), + iface_type, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkFileChooserEmbedIface, response_requested), + NULL, NULL, + _gtk_marshal_VOID__VOID, + G_TYPE_NONE, 0); } void @@ -167,16 +192,3 @@ _gtk_file_chooser_embed_initial_focus (GtkFileChooserEmbed *chooser_embed) GTK_FILE_CHOOSER_EMBED_GET_IFACE (chooser_embed)->initial_focus (chooser_embed); } - -void -_gtk_file_chooser_embed_get_resizable_hints (GtkFileChooserEmbed *chooser_embed, - gboolean *resize_horizontally, - gboolean *resize_vertically) -{ - g_return_if_fail (GTK_IS_FILE_CHOOSER_EMBED (chooser_embed)); - g_return_if_fail (resize_horizontally != NULL); - g_return_if_fail (resize_vertically != NULL); - - GTK_FILE_CHOOSER_EMBED_GET_IFACE (chooser_embed)->get_resizable_hints (chooser_embed, resize_horizontally, resize_vertically); -} -