app/text/text-enums.h moved enum to libgimpbase (from app/text and

2005-01-23  Sven Neumann  <sven@gimp.org>

	* app/text/text-enums.h
	* libgimpbase/gimpbaseenums.h: moved enum to libgimpbase (from
	app/text and libgimp).

	* libgimp/gimpenums.h
	* libgimpbase/gimpbaseenums.c
	* tools/pdbgen/enums.pl: regenerated.

	* libgimpbase/gimpbase.def
	* libgimp/gimp.def: updated.

ChangeLog

@@ -1,3 +1,16 @@
+2005-01-23  Sven Neumann  <sven@gimp.org>
+
+	* app/text/text-enums.h
+	* libgimpbase/gimpbaseenums.h: moved enum to libgimpbase (from
+	app/text and libgimp).
+
+	* libgimp/gimpenums.h
+	* libgimpbase/gimpbaseenums.c
+	* tools/pdbgen/enums.pl: regenerated.
+
+	* libgimpbase/gimpbase.def
+	* libgimp/gimp.def: updated.
+
 2005-01-23  Sven Neumann  <sven@gimp.org>
 
 	* app/actions/dialogs-actions.c (dialogs_actions): set Ctrl-B as

app/text/text-enums.h

@@ -67,13 +67,4 @@ typedef enum /*< pdb-skip >*/
 } GimpTextOutline;
 
 
-/*  backward compatibility enums  */
-
-typedef enum /*< skip >*/
-{
-  GIMP_PIXELS,
-  GIMP_POINTS
-} GimpSizeType;
-
-
 #endif /* __TEXT_ENUMS_H__ */

libgimp/gimp.def

@@ -526,7 +526,6 @@ EXPORTS
 	gimp_shm_addr
 	gimp_show_help_button
 	gimp_show_tool_tips
-	gimp_size_type_get_type
 	gimp_smudge
 	gimp_smudge_default
 	gimp_temp_name

libgimp/gimpenums.h

@@ -259,17 +259,6 @@ typedef enum
 } GimpRunMode;
 
 
-#define GIMP_TYPE_SIZE_TYPE (gimp_size_type_get_type ())
-
-GType gimp_size_type_get_type (void) G_GNUC_CONST;
-
-typedef enum
-{
-  GIMP_PIXELS,
-  GIMP_POINTS
-} GimpSizeType;
-
-
 void           _gimp_enums_init          (void);
 
 const gchar ** gimp_enums_get_type_names (gint *n_type_names);

libgimpbase/gimpbase.def

@@ -78,6 +78,7 @@ EXPORTS
 	gimp_progress_command_get_type
 	gimp_repeat_mode_get_type
 	gimp_signal_private
+	gimp_size_type_get_type
 	gimp_stack_trace_mode_get_type
 	gimp_strip_uline
 	gimp_sysconf_directory

libgimpbase/gimpbaseenums.c

@@ -543,6 +543,35 @@ gimp_repeat_mode_get_type (void)
   return type;
 }
 
+GType
+gimp_size_type_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_PIXELS, "GIMP_PIXELS", "pixels" },
+    { GIMP_POINTS, "GIMP_POINTS", "points" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_PIXELS, N_("Pixels"), NULL },
+    { GIMP_POINTS, N_("Points"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (! type)
+    {
+      type = g_enum_register_static ("GimpSizeType", values);
+      gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
 GType
 gimp_transfer_mode_get_type (void)
 {

libgimpbase/gimpbaseenums.h

@@ -238,6 +238,17 @@ typedef enum
 } GimpRepeatMode;
 
 
+#define GIMP_TYPE_SIZE_TYPE (gimp_size_type_get_type ())
+
+GType gimp_size_type_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_PIXELS,  /*< desc="Pixels" >*/
+  GIMP_POINTS   /*< desc="Points" >*/
+} GimpSizeType;
+
+
 #define GIMP_TYPE_TRANSFER_MODE (gimp_transfer_mode_get_type ())
 
 GType gimp_transfer_mode_get_type (void) G_GNUC_CONST;

tools/pdbgen/enums.pl

@@ -171,6 +171,13 @@ package Gimp::CodeGen::enums;
 		       GIMP_REPEAT_SAWTOOTH => '1',
 		       GIMP_REPEAT_TRIANGULAR => '2' }
 	},
+    GimpSizeType =>
+	{ contig => 1,
+	  header => 'libgimpbase/gimpbaseenums.h',
+	  symbols => [ qw(GIMP_PIXELS GIMP_POINTS) ],
+	  mapping => { GIMP_PIXELS => '0',
+		       GIMP_POINTS => '1' }
+	},
     GimpTransferMode =>
 	{ contig => 1,
 	  header => 'libgimpbase/gimpbaseenums.h',
@@ -457,13 +464,6 @@ package Gimp::CodeGen::enums;
 	  mapping => { GIMP_OFFSET_BACKGROUND => '0',
 		       GIMP_OFFSET_TRANSPARENT => '1' }
 	},
-    GimpSizeType =>
-	{ contig => 1,
-	  header => 'text/text-enums.h',
-	  symbols => [ qw(GIMP_PIXELS GIMP_POINTS) ],
-	  mapping => { GIMP_PIXELS => '0',
-		       GIMP_POINTS => '1' }
-	},
     GimpConvolveType =>
 	{ contig => 1,
 	  header => 'paint/paint-enums.h',