Commit d2292ffe authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

removed enum SizeType.

2004-07-05  Michael Natterer  <mitch@gimp.org>

	* app/core/core-types.h: removed enum SizeType.

	* app/text/text-enums.h: added it as enum GimpSizeType and added
	comment that it's for backward compatibility only.

	* tools/pdbgen/Makefile.am
	* tools/pdbgen/pdb/text_tool.pdb: changed accordingly.

	* libgimp/gimpenums.h
	* plug-ins/pygimp/gimpenums.py
	* plug-ins/script-fu/script-fu-constants.c
	* tools/pdbgen/enums.pl: regenerated (pdbgen insisted on
	reordering the enums).
parent b53bb1eb
2004-07-05 Michael Natterer <mitch@gimp.org>
* app/core/core-types.h: removed enum SizeType.
* app/text/text-enums.h: added it as enum GimpSizeType and added
comment that it's for backward compatibility only.
* tools/pdbgen/Makefile.am
* tools/pdbgen/pdb/text_tool.pdb: changed accordingly.
* libgimp/gimpenums.h
* plug-ins/pygimp/gimpenums.py
* plug-ins/script-fu/script-fu-constants.c
* tools/pdbgen/enums.pl: regenerated (pdbgen insisted on
reordering the enums).
2004-07-05 Michael Natterer <mitch@gimp.org>
* app/core/core-types.h: #define MIN and MAX values for
......
......@@ -47,15 +47,6 @@
#define GIMP_COORDS_DEFAULT_WHEEL 0.5
/* enums */
typedef enum
{
GIMP_PIXELS,
GIMP_POINTS
} SizeType;
/* base objects */
typedef struct _GimpObject GimpObject;
......
......@@ -24,7 +24,7 @@
GType gimp_text_box_mode_get_type (void) G_GNUC_CONST;
typedef enum
typedef enum /*< pdb-skip >*/
{
GIMP_TEXT_BOX_DYNAMIC,
GIMP_TEXT_BOX_FIXED
......@@ -35,7 +35,7 @@ typedef enum
GType gimp_text_direction_get_type (void) G_GNUC_CONST;
typedef enum
typedef enum /*< pdb-skip >*/
{
GIMP_TEXT_DIRECTION_LTR, /*< desc="From left to right" >*/
GIMP_TEXT_DIRECTION_RTL /*< desc="From right to left" >*/
......@@ -46,7 +46,7 @@ typedef enum
GType gimp_text_justification_get_type (void) G_GNUC_CONST;
typedef enum
typedef enum /*< pdb-skip >*/
{
GIMP_TEXT_JUSTIFY_LEFT, /*< desc="Left justified" >*/
GIMP_TEXT_JUSTIFY_RIGHT, /*< desc="Right justified" >*/
......@@ -59,7 +59,7 @@ typedef enum
GType gimp_text_outline_get_type (void) G_GNUC_CONST;
typedef enum
typedef enum /*< pdb-skip >*/
{
GIMP_TEXT_OUTLINE_NONE,
GIMP_TEXT_OUTLINE_STROKE_ONLY,
......@@ -67,4 +67,13 @@ typedef enum
} GimpTextOutline;
/* backward compatibility enums */
typedef enum /*< skip >*/
{
GIMP_PIXELS,
GIMP_POINTS
} GimpSizeType;
#endif /* __TEXT_ENUMS_H__ */
......@@ -280,6 +280,12 @@ typedef enum
GIMP_RUN_WITH_LAST_VALS
} GimpRunMode;
typedef enum
{
GIMP_PIXELS,
GIMP_POINTS
} GimpSizeType;
typedef enum
{
GIMP_SHADOWS,
......@@ -287,12 +293,6 @@ typedef enum
GIMP_HIGHLIGHTS
} GimpTransferMode;
typedef enum
{
GIMP_PIXELS,
GIMP_POINTS
} GimpSizeType;
G_END_DECLS
......
......@@ -272,6 +272,10 @@ RUN_INTERACTIVE = 0
RUN_NONINTERACTIVE = 1
RUN_WITH_LAST_VALS = 2
# GimpSizeType
PIXELS = 0
POINTS = 1
# GimpStackTraceMode
STACK_TRACE_NEVER = 0
STACK_TRACE_QUERY = 1
......@@ -290,7 +294,3 @@ UNIT_POINT = 3
UNIT_PICA = 4
UNIT_END = 5
# GimpSizeType
PIXELS = 0
POINTS = 1
......@@ -228,6 +228,9 @@ init_generated_constants (void)
setvar (cintern ("RUN-NONINTERACTIVE"), flocons (1), NIL);
setvar (cintern ("RUN-WITH-LAST-VALS"), flocons (2), NIL);
setvar (cintern ("PIXELS"), flocons (0), NIL);
setvar (cintern ("POINTS"), flocons (1), NIL);
setvar (cintern ("STACK-TRACE-NEVER"), flocons (0), NIL);
setvar (cintern ("STACK-TRACE-QUERY"), flocons (1), NIL);
setvar (cintern ("STACK-TRACE-ALWAYS"), flocons (2), NIL);
......@@ -243,8 +246,5 @@ init_generated_constants (void)
setvar (cintern ("UNIT-PICA"), flocons (4), NIL);
setvar (cintern ("UNIT-END"), flocons (5), NIL);
setvar (cintern ("PIXELS"), flocons (0), NIL);
setvar (cintern ("POINTS"), flocons (1), NIL);
return;
}
......@@ -60,7 +60,7 @@ enum_headers = \
../../app/paint-funcs/paint-funcs-types.h \
../../app/base/base-enums.h \
../../app/core/core-enums.h \
../../app/core/core-types.h \
../../app/text/text-enums.h \
../../app/paint/paint-enums.h \
../../app/plug-in/plug-in-types.h
......
......@@ -406,9 +406,9 @@ package Gimp::CodeGen::enums;
mapping => { GIMP_OFFSET_BACKGROUND => '0',
GIMP_OFFSET_TRANSPARENT => '1' }
},
SizeType =>
GimpSizeType =>
{ contig => 1,
header => 'core/core-types.h',
header => 'text/text-enums.h',
symbols => [ qw(GIMP_PIXELS GIMP_POINTS) ],
mapping => { GIMP_PIXELS => '0',
GIMP_POINTS => '1' }
......
......@@ -40,7 +40,7 @@ sub fontname_arg () {{
sub size_args () {(
{ name => 'size', type => '0 < float',
desc => 'The size of text in either pixels or points' },
{ name => 'size_type', type => 'enum SizeType',
{ name => 'size_type', type => 'enum GimpSizeType',
desc => 'The units of specified size: %%desc%%' }
)}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment