filechooserbutton: In SELECT_FOLDER, when the selection is empty, show (None) in...

[~andy/gtk] / gtk / gtkstock.h

diff --git a/gtk/gtkstock.h b/gtk/gtkstock.h
index db80262d7132f3656ddc8c77195203b9652f7938..0c60f6727a753f95ad2ee4e39981b7b5f619d3ff 100644 (file)
--- a/gtk/gtkstock.h
+++ b/gtk/gtkstock.h
@@ -12,9 +12,7 @@
  * 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, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -24,19 +22,32 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_STOCK_H__
 #define __GTK_STOCK_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gdk/gdk.h>
-#include <gtk/gtktypeutils.h> /* for GtkTranslateFunc */
 
 G_BEGIN_DECLS
 
+/*
+ * GtkTranslateFunc:
+ * @path: The id of the message. In #GtkActionGroup this will be a label
+ *   or tooltip from a #GtkActionEntry.
+ * @func_data: user data passed in when registering the function
+ *
+ * The function used to translate messages in e.g. #GtkIconFactory
+ * and #GtkActionGroup.
+ *
+ * Returns: the translated message
+ */
+typedef gchar * (*GtkTranslateFunc) (const gchar  *path,
+                                     gpointer      func_data);
+
 typedef struct _GtkStockItem GtkStockItem;
 
 struct _GtkStockItem
@@ -99,7 +110,7 @@ void          gtk_stock_set_translate_func (const gchar      *domain,
  * GTK_STOCK_BOLD:
  *
  * The "Bold" item.
- * <inlinegraphic fileref="gtk-bold.png" format="PNG"></inlinegraphic>
+ * <inlinegraphic fileref="format-text-bold.png" format="PNG"></inlinegraphic>
  */
 #define GTK_STOCK_BOLD             "gtk-bold"
 
@@ -133,7 +144,7 @@ void          gtk_stock_set_translate_func (const gchar      *domain,
  * GTK_STOCK_CLEAR:
  *
  * The "Clear" item.
- * <inlinegraphic fileref="gtk-clear.png" format="PNG"></inlinegraphic>
+ * <inlinegraphic fileref="edit-clear.png" format="PNG"></inlinegraphic>
  */
 #define GTK_STOCK_CLEAR            "gtk-clear"
 
@@ -306,7 +317,7 @@ void          gtk_stock_set_translate_func (const gchar      *domain,
  * GTK_STOCK_FILE:
  *
  * The "File" item.
- * <inlinegraphic fileref="document-x-generic.png" format="PNG"></inlinegraphic>
+ * <inlinegraphic fileref="text-x-generic.png" format="PNG"></inlinegraphic>
  *
  * Since 3.0, this item has a label, before it only had an icon.
  *
@@ -458,9 +469,9 @@ void          gtk_stock_set_translate_func (const gchar      *domain,
  * GTK_STOCK_INDENT:
  *
  * The "Indent" item.
- * <inlinegraphic fileref="gtk-indent-ltr.png" format="PNG"></inlinegraphic>
+ * <inlinegraphic fileref="format-indent-more-ltr.png" format="PNG"></inlinegraphic>
  * RTL variant
- * <inlinegraphic fileref="gtk-indent-rtl.png" format="PNG"></inlinegraphic>
+ * <inlinegraphic fileref="format-indent-more-rtl.png" format="PNG"></inlinegraphic>
  *
  * Since: 2.4
  */